diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-29 19:09:01 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-29 19:09:01 +0000 |
| commit | 538dd47d5dd49ab0e503c2b400b2a76e68f8893e (patch) | |
| tree | 25046d3a1f535bc9ac27ed8e266972e9a4f7c9cc /gtk/pixmap_save.c | |
| parent | 7b01915b6ba0a8a6d0b8383e6a6a83d62fe40909 (diff) | |
Fix various gcc -Wshadow warnings.
svn path=/trunk/; revision=31731
Diffstat (limited to 'gtk/pixmap_save.c')
| -rw-r--r-- | gtk/pixmap_save.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/pixmap_save.c b/gtk/pixmap_save.c index a728df763e..56e67cc9e4 100644 --- a/gtk/pixmap_save.c +++ b/gtk/pixmap_save.c @@ -52,15 +52,15 @@ pixbuf_save_destroy_cb(GtkWidget *window _U_, gpointer data _U_) } static gboolean -pixbuf_save_button_cb(GtkWidget *save_as_w, GdkPixbuf *pixbuf) +pixbuf_save_button_cb(GtkWidget *save_as_w_lcl, GdkPixbuf *pixbuf) { gchar *filename, *file_type; GtkWidget *type_cm, *simple_w; GError *error = NULL; gboolean ret; - filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_as_w)); - type_cm = g_object_get_data(G_OBJECT(save_as_w), "type_cm"); + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_as_w_lcl)); + type_cm = g_object_get_data(G_OBJECT(save_as_w_lcl), "type_cm"); file_type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_cm)); /* Perhaps the user specified a directory instead of a file. @@ -71,9 +71,9 @@ pixbuf_save_button_cb(GtkWidget *save_as_w, GdkPixbuf *pixbuf) set_last_open_dir(filename); g_free(filename); g_free(file_type); - file_selection_set_current_folder(save_as_w, + file_selection_set_current_folder(save_as_w_lcl, get_last_open_dir()); - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(save_as_w), ""); + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(save_as_w_lcl), ""); return FALSE; } @@ -88,7 +88,7 @@ pixbuf_save_button_cb(GtkWidget *save_as_w, GdkPixbuf *pixbuf) error->message, simple_dialog_primary_end()); gtk_window_set_transient_for(GTK_WINDOW(simple_w), - GTK_WINDOW(save_as_w)); + GTK_WINDOW(save_as_w_lcl)); } return TRUE; } |