diff options
author | Xan Lopez <xan@igalia.com> | 2012-01-01 01:10:02 +0800 |
---|---|---|
committer | Xan Lopez <xan@igalia.com> | 2012-01-01 01:11:41 +0800 |
commit | df732dc9afe00ca4dea2a3c39fb852e1ee6846ca (patch) | |
tree | 10d5e0fbe3b6c52bc12137df11ba875e635751e6 | |
parent | 6da78ee8f5195463eefca28234efa028320b8982 (diff) | |
download | gsoc2013-epiphany-df732dc9afe00ca4dea2a3c39fb852e1ee6846ca.tar gsoc2013-epiphany-df732dc9afe00ca4dea2a3c39fb852e1ee6846ca.tar.gz gsoc2013-epiphany-df732dc9afe00ca4dea2a3c39fb852e1ee6846ca.tar.bz2 gsoc2013-epiphany-df732dc9afe00ca4dea2a3c39fb852e1ee6846ca.tar.lz gsoc2013-epiphany-df732dc9afe00ca4dea2a3c39fb852e1ee6846ca.tar.xz gsoc2013-epiphany-df732dc9afe00ca4dea2a3c39fb852e1ee6846ca.tar.zst gsoc2013-epiphany-df732dc9afe00ca4dea2a3c39fb852e1ee6846ca.zip |
ephy-session: use GTK's method to get the content area
Now we can remove our internal implementation.
-rw-r--r-- | lib/ephy-gui.c | 23 | ||||
-rw-r--r-- | lib/ephy-gui.h | 2 | ||||
-rw-r--r-- | src/ephy-session.c | 2 |
3 files changed, 1 insertions, 26 deletions
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c index d5de8c76d..aa3a18b40 100644 --- a/lib/ephy-gui.c +++ b/lib/ephy-gui.c @@ -482,26 +482,3 @@ ephy_gui_window_update_user_time (GtkWidget *window, } -/* Pending gtk+ bug http://bugzilla.gnome.org/show_bug.cgi?id=328069 */ -GtkWidget * -ephy_gui_message_dialog_get_content_box (GtkWidget *dialog) -{ - GtkWidget *container; - GList *children; - - /* Get the hbox which is the first child of the main vbox */ - children = gtk_container_get_children (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog)))); - g_return_val_if_fail (children != NULL, NULL); - - container = GTK_WIDGET (children->data); - g_list_free (children); - - /* Get the vbox which is the second child of the hbox */ - children = gtk_container_get_children (GTK_CONTAINER (container)); - g_return_val_if_fail (children != NULL && children->next != NULL, NULL); - - container = GTK_WIDGET (children->next->data); - g_list_free (children); - - return container; -} diff --git a/lib/ephy-gui.h b/lib/ephy-gui.h index d5e02d68f..e7aa39e06 100644 --- a/lib/ephy-gui.h +++ b/lib/ephy-gui.h @@ -70,8 +70,6 @@ void ephy_gui_help (GtkWidget *parent, void ephy_gui_window_update_user_time (GtkWidget *window, guint32 user_time); -GtkWidget *ephy_gui_message_dialog_get_content_box (GtkWidget *dialog); - void ephy_gui_connect_checkbutton_to_gconf (GtkWidget *widget, const char *pref); diff --git a/src/ephy-session.c b/src/ephy-session.c index 39ac29fdb..c7771fbde 100644 --- a/src/ephy-session.c +++ b/src/ephy-session.c @@ -252,7 +252,7 @@ client_quit_requested_cb (EggSMClient *sm_client, gtk_label_set_line_wrap (GTK_LABEL (data->label), TRUE); confirm_shutdown_dialog_update_timeout_label (data); - box = ephy_gui_message_dialog_get_content_box (dialog); + box = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_box_pack_end (GTK_BOX (box), data->label, FALSE, FALSE, 0); gtk_widget_show (data->label); |