diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-01-30 21:53:39 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-01-30 21:53:39 +0800 |
| commit | bd2108eb559d0538b59c6907b89f7aba137431dd (patch) | |
| tree | 5a35409492af0c228f90a2e524a6db804c579992 /lib/egg | |
| parent | c1008f8781b7940bb7096bc6e5fe250ec6ebcaf2 (diff) | |
| download | gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar.gz gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar.bz2 gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar.lz gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar.xz gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.tar.zst gsoc2013-epiphany-bd2108eb559d0538b59c6907b89f7aba137431dd.zip | |
Allow to drag also normal urls in the toolbars. Commit some fixes I did to
2003-01-30 Marco Pesenti Gritti <marco@it.gnome.org>
* data/ui/epiphany-toolbar.xml.in:
* embed/mozilla/EphyWrapper.cpp:
* embed/mozilla/Makefile.am:
* lib/egg/egg-action.c: (disconnect_proxy):
* lib/egg/egg-menu-merge.c: (update_node):
* lib/ephy-dnd.c: (ephy_dnd_uri_list_extract_uris):
* lib/ephy-dnd.h:
* lib/ephy-string.c: (ephy_str_to_int):
* lib/widgets/ephy-editable-toolbar.c: (item_node_new),
(impl_get_action), (add_action), (parse_item_list),
(toolbar_list_to_xml), (ephy_editable_toolbar_save), (do_merge),
(free_node), (ephy_editable_toolbar_finalize):
* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_get_bookmark_id):
* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_add),
(ephy_new_bookmark_response_cb), (ephy_new_bookmark_init),
(ephy_new_bookmark_set_icon), (ephy_new_bookmark_get_id):
* src/bookmarks/ephy-new-bookmark.h:
* src/popup-commands.c: (popup_cmd_add_link_bookmark):
* src/toolbar.c: (get_bookmark_action), (toolbar_get_action):
* src/window-commands.c: (window_cmd_file_add_bookmark):
Allow to drag also normal urls in the toolbars.
Commit some fixes I did to the eggmenu stuff, now
toolbar editor should work well, please start
reporting bugs :)
Diffstat (limited to 'lib/egg')
| -rw-r--r-- | lib/egg/egg-action.c | 11 | ||||
| -rw-r--r-- | lib/egg/egg-menu-merge.c | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/egg/egg-action.c b/lib/egg/egg-action.c index 360ba358e..89886b575 100644 --- a/lib/egg/egg-action.c +++ b/lib/egg/egg-action.c @@ -560,11 +560,14 @@ disconnect_proxy (EggAction *action, GtkWidget *proxy) G_CALLBACK (egg_action_sync_stock_id), proxy); /* menu item specific synchronisers ... */ - g_signal_handlers_disconnect_by_func (action, - G_CALLBACK (egg_action_sync_label), - proxy); + if (GTK_IS_MENU_ITEM (proxy)) + { + g_signal_handlers_disconnect_by_func (action, + G_CALLBACK (egg_action_sync_label), + proxy); - gtk_menu_item_set_accel_path (GTK_MENU_ITEM (proxy), NULL); + gtk_menu_item_set_accel_path (GTK_MENU_ITEM (proxy), NULL); + } /* toolbar button specific synchronisers ... */ g_signal_handlers_disconnect_by_func (action, diff --git a/lib/egg/egg-menu-merge.c b/lib/egg/egg-menu-merge.c index 3bdd73156..bacc34dde 100644 --- a/lib/egg/egg-menu-merge.c +++ b/lib/egg/egg-menu-merge.c @@ -992,8 +992,8 @@ update_node (EggMenuMerge *self, GNode *node) goto recurse_children; } - if (info->action) - g_object_unref (info->action); +/* if (info->action) + g_object_unref (info->action);*/ info->action = action; /* if (info->action) g_object_ref (info->action);*/ |