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

Use updated, unique arrays for Bookmarks and Tools

Browse source
This commit is contained in:
Christian Dywan 2012-02-22 22:00:23 +01:00
parent 8ad470caf5
commit bcc6711f27
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
midori/midori-browser.c
View file

@ -5798,6 +5798,7 @@ midori_browser_init (MidoriBrowser* browser)
GtkWidget* vpaned; GtkWidget* vpaned;
GtkRcStyle* rcstyle; GtkRcStyle* rcstyle;
GtkWidget* scrolled; GtkWidget* scrolled;
KatzeArray* dummy_array;
browser->settings = midori_web_settings_new (); browser->settings = midori_web_settings_new ();
browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY); browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY);
@ -5928,12 +5929,14 @@ midori_browser_init (MidoriBrowser* browser)
gtk_action_group_add_action_with_accel (browser->action_group, action, ""); gtk_action_group_add_action_with_accel (browser->action_group, action, "");
g_object_unref (action); g_object_unref (action);
dummy_array = katze_array_new (KATZE_TYPE_ARRAY);
katze_array_update (dummy_array);
action = g_object_new (KATZE_TYPE_ARRAY_ACTION, action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
"name", "Bookmarks", "name", "Bookmarks",
"label", _("_Bookmarks"), "label", _("_Bookmarks"),
"stock-id", STOCK_BOOKMARKS, "stock-id", STOCK_BOOKMARKS,
"tooltip", _("Show the saved bookmarks"), "tooltip", _("Show the saved bookmarks"),
"array", browser->proxy_array, /* Use a non-empty array here */ "array", dummy_array /* updated, unique */,
NULL); NULL);
g_object_connect (action, g_object_connect (action,
"signal::populate-folder", "signal::populate-folder",
@ -5943,12 +5946,15 @@ midori_browser_init (MidoriBrowser* browser)
NULL); NULL);
gtk_action_group_add_action_with_accel (browser->action_group, action, ""); gtk_action_group_add_action_with_accel (browser->action_group, action, "");
g_object_unref (action); g_object_unref (action);
g_object_unref (dummy_array);
dummy_array = katze_array_new (KATZE_TYPE_ITEM);
katze_array_update (dummy_array);
action = g_object_new (KATZE_TYPE_ARRAY_ACTION, action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
"name", "Tools", "name", "Tools",
"label", _("_Tools"), "label", _("_Tools"),
"stock-id", GTK_STOCK_PREFERENCES, "stock-id", GTK_STOCK_PREFERENCES,
"array", katze_array_new (KATZE_TYPE_ITEM), "array", dummy_array /* updated, unique */,
NULL); NULL);
g_object_connect (action, g_object_connect (action,
"signal::populate-popup", "signal::populate-popup",
@ -5958,6 +5964,7 @@ midori_browser_init (MidoriBrowser* browser)
NULL); NULL);
gtk_action_group_add_action (browser->action_group, action); gtk_action_group_add_action (browser->action_group, action);
g_object_unref (action); g_object_unref (action);
g_object_unref (dummy_array);
action = g_object_new (KATZE_TYPE_ARRAY_ACTION, action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
"name", "Window", "name", "Window",