diff options
| author | raveit65 <[email protected]> | 2024-01-28 02:53:56 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2024-02-04 18:37:58 +0100 |
| commit | e663fbaeba760003b4088e567af0883534891e59 (patch) | |
| tree | fd7b6805cc5d0e022f526e6343bb2539aa12f54e /mate-panel/panel-menu-items.c | |
| parent | 6a9848eb8388807d13c38cdaceabfc143f6640aa (diff) | |
| download | mate-panel-e663fbaeba760003b4088e567af0883534891e59.tar.bz2 mate-panel-e663fbaeba760003b4088e567af0883534891e59.tar.xz | |
Revert "Reduce scope of variables"
This reverts commit 96c7ebc6dc9e8b8327db04a9570054ee78743353.
Diffstat (limited to 'mate-panel/panel-menu-items.c')
| -rw-r--r-- | mate-panel/panel-menu-items.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c index 14b58701..05af4969 100644 --- a/mate-panel/panel-menu-items.c +++ b/mate-panel/panel-menu-items.c @@ -143,6 +143,7 @@ panel_menu_items_append_from_desktop (GtkWidget *menu, char *uri; char *type; gboolean is_application; + char *tryexec; char *icon; char *name; char *comment; @@ -197,7 +198,7 @@ panel_menu_items_append_from_desktop (GtkWidget *menu, g_free (type); if (is_application) { - char *tryexec = panel_key_file_get_string (key_file, "TryExec"); + tryexec = panel_key_file_get_string (key_file, "TryExec"); if (tryexec) { char *prog; @@ -408,6 +409,7 @@ panel_place_menu_item_append_gtk_bookmarks (GtkWidget *menu, guint max_items_or_ char *line = (char*) l->data; if (line[0] && !g_hash_table_lookup (table, line)) { + GFile *file; char *space; char *label; gboolean keep; @@ -428,7 +430,7 @@ panel_place_menu_item_append_gtk_bookmarks (GtkWidget *menu, guint max_items_or_ keep = TRUE; if (!keep) { - GFile *file = g_file_new_for_uri (line); + file = g_file_new_for_uri (line); keep = !g_file_is_native (file) || g_file_query_exists (file, NULL); g_object_unref (file); @@ -542,16 +544,15 @@ drive_poll_for_media_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) { - GError *error; + GdkScreen *screen; + GError *error; + char *primary; + char *name; error = NULL; if (!g_drive_poll_for_media_finish (G_DRIVE (source_object), res, &error)) { if (error->code != G_IO_ERROR_FAILED_HANDLED) { - GdkScreen *screen; - char *primary; - char *name; - screen = GDK_SCREEN (user_data); name = g_drive_get_name (G_DRIVE (source_object)); @@ -632,10 +633,10 @@ volume_mount_cb (GObject *source_object, error = NULL; if (!g_volume_mount_finish (G_VOLUME (source_object), res, &error)) { - if (error->code != G_IO_ERROR_FAILED_HANDLED) { - char *primary; - char *name; + char *primary; + char *name; + if (error->code != G_IO_ERROR_FAILED_HANDLED) { name = g_volume_get_name (G_VOLUME (source_object)); primary = g_strdup_printf (_("Unable to mount %s"), name); @@ -1018,6 +1019,7 @@ static GtkWidget * panel_place_menu_item_create_menu (PanelPlaceMenuItem *place_item) { GtkWidget *places_menu; + GtkWidget *item; char *gsettings_name = NULL; char *name; char *uri; @@ -1099,7 +1101,7 @@ panel_place_menu_item_create_menu (PanelPlaceMenuItem *place_item) if (panel_is_program_in_path ("caja-connect-server") || panel_is_program_in_path ("nautilus-connect-server") || panel_is_program_in_path ("nemo-connect-server")) { - GtkWidget *item = panel_menu_items_create_action_item (PANEL_ACTION_CONNECT_SERVER); + item = panel_menu_items_create_action_item (PANEL_ACTION_CONNECT_SERVER); if (item != NULL) gtk_menu_shell_append (GTK_MENU_SHELL (places_menu), item); |