From 2976f6ebb2d8071321e30c70fe4c4676877e2e44 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 28 Oct 2011 22:24:04 +0200 Subject: [PATCH] Avoid the rarely used sokoke_container_show_children --- midori/midori-browser.c | 3 ++- midori/sokoke.c | 7 ------- midori/sokoke.h | 3 --- toolbars/midori-findbar.c | 3 ++- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8a0514ea..b15594b4 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3909,7 +3909,8 @@ _action_location_secondary_icon_released (GtkAction* action, G_CALLBACK (midori_browser_news_feed_clicked_cb), browser); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); } - sokoke_container_show_children (GTK_CONTAINER (menu)); + gtk_container_foreach (GTK_CONTAINER (menu), + (GtkCallback)(gtk_widget_show_all), NULL); katze_widget_popup (widget, GTK_MENU (menu), NULL, KATZE_MENU_POSITION_RIGHT); } diff --git a/midori/sokoke.c b/midori/sokoke.c index 6b12fb87..1a7b8988 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -732,13 +732,6 @@ void sokoke_widget_set_visible (GtkWidget* widget, gboolean visible) gtk_widget_hide (widget); } -void -sokoke_container_show_children (GtkContainer* container) -{ - /* Show every child but not the container itself */ - gtk_container_foreach (container, (GtkCallback)(gtk_widget_show_all), NULL); -} - typedef enum { SOKOKE_DESKTOP_UNTESTED, diff --git a/midori/sokoke.h b/midori/sokoke.h index 9e4d3943..f21935b8 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -64,9 +64,6 @@ void sokoke_widget_set_visible (GtkWidget* widget, gboolean visible); -void -sokoke_container_show_children (GtkContainer* container); - GtkWidget* sokoke_xfce_header_new (const gchar* icon, const gchar* title); diff --git a/toolbars/midori-findbar.c b/toolbars/midori-findbar.c index faa7fa7f..a639035d 100644 --- a/toolbars/midori-findbar.c +++ b/toolbars/midori-findbar.c @@ -322,7 +322,8 @@ midori_findbar_init (MidoriFindbar* findbar) g_signal_connect (findbar->find_close, "clicked", G_CALLBACK (midori_findbar_button_close_clicked_cb), findbar); gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->find_close, -1); - sokoke_container_show_children (GTK_CONTAINER (findbar)); + gtk_container_foreach (GTK_CONTAINER (findbar), + (GtkCallback)(gtk_widget_show_all), NULL); } void -- 2.39.5