debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove sokoke_widget_popup and replace all call sites

Browse source
This commit is contained in:
Christian Dywan 2009-11-15 18:00:33 +01:00
parent 6e6f6e867a
commit fd7d778e0c
12 changed files with 11 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/feed-panel/feed-panel.c
View file

@ -553,8 +553,8 @@ feed_panel_popup (GtkWidget* widget,
item, feed_panel_delete_activate_cb, panel); item, feed_panel_delete_activate_cb, panel);
} }
sokoke_widget_popup (widget, GTK_MENU (menu), katze_widget_popup (widget, GTK_MENU (menu),
event, SOKOKE_MENU_POSITION_CURSOR); event, KATZE_MENU_POSITION_CURSOR);
} }
static gboolean static gboolean

3
extensions/tab-panel.c
View file

@ -196,8 +196,7 @@ tab_panel_popup (GtkWidget* widget,
{ {
GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (view)); GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (view));
sokoke_widget_popup (widget, GTK_MENU (menu), katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
event, SOKOKE_MENU_POSITION_CURSOR);
} }
static gboolean static gboolean

3
midori/midori-browser.c
View file

@ -3852,8 +3852,7 @@ midori_browser_bookmark_popup (GtkWidget* widget,
midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL, midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL,
item, midori_browser_bookmark_delete_activate_cb, browser); item, midori_browser_bookmark_delete_activate_cb, browser);
sokoke_widget_popup (widget, GTK_MENU (menu), katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
event, SOKOKE_MENU_POSITION_CURSOR);
} }
static void static void

2
midori/midori-panel.c
View file

@ -711,7 +711,7 @@ midori_panel_options_clicked_cb (GtkToolItem* toolitem,
g_signal_emit_by_name (viewable, "populate-option-menu", menu); g_signal_emit_by_name (viewable, "populate-option-menu", menu);
katze_widget_popup (GTK_WIDGET (toolitem), GTK_MENU (menu), katze_widget_popup (GTK_WIDGET (toolitem), GTK_MENU (menu),
NULL, SOKOKE_MENU_POSITION_LEFT); NULL, KATZE_MENU_POSITION_LEFT);
} }
#endif #endif

3
midori/midori-searchaction.c
View file

@ -501,8 +501,7 @@ midori_search_action_icon_released_cb (GtkWidget* entry,
g_signal_connect (menuitem, "activate", g_signal_connect (menuitem, "activate",
G_CALLBACK (midori_search_action_manage_activate_cb), action); G_CALLBACK (midori_search_action_manage_activate_cb), action);
gtk_widget_show (menuitem); gtk_widget_show (menuitem);
sokoke_widget_popup (entry, GTK_MENU (menu), katze_widget_popup (entry, GTK_MENU (menu), NULL, KATZE_MENU_POSITION_LEFT);
NULL, SOKOKE_MENU_POSITION_LEFT);
} }
static gboolean static gboolean

2
midori/midori-view.c
View file

@ -3362,7 +3362,7 @@ midori_view_tab_label_button_release_event (GtkWidget* tab_label,
GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (widget)); GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (widget));
katze_widget_popup (widget, GTK_MENU (menu), katze_widget_popup (widget, GTK_MENU (menu),
event, SOKOKE_MENU_POSITION_CURSOR); event, KATZE_MENU_POSITION_CURSOR);
return TRUE; return TRUE;
} }

9
midori/sokoke.c
View file

@ -485,15 +485,6 @@ sokoke_container_show_children (GtkContainer* container)
gtk_container_foreach (container, (GtkCallback)(gtk_widget_show_all), NULL); 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 typedef enum
{ {
SOKOKE_DESKTOP_UNTESTED, SOKOKE_DESKTOP_UNTESTED,

12
midori/sokoke.h
View file

@ -55,12 +55,6 @@ sokoke_magic_uri (const gchar* uri,
gchar* gchar*
sokoke_format_uri_for_display (const gchar* uri); 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 void
sokoke_combo_box_add_strings (GtkComboBox* combobox, sokoke_combo_box_add_strings (GtkComboBox* combobox,
const gchar* label_first, const gchar* label_first,
@ -73,12 +67,6 @@ sokoke_widget_set_visible (GtkWidget* widget,
void void
sokoke_container_show_children (GtkContainer* container); sokoke_container_show_children (GtkContainer* container);
void
sokoke_widget_popup (GtkWidget* widget,
GtkMenu* menu,
GdkEventButton* event,
SokokeMenuPos pos);
GtkWidget* GtkWidget*
sokoke_xfce_header_new (const gchar* icon, sokoke_xfce_header_new (const gchar* icon,
const gchar* title); const gchar* title);

3
panels/midori-bookmarks.c
View file

@ -797,8 +797,7 @@ midori_bookmarks_popup (GtkWidget* widget,
midori_bookmarks_popup_item (menu, GTK_STOCK_DELETE, NULL, midori_bookmarks_popup_item (menu, GTK_STOCK_DELETE, NULL,
item, midori_bookmarks_delete_activate_cb, bookmarks); item, midori_bookmarks_delete_activate_cb, bookmarks);
sokoke_widget_popup (widget, GTK_MENU (menu), katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
event, SOKOKE_MENU_POSITION_CURSOR);
} }
static gboolean static gboolean

3
panels/midori-extensions.c
View file

@ -382,8 +382,7 @@ midori_extensions_popup (GtkWidget* widget,
midori_extensions_about_activate_cb, FALSE, midori_extensions_about_activate_cb, FALSE,
extensions); extensions);
sokoke_widget_popup (widget, GTK_MENU (menu), katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
event, SOKOKE_MENU_POSITION_CURSOR);
g_free (website); g_free (website);
} }

3
panels/midori-history.c
View file

@ -840,8 +840,7 @@ midori_history_popup (GtkWidget* widget,
midori_history_popup_item (menu, GTK_STOCK_DELETE, NULL, midori_history_popup_item (menu, GTK_STOCK_DELETE, NULL,
item, midori_history_delete_activate_cb, history); item, midori_history_delete_activate_cb, history);
sokoke_widget_popup (widget, GTK_MENU (menu), katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
event, SOKOKE_MENU_POSITION_CURSOR);
} }
static gboolean static gboolean

3
panels/midori-transfers.c
View file

@ -483,8 +483,7 @@ midori_transfers_popup (GtkWidget* widget,
_("Copy Link Loc_ation"), download, _("Copy Link Loc_ation"), download,
midori_transfers_copy_address_activate_cb, FALSE, transfers); midori_transfers_copy_address_activate_cb, FALSE, transfers);
sokoke_widget_popup (widget, GTK_MENU (menu), katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
event, SOKOKE_MENU_POSITION_CURSOR);
} }
#endif #endif