Fix multihead problems in toolbar editor. Fixes bug #382055.

2007-08-11  Carlos Garcia Campos  <carlosgc@gnome.org>
	* cut-n-paste/toolbar-editor/egg-toolbar-editor.c:
	(set_drag_cursor):
	* cut-n-paste/toolbar-editor/egg-editable-toolbar.c:
	(configure_item_cursor), (new_pixbuf_from_widget):
	Fix multihead problems in toolbar editor. Fixes bug #382055.

svn path=/trunk/; revision=2617

diff --git a/ChangeLog b/ChangeLog
index 2f5c5b39285cb1d792fbbbb896acf1654041bc11..97f08e3166d954341a7c8739fd973595de6b5bb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-11  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * cut-n-paste/toolbar-editor/egg-toolbar-editor.c:
+       (set_drag_cursor):
+       * cut-n-paste/toolbar-editor/egg-editable-toolbar.c:
+       (configure_item_cursor), (new_pixbuf_from_widget):
+
+       Fix multihead problems in toolbar editor. Fixes bug #382055.
+       
 2007-08-11  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-window.c: (ev_window_cmd_file_open),

diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
index 86ae386ce4431aae48760aad12e643c8c8e08cb4..d65b7eb97086a6e2dd6c4cbbd9ea288b094620ef 100644 (file)
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -434,9 +434,13 @@ configure_item_cursor (GtkToolItem *item,
       if (priv->edit_mode > 0)
         {
           GdkCursor *cursor;
+         GdkScreen *screen;
           GdkPixbuf *pixbuf = NULL;
-          
-          cursor = gdk_cursor_new (GDK_HAND2);
+
+         screen = gtk_widget_get_screen (GTK_WIDGET (etoolbar));
+         
+          cursor = gdk_cursor_new_for_display (gdk_screen_get_display (screen),
+                                              GDK_HAND2);
           gdk_window_set_cursor (widget->window, cursor);
           gdk_cursor_unref (cursor);
 
@@ -1763,10 +1767,13 @@ new_pixbuf_from_widget (GtkWidget *widget)
   GdkVisual *visual;
   gint icon_width;
   gint icon_height;
+  GdkScreen *screen;
 
   icon_width = DEFAULT_ICON_WIDTH;
 
-  if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), 
+  screen = gtk_widget_get_screen (widget);
+
+  if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen),
                                          GTK_ICON_SIZE_LARGE_TOOLBAR,
                                          NULL, 
                                          &icon_height))

diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
index 07674d470bd635f567f48964698222afac71afce..8671cd4c35ef39c3488d4b127f1a081f06adaa0c 100644 (file)
--- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
+++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
@@ -312,10 +312,12 @@ static void
 set_drag_cursor (GtkWidget *widget)
 {
   GdkCursor *cursor;
+  GdkScreen *screen;
   
-  /* FIXME multihead */
-  cursor = gdk_cursor_new (GDK_HAND2);
-
+  screen = gtk_widget_get_screen (widget);
+  
+  cursor = gdk_cursor_new_for_display (gdk_screen_get_display (screen),
+                                      GDK_HAND2);
   gdk_window_set_cursor (widget->window, cursor);
   gdk_cursor_unref (cursor);
 }