summaryrefslogtreecommitdiff
path: root/mate-panel/panel-menu-button.c
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-08-04 13:11:42 +0200
committerraveit65 <[email protected]>2020-09-07 09:11:05 +0200
commit8f8b7316cc7504a4618705c562ead1ae65dabbdc (patch)
treec536e6c8079781851f2456528042e19497ee5315 /mate-panel/panel-menu-button.c
parent59da25f28bc2678cc38bc1def53ca1c4dbf9cc0b (diff)
downloadmate-panel-8f8b7316cc7504a4618705c562ead1ae65dabbdc.tar.bz2
mate-panel-8f8b7316cc7504a4618705c562ead1ae65dabbdc.tar.xz
Remove variableScope warnings reported by cppcheck
cppcheck --enable=all . 2> err.txt grep variableScope err.txt
Diffstat (limited to 'mate-panel/panel-menu-button.c')
-rw-r--r--mate-panel/panel-menu-button.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c
index c89f6ef0..64d96945 100644
--- a/mate-panel/panel-menu-button.c
+++ b/mate-panel/panel-menu-button.c
@@ -721,10 +721,7 @@ panel_menu_button_load (const char *menu_path,
static char *
panel_menu_button_get_icon (PanelMenuButton *button)
{
- MateMenuTreeDirectory *directory;
- char *retval;
-
- retval = NULL;
+ char *retval = NULL;
if (button->priv->use_custom_icon &&
button->priv->custom_icon)
@@ -734,9 +731,9 @@ panel_menu_button_get_icon (PanelMenuButton *button)
button->priv->use_menu_path &&
button->priv->menu_path &&
panel_menu_button_create_menu (button)) {
- directory = g_object_get_data (G_OBJECT (button->priv->menu),
- "panel-menu-tree-directory");
-
+ MateMenuTreeDirectory *directory =
+ g_object_get_data (G_OBJECT (button->priv->menu),
+ "panel-menu-tree-directory");
if (!directory) {
MateMenuTree *tree;