diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-25 18:34:52 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-12-22 05:24:16 +0200 |
| commit | 558280660418ef9e27e36ddd0619225c691e44b7 (patch) | |
| tree | 0bc0a5f4383d989f02ae856d88451cd47203f83c /src/caja-window-manage-views.c | |
| parent | ab206cf53ff4380c63f031101c36b6bc0c7a8489 (diff) | |
| download | caja-558280660418ef9e27e36ddd0619225c691e44b7.tar.bz2 caja-558280660418ef9e27e36ddd0619225c691e44b7.tar.xz | |
[all] silence warnings from GCC 4.6
GCC 4.6 introduced a new warning about variables declared and initialized,
but not really used in the function body. Remove all of these occurrences
to build cleanly.
http://git.gnome.org/browse/nautilus/commit/?id=d4230de8667764e02dbb966b5d806ff78ced2fd5
Diffstat (limited to 'src/caja-window-manage-views.c')
| -rw-r--r-- | src/caja-window-manage-views.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c index 117412c8..7cdf8e70 100644 --- a/src/caja-window-manage-views.c +++ b/src/caja-window-manage-views.c @@ -126,13 +126,10 @@ caja_window_report_selection_changed (CajaWindowInfo *window) static void set_displayed_location (CajaWindowSlot *slot, GFile *location) { - CajaWindow *window; GFile *bookmark_location; gboolean recreate; char *name; - window = slot->pane->window; - if (slot->current_location_bookmark == NULL || location == NULL) { recreate = TRUE; @@ -529,14 +526,13 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot, char *old_uri, *new_uri; int new_slot_position; GList *l; - gboolean target_spatial, target_navigation, target_same; + gboolean target_navigation, target_same; gboolean is_desktop; window = slot->pane->window; target_window = NULL; target_slot = NULL; - target_spatial = target_navigation = target_same = FALSE; old_uri = caja_window_slot_get_location_uri (slot); if (old_uri == NULL) @@ -573,11 +569,6 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot, } else { target_same = TRUE; } - } - else if (CAJA_IS_SPATIAL_WINDOW (window)) - { - /* don't always use browser: if source is spatial, target is spatial */ - target_spatial = TRUE; } else if (flags & CAJA_WINDOW_OPEN_FLAG_NEW_WINDOW) { /* if it's specified to open a new window, and we're not using spatial, * the target is a navigation. @@ -585,9 +576,6 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot, target_navigation = TRUE; } break; - case CAJA_WINDOW_OPEN_IN_SPATIAL : - target_spatial = TRUE; - break; case CAJA_WINDOW_OPEN_IN_NAVIGATION : target_navigation = TRUE; break; @@ -1121,14 +1109,12 @@ mount_not_mounted_callback (GObject *source_object, gpointer user_data) { MountNotMountedData *data; - CajaWindow *window; CajaWindowSlot *slot; GError *error; GCancellable *cancellable; data = user_data; slot = data->slot; - window = slot->pane->window; cancellable = data->cancellable; g_free (data); @@ -1733,15 +1719,12 @@ found_mount_cb (GObject *source_object, { FindMountData *data = user_data; GMount *mount; - CajaWindowSlot *slot; if (g_cancellable_is_cancelled (data->cancellable)) { goto out; } - slot = data->slot; - mount = g_file_find_enclosing_mount_finish (G_FILE (source_object), res, NULL); @@ -2080,7 +2063,6 @@ display_view_selection_failure (CajaWindow *window, CajaFile *file, char *error_message; char *detail_message; char *scheme_string; - GtkDialog *dialog; /* Some sort of failure occurred. How 'bout we tell the user? */ full_uri_for_display = g_file_get_parse_name (location); @@ -2179,7 +2161,7 @@ display_view_selection_failure (CajaWindow *window, CajaFile *file, detail_message = g_strdup_printf (_("Error: %s\nPlease select another viewer and try again."), error->message); } - dialog = eel_show_error_dialog (error_message, detail_message, NULL); + eel_show_error_dialog (error_message, detail_message, NULL); g_free (uri_for_display); g_free (error_message); |