Avoid the rarely used sokoke_container_show_children

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 8a0514ea2e531a0d3f5c400db40acd442c319d4c..b15594b4de1a91899ec5e65a50fac34b2267a60b 100644 (file)
--- 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 6b12fb87f5b4e944df79a00326472e6fd79dc01f..1a7b8988d08bad948cf637552fe9a06a5767c871 100644 (file)
--- 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 9e4d394384546d78c0b146d757152dcdde6ce792..f21935b86019defb8a38f1221b3a89d0c118c82d 100644 (file)
--- 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 faa7fa7f8fae2ce7422685a17d30893a94854a53..a639035d943a512931fea15937363a239aa12e11 100644 (file)
--- 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