aboutsummaryrefslogtreecommitdiffstats
path: root/lib/egg/egg-toolbar-editor.c
diff options
context:
space:
mode:
authorCrispin Flowerday <gnome@flowerday.cx>2004-04-03 06:41:41 +0800
committerCrispin Flowerday <crispin@src.gnome.org>2004-04-03 06:41:41 +0800
commit76b869d6e0ff46160db9175408c3a0a0ea138bea (patch)
tree281074e43251b3707eeabe416ca42d371826a27b /lib/egg/egg-toolbar-editor.c
parent1d907809af0cd53713c8e8891e686acaa104ad8f (diff)
downloadgsoc2013-epiphany-76b869d6e0ff46160db9175408c3a0a0ea138bea.tar
gsoc2013-epiphany-76b869d6e0ff46160db9175408c3a0a0ea138bea.tar.gz
gsoc2013-epiphany-76b869d6e0ff46160db9175408c3a0a0ea138bea.tar.bz2
gsoc2013-epiphany-76b869d6e0ff46160db9175408c3a0a0ea138bea.tar.lz
gsoc2013-epiphany-76b869d6e0ff46160db9175408c3a0a0ea138bea.tar.xz
gsoc2013-epiphany-76b869d6e0ff46160db9175408c3a0a0ea138bea.tar.zst
gsoc2013-epiphany-76b869d6e0ff46160db9175408c3a0a0ea138bea.zip
Synchronise changes from galeon, this fixes simple usage, stops crashes
2004-04-03 Crispin Flowerday <gnome@flowerday.cx> * lib/egg/egg-editable-toolbar.c: (set_fixed_style), (unset_fixed_style), (toolbar_changed_cb), (unparent_fixed), (update_fixed), (toolbars_clean), (egg_editable_toolbar_construct), (egg_editable_toolbar_set_model): * lib/egg/egg-toolbar-editor.c: (egg_toolbar_editor_load_actions): * lib/egg/egg-toolbars-model.h: Synchronise changes from galeon, this fixes simple usage, stops crashes when dragging items to and from other applications, and adds the ability to override the toolbar style.
Diffstat (limited to 'lib/egg/egg-toolbar-editor.c')
-rwxr-xr-xlib/egg/egg-toolbar-editor.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/egg/egg-toolbar-editor.c b/lib/egg/egg-toolbar-editor.c
index 991f4843b..34cbd6b48 100755
--- a/lib/egg/egg-toolbar-editor.c
+++ b/lib/egg/egg-toolbar-editor.c
@@ -34,12 +34,12 @@
#include <gtk/gtkhbox.h>
static GtkTargetEntry dest_drag_types[] = {
- {EGG_TOOLBAR_ITEM_TYPE, 0, 0},
+ {EGG_TOOLBAR_ITEM_TYPE, GTK_TARGET_SAME_APP, 0},
};
static int n_dest_drag_types = G_N_ELEMENTS (dest_drag_types);
static GtkTargetEntry source_drag_types[] = {
- {EGG_TOOLBAR_ITEM_TYPE, 0, 0},
+ {EGG_TOOLBAR_ITEM_TYPE, GTK_TARGET_SAME_APP, 0},
};
static int n_source_drag_types = G_N_ELEMENTS (source_drag_types);
@@ -694,7 +694,6 @@ egg_toolbar_editor_load_actions (EggToolbarEditor *editor,
xmlDocPtr doc;
xmlNodePtr root;
xmlNodePtr child;
- GList *l;
doc = xmlParseFile (xml_file);
root = xmlDocGetRootElement (doc);