Remove sokoke_widget_popup and replace all call sites

diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c
index 6e4d310c7bc29541f2ed941b511353f3da15f6c7..e3a7da4093c004ea715cbf49fbfc9b93584436cb 100644 (file)
--- a/extensions/feed-panel/feed-panel.c
+++ b/extensions/feed-panel/feed-panel.c
@@ -553,8 +553,8 @@ feed_panel_popup (GtkWidget*      widget,
             item, feed_panel_delete_activate_cb, panel);
     }
 
-    sokoke_widget_popup (widget, GTK_MENU (menu),
-                         event, SOKOKE_MENU_POSITION_CURSOR);
+    katze_widget_popup (widget, GTK_MENU (menu),
+                        event, KATZE_MENU_POSITION_CURSOR);
 }
 
 static gboolean

diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c
index df6c70d1c58952349bebf0d5309ce9f5612ae8bf..1b82de6efdae639766615202186766e4f69e6bec 100644 (file)
--- a/extensions/tab-panel.c
+++ b/extensions/tab-panel.c
@@ -196,8 +196,7 @@ tab_panel_popup (GtkWidget*      widget,
 {
     GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (view));
 
-    sokoke_widget_popup (widget, GTK_MENU (menu),
-                         event, SOKOKE_MENU_POSITION_CURSOR);
+    katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
 }
 
 static gboolean

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 31dd872fd843b3dc979bc23f1b91003fbc29318e..593f6eafb9215db65931711cea658d17fd6a8a64 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3852,8 +3852,7 @@ midori_browser_bookmark_popup (GtkWidget*      widget,
     midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL,
         item, midori_browser_bookmark_delete_activate_cb, browser);
 
-    sokoke_widget_popup (widget, GTK_MENU (menu),
-                         event, SOKOKE_MENU_POSITION_CURSOR);
+    katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
 }
 
 static void

diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index 9f0447abebfff6cd5135019ad723fc64da306bd8..02e2f3de863527dddd1efc6d87e5ad06d812454b 100644 (file)
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -711,7 +711,7 @@ midori_panel_options_clicked_cb (GtkToolItem* toolitem,
     g_signal_emit_by_name (viewable, "populate-option-menu", menu);
 
     katze_widget_popup (GTK_WIDGET (toolitem), GTK_MENU (menu),
-                        NULL, SOKOKE_MENU_POSITION_LEFT);
+                        NULL, KATZE_MENU_POSITION_LEFT);
 }
 #endif
 

diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 816f1e1b11d8eefb7d5730a39ecae2110e37b80d..94a4516125d0d34fbfb00be7865ed61eaf1e3680 100644 (file)
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -501,8 +501,7 @@ midori_search_action_icon_released_cb (GtkWidget*           entry,
     g_signal_connect (menuitem, "activate",
         G_CALLBACK (midori_search_action_manage_activate_cb), action);
     gtk_widget_show (menuitem);
-    sokoke_widget_popup (entry, GTK_MENU (menu),
-                         NULL, SOKOKE_MENU_POSITION_LEFT);
+    katze_widget_popup (entry, GTK_MENU (menu), NULL, KATZE_MENU_POSITION_LEFT);
 }
 
 static gboolean

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 1cdf41f26b48ca404a11b0649b5e193ed9bf1fa2..265b41885bea7df33ffaa9d8854061c07bbc9d97 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3362,7 +3362,7 @@ midori_view_tab_label_button_release_event (GtkWidget*      tab_label,
         GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (widget));
 
         katze_widget_popup (widget, GTK_MENU (menu),
-                            event, SOKOKE_MENU_POSITION_CURSOR);
+                            event, KATZE_MENU_POSITION_CURSOR);
         return TRUE;
     }
 

diff --git a/midori/sokoke.c b/midori/sokoke.c
index fbc112f9f4a4cb262882add4bb81b0dadd9f30fb..72030cddc3944de5ae344303f16c380843f6e84d 100644 (file)
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -485,15 +485,6 @@ sokoke_container_show_children (GtkContainer* container)
     gtk_container_foreach (container, (GtkCallback)(gtk_widget_show_all), NULL);
 }
 
