[gimp/gimp-2-6] help-browser: fix history menus
- From: Sven Neumann <neo src gnome org>
- To: svn-commits-list gnome org
- Subject: [gimp/gimp-2-6] help-browser: fix history menus
- Date: Mon, 20 Jul 2009 20:36:16 +0000 (UTC)
commit 0d6f48e9f0832b435e943c399929cb88682a4921
Author: Sven Neumann <sven gimp org>
Date: Tue May 12 09:39:21 2009 +0200
help-browser: fix history menus
The history menus located at the back and forward buttons stopped working
after a webkit update some time ago. With these changes the menus work
again, at least with recent webkit releases.
(cherry picked from commit 02960ed3bdcaac7ed318458cff908b3b1ba08641)
plug-ins/help-browser/dialog.c | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
---
diff --git a/plug-ins/help-browser/dialog.c b/plug-ins/help-browser/dialog.c
index 5ad6a06..159c67a 100644
--- a/plug-ins/help-browser/dialog.c
+++ b/plug-ins/help-browser/dialog.c
@@ -886,27 +886,30 @@ close_callback (GtkAction *action,
}
static void
-menu_callback (GtkWidget *menu,
- WebKitWebHistoryItem *item)
+menu_callback (GtkWidget *menu,
+ gpointer data)
{
- browser_dialog_load (webkit_web_history_item_get_uri (item));
+ gint steps = GPOINTER_TO_INT (data);
+
+ webkit_web_view_go_back_or_forward (WEBKIT_WEB_VIEW (view), steps);
}
-/* this function unrefs the items and frees the list */
static GtkWidget *
-build_menu (GList *items)
+build_menu (const GList *items,
+ gboolean back)
{
- GtkWidget *menu;
- GList *list;
+ GtkWidget *menu;
+ const GList *iter;
+ gint steps;
if (! items)
return NULL;
menu = gtk_menu_new ();
- for (list = items; list; list = g_list_next (list))
+ for (iter = items, steps = 1; iter; iter = g_list_next (iter), steps++)
{
- WebKitWebHistoryItem *item = list->data;
+ WebKitWebHistoryItem *item = iter->data;
const gchar *title;
title = webkit_web_history_item_get_title (item);
@@ -918,16 +921,12 @@ build_menu (GList *items)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
gtk_widget_show (menu_item);
- g_signal_connect_object (menu_item, "activate",
- G_CALLBACK (menu_callback),
- item, 0);
-
- g_object_unref (item);
+ g_signal_connect (menu_item, "activate",
+ G_CALLBACK (menu_callback),
+ GINT_TO_POINTER (back ? - steps : steps));
}
}
- g_list_free (items);
-
return menu;
}
@@ -950,12 +949,12 @@ update_actions (void)
if (back_forward_list)
{
- GList *list;
+ const GList *list;
list = webkit_web_back_forward_list_get_back_list_with_limit (back_forward_list,
12);
gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (button_prev),
- build_menu (list));
+ build_menu (list, TRUE));
}
else
{
@@ -971,12 +970,12 @@ update_actions (void)
if (back_forward_list)
{
- GList *list;
+ const GList *list;
list = webkit_web_back_forward_list_get_forward_list_with_limit (back_forward_list,
12);
gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (button_next),
- build_menu (list));
+ build_menu (list, FALSE));
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]