diff options
| author | rbuj <[email protected]> | 2020-08-04 13:11:42 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2020-09-07 09:11:05 +0200 |
| commit | 8f8b7316cc7504a4618705c562ead1ae65dabbdc (patch) | |
| tree | c536e6c8079781851f2456528042e19497ee5315 /mate-panel/launcher.c | |
| parent | 59da25f28bc2678cc38bc1def53ca1c4dbf9cc0b (diff) | |
| download | mate-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/launcher.c')
| -rw-r--r-- | mate-panel/launcher.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/mate-panel/launcher.c b/mate-panel/launcher.c index d7d36556..ad2c147b 100644 --- a/mate-panel/launcher.c +++ b/mate-panel/launcher.c @@ -663,15 +663,12 @@ static char * panel_launcher_find_writable_uri (const char *launcher_location, const char *source) { - char *path; - char *uri; - if (!launcher_location) return panel_make_unique_desktop_uri (NULL, source); if (!strchr (launcher_location, G_DIR_SEPARATOR)) { - path = panel_make_full_path (NULL, launcher_location); - uri = g_filename_to_uri (path, NULL, NULL); + char *path = panel_make_full_path (NULL, launcher_location); + char *uri = g_filename_to_uri (path, NULL, NULL); g_free (path); return uri; } @@ -701,18 +698,13 @@ launcher_changed (PanelDItemEditor *dialog, static void launcher_command_changed (PanelDItemEditor *dialog, - const char *command, - Launcher *launcher) + const char *command, + Launcher *launcher) { - char *exec; - char *old_exec; - GKeyFile *revert_key_file; - - revert_key_file = panel_ditem_editor_get_revert_key_file (dialog); - + GKeyFile *revert_key_file = panel_ditem_editor_get_revert_key_file (dialog); if (revert_key_file) { - exec = panel_key_file_get_string (launcher->key_file, "Exec"); - old_exec = panel_key_file_get_string (revert_key_file, "Exec"); + char *exec = panel_key_file_get_string (launcher->key_file, "Exec"); + char *old_exec = panel_key_file_get_string (revert_key_file, "Exec"); if (!old_exec || !exec || strcmp (old_exec, exec)) panel_key_file_remove_key (launcher->key_file, @@ -1167,8 +1159,6 @@ void panel_launcher_set_dnd_enabled (Launcher *launcher, gboolean dnd_enabled) { - cairo_surface_t *surface; - if (dnd_enabled) { static GtkTargetEntry dnd_targets[] = { { "application/x-panel-icon-internal", 0, TARGET_ICON_INTERNAL }, @@ -1180,7 +1170,7 @@ panel_launcher_set_dnd_enabled (Launcher *launcher, GDK_BUTTON1_MASK, dnd_targets, 2, GDK_ACTION_COPY | GDK_ACTION_MOVE); - surface = button_widget_get_surface (BUTTON_WIDGET (launcher->button)); + cairo_surface_t *surface = button_widget_get_surface (BUTTON_WIDGET (launcher->button)); if (surface) { GdkPixbuf *pixbuf; pixbuf = gdk_pixbuf_get_from_surface (surface, |