-void
-sokoke_widget_popup (GtkWidget*      widget,
-                     GtkMenu*        menu,
-                     GdkEventButton* event,
-                     SokokeMenuPos   pos)
-{
-    katze_widget_popup (widget, menu, event, (KatzeMenuPos)pos);
-}
-
 typedef enum
 {
     SOKOKE_DESKTOP_UNTESTED,

diff --git a/midori/sokoke.h b/midori/sokoke.h
index a178d92c7b391cd0a052aa0ace2c1a3fe700df64..36a59e0c75a78e57aa3a8166ff59469178426de2 100644 (file)
--- a/midori/sokoke.h
+++ b/midori/sokoke.h
@@ -55,12 +55,6 @@ sokoke_magic_uri                        (const gchar*    uri,
 gchar*
 sokoke_format_uri_for_display           (const gchar*    uri);
 
-typedef enum {
-    SOKOKE_MENU_POSITION_CURSOR = 0,
-    SOKOKE_MENU_POSITION_LEFT,
-    SOKOKE_MENU_POSITION_RIGHT
-} SokokeMenuPos;
-
 void
 sokoke_combo_box_add_strings            (GtkComboBox*    combobox,
                                          const gchar*    label_first,
@@ -73,12 +67,6 @@ sokoke_widget_set_visible               (GtkWidget*      widget,
 void
 sokoke_container_show_children          (GtkContainer*   container);
 
-void
-sokoke_widget_popup                     (GtkWidget*      widget,
-                                         GtkMenu*        menu,
-                                         GdkEventButton* event,
-                                         SokokeMenuPos   pos);
-
 GtkWidget*
 sokoke_xfce_header_new                  (const gchar*    icon,
                                          const gchar*    title);

diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 0196eda2b51c2e2c889122babb2e58b7d7e8f0bf..97b3a00cf376e260e473ba0cd5febfaf3d3c568b 100644 (file)
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -797,8 +797,7 @@ midori_bookmarks_popup (GtkWidget*       widget,
     midori_bookmarks_popup_item (menu, GTK_STOCK_DELETE, NULL,
         item, midori_bookmarks_delete_activate_cb, bookmarks);
 
-    sokoke_widget_popup (widget, GTK_MENU (menu),
-                         event, SOKOKE_MENU_POSITION_CURSOR);
+    katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
 }
 
 static gboolean

diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c
index b08db861f6e072bcdd49f1646b14f18d51f1fad0..329a67e428101cfeedebcea34053cf1c1c0bcf61 100644 (file)
--- a/panels/midori-extensions.c
+++ b/panels/midori-extensions.c
@@ -382,8 +382,7 @@ midori_extensions_popup (GtkWidget*        widget,
                                        midori_extensions_about_activate_cb, FALSE,
                                        extensions);
 
-    sokoke_widget_popup (widget, GTK_MENU (menu),
-                         event, SOKOKE_MENU_POSITION_CURSOR);
+    katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
 
     g_free (website);
 }

diff --git a/panels/midori-history.c b/panels/midori-history.c
index cf117e92108389f7a269d4d1832552aaaf407165..eefb5ed184143a610d853dc627b24672ab97befc 100644 (file)
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -840,8 +840,7 @@ midori_history_popup (GtkWidget*      widget,
     midori_history_popup_item (menu, GTK_STOCK_DELETE, NULL,
         item, midori_history_delete_activate_cb, history);
 
-    sokoke_widget_popup (widget, GTK_MENU (menu),
-                         event, SOKOKE_MENU_POSITION_CURSOR);
+    katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
 }
 
 static gboolean

diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c
index cb0e89e51ac4c570194ddf6ea4a304e177ddf37d..46783370fa8d406cdfc755879f4887871b5577ca 100644 (file)
--- a/panels/midori-transfers.c
+++ b/panels/midori-transfers.c
@@ -483,8 +483,7 @@ midori_transfers_popup (GtkWidget*       widget,
         _("Copy Link Loc_ation"), download,
         midori_transfers_copy_address_activate_cb, FALSE, transfers);
 
-    sokoke_widget_popup (widget, GTK_MENU (menu),
-                         event, SOKOKE_MENU_POSITION_CURSOR);
+    katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
 }
 #endif