Changeset 13157 for trunk/gtk/open-dialog.c

Timestamp:

Jan 13, 2012, 10:10:26 PM (11 years ago)

Author:

jordan

Message:

Silence a minor compiler warning.

We used to pass no button text + response_id pairs when creating the dialog because only gtk_dialog_add_button() would return back the actual button widget s.t. we could use a grab on it. However as of GTK+ 2.20 we can use gtk_dialog_get_widget_for_response() to get the button, so we can create dialogs in the more common way (which also fixes the gcc warning)

File:

• trunk/gtk/open-dialog.c (modified) (3 diffs)

trunk/gtk/open-dialog.c

@@ -262 +262 @@
     GtkWidget *      t;
     GtkWidget *      l;
-    GtkWidget *      grab;
     GtkWidget *      source_chooser;
     struct OpenData * data;
@@ -272 +271 @@
     d = gtk_dialog_new_with_buttons( _( "Torrent Options" ), parent,
                                      GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                     GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                                      NULL );
-    gtk_dialog_add_button( GTK_DIALOG( d ), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL );
-    grab = gtk_dialog_add_button( GTK_DIALOG( d ), GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT );
     gtk_dialog_set_default_response( GTK_DIALOG( d ),
                                      GTK_RESPONSE_ACCEPT );
@@ -382 +381 @@
 
     gtr_dialog_set_content( GTK_DIALOG( d ), t );
-    gtk_widget_grab_focus( grab );
+    w = gtk_dialog_get_widget_for_response( GTK_DIALOG( d ), GTK_RESPONSE_ACCEPT );
+    gtk_widget_grab_focus( w );
     return d;
 }