aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--data/art/Makefile.am3
-rw-r--r--data/art/hand-open.pngbin1088 -> 0 bytes
-rwxr-xr-xlib/egg/egg-toolbar-editor.c11
4 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cbd03260..86cf9a0d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2005-11-03 Christian Persch <chpe@cvs.gnome.org>
+ * data/art/Makefile.am:
+ R data/art/hand-open.png:
+ * lib/egg/egg-toolbar-editor.c: (drag_data_get_cb),
+ (set_drag_cursor):
+
+ Use a gtk stock cursor (GDK_HAND2) instead of our own, un-themed one.
+
+2005-11-03 Christian Persch <chpe@cvs.gnome.org>
+
* lib/widgets/ephy-location-entry.c: (favicon_drag_begin_cb),
(ephy_location_entry_construct_contents):
diff --git a/data/art/Makefile.am b/data/art/Makefile.am
index 3ace0c8df..445ad87c3 100644
--- a/data/art/Makefile.am
+++ b/data/art/Makefile.am
@@ -4,8 +4,7 @@ art_DATA = \
epiphany-download.png \
epiphany-history.png \
epiphany-popup-hidden.png \
- epiphany-bookmarks.png \
- hand-open.png
+ epiphany-bookmarks.png
appicon_DATA = epiphany-bookmarks.png
appicondir = $(datadir)/pixmaps
diff --git a/data/art/hand-open.png b/data/art/hand-open.png
deleted file mode 100644
index 55ac7b8cf..000000000
--- a/data/art/hand-open.png
+++ /dev/null
Binary files differ
diff --git a/lib/egg/egg-toolbar-editor.c b/lib/egg/egg-toolbar-editor.c
index 4cb7d0ccc..46ac89c48 100755
--- a/lib/egg/egg-toolbar-editor.c
+++ b/lib/egg/egg-toolbar-editor.c
@@ -308,7 +308,8 @@ drag_data_get_cb (GtkWidget *widget,
target = g_object_get_data (G_OBJECT (widget), "egg-item-name");
g_return_if_fail (target != NULL);
- gtk_selection_data_set (selection_data, selection_data->target, 8, target, strlen (target));
+ gtk_selection_data_set (selection_data, selection_data->target, 8,
+ (const guchar *) target, strlen (target));
}
static gchar *
@@ -341,14 +342,12 @@ static void
set_drag_cursor (GtkWidget *widget)
{
GdkCursor *cursor;
- GdkPixbuf *pixbuf;
-
- pixbuf = gdk_pixbuf_new_from_file (CURSOR_DIR "/hand-open.png", NULL);
- cursor = gdk_cursor_new_from_pixbuf (gdk_display_get_default (), pixbuf, 12, 12);
+
+ /* FIXME multihead */
+ cursor = gdk_cursor_new (GDK_HAND2);
gdk_window_set_cursor (widget->window, cursor);
gdk_cursor_unref (cursor);
- g_object_unref (pixbuf);
}
static void