From bd2108eb559d0538b59c6907b89f7aba137431dd Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 30 Jan 2003 13:53:39 +0000 Subject: Allow to drag also normal urls in the toolbars. Commit some fixes I did to 2003-01-30 Marco Pesenti Gritti * 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 :) --- embed/mozilla/EphyWrapper.cpp | 2 +- embed/mozilla/Makefile.am | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'embed/mozilla') diff --git a/embed/mozilla/EphyWrapper.cpp b/embed/mozilla/EphyWrapper.cpp index 8473d1a6f..ce89557da 100644 --- a/embed/mozilla/EphyWrapper.cpp +++ b/embed/mozilla/EphyWrapper.cpp @@ -42,7 +42,7 @@ #include "nsIComponentManager.h" #include "nsIScriptGlobalObject.h" #include "nsIScriptContext.h" - +#include "nsToolkitCompsCID.h" #include "nsIDOMWindowInternal.h" #include "nsIInterfaceRequestor.h" #include "nsIFocusController.h" diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index 0bac73513..6b28eb267 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -30,6 +30,7 @@ INCLUDES = \ -I$(MOZILLA_INCLUDE_ROOT)/progressDlg \ -I$(MOZILLA_INCLUDE_ROOT)/sidebar \ -I$(MOZILLA_INCLUDE_ROOT)/shistory \ + -I$(MOZILLA_INCLUDE_ROOT)/history \ -I$(MOZILLA_INCLUDE_ROOT)/uconv \ -I$(MOZILLA_INCLUDE_ROOT)/uriloader \ -I$(MOZILLA_INCLUDE_ROOT)/unicharutil \ @@ -40,6 +41,7 @@ INCLUDES = \ -I$(MOZILLA_INCLUDE_ROOT)/widget \ -I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \ -I$(MOZILLA_INCLUDE_ROOT)/typeaheadfind \ + -I$(MOZILLA_INCLUDE_ROOT)/toolkitcomps \ $(GCONF_CFLAGS) \ $(EPIPHANY_DEPENDENCY_CFLAGS) \ -DLIB_DIR=\"$(pkglibdir)\" \ -- cgit v1.2.3