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

Fix browser notebook callback naming

Browse source
This commit is contained in:
Christian Dywan 2012-03-08 00:52:47 +01:00
parent 6e6faabad9
commit f9aa8aed9c
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
midori/midori-browser.c
View file

@ -4896,10 +4896,10 @@ midori_panel_close_cb (MidoriPanel* panel,
} }
static void static void
gtk_notebook_switch_page_cb (GtkWidget* notebook, midori_browser_notebook_switch_page_cb (GtkWidget* notebook,
gpointer page, gpointer page,
guint page_num, guint page_num,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
GtkWidget* widget; GtkWidget* widget;
GtkAction* action; GtkAction* action;
@ -4915,10 +4915,10 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook,
} }
static void static void
gtk_notebook_switch_page_after_cb (GtkWidget* notebook, midori_browser_notebook_switch_page_after_cb (GtkWidget* notebook,
gpointer page, gpointer page,
guint page_num, guint page_num,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
GtkWidget* widget; GtkWidget* widget;
MidoriView* view; MidoriView* view;
@ -4991,8 +4991,8 @@ midori_browser_notebook_create_window_cb (GtkNotebook* notebook,
} }
static void static void
midori_browser_switch_tab_cb (GtkWidget* menuitem, midori_browser_menu_item_switch_tab_cb (GtkWidget* menuitem,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem), "index")); gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem), "index"));
midori_browser_set_current_page (browser, page); midori_browser_set_current_page (browser, page);
@ -5041,7 +5041,7 @@ midori_browser_notebook_button_press_event_after_cb (GtkNotebook* notebook,
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
g_object_set_data (G_OBJECT (menuitem), "index", GINT_TO_POINTER (i)); g_object_set_data (G_OBJECT (menuitem), "index", GINT_TO_POINTER (i));
g_signal_connect (menuitem, "activate", g_signal_connect (menuitem, "activate",
G_CALLBACK (midori_browser_switch_tab_cb), browser); G_CALLBACK (midori_browser_menu_item_switch_tab_cb), browser);
i++; i++;
} }
g_list_free (tabs); g_list_free (tabs);
@ -6162,10 +6162,10 @@ midori_browser_init (MidoriBrowser* browser)
gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE); gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE);
gtk_paned_pack1 (GTK_PANED (vpaned), browser->notebook, FALSE, FALSE); gtk_paned_pack1 (GTK_PANED (vpaned), browser->notebook, FALSE, FALSE);
g_signal_connect (browser->notebook, "switch-page", g_signal_connect (browser->notebook, "switch-page",
G_CALLBACK (gtk_notebook_switch_page_cb), G_CALLBACK (midori_browser_notebook_switch_page_cb),
browser); browser);
g_signal_connect_after (browser->notebook, "switch-page", g_signal_connect_after (browser->notebook, "switch-page",
G_CALLBACK (gtk_notebook_switch_page_after_cb), G_CALLBACK (midori_browser_notebook_switch_page_after_cb),
browser); browser);
g_signal_connect (browser->notebook, "page-reordered", g_signal_connect (browser->notebook, "page-reordered",
G_CALLBACK (midori_browser_notebook_page_reordered_cb), G_CALLBACK (midori_browser_notebook_page_reordered_cb),