Updated German translation, fix #567910.

[evince.git] / cut-n-paste / toolbar-editor / egg-editable-toolbar.c

diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
index 86ae386ce4431aae48760aad12e643c8c8e08cb4..95b0adddf915cdee85495d8998a40a845ddbb5f5 100644 (file)
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -25,26 +25,7 @@
 #include "egg-toolbars-model.h"
 #include "egg-toolbar-editor.h"
 
 #include "egg-toolbars-model.h"
 #include "egg-toolbar-editor.h"
 

-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkseparatortoolitem.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>

 #include <glib/gi18n.h>
 #include <string.h>
 
 #include <glib/gi18n.h>
 #include <string.h>
 


@@ -434,9 +415,13 @@ configure_item_cursor (GtkToolItem *item,
       if (priv->edit_mode > 0)
         {
           GdkCursor *cursor;
       if (priv->edit_mode > 0)
         {
           GdkCursor *cursor;

+         GdkScreen *screen;

           GdkPixbuf *pixbuf = NULL;
           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);
 
           gdk_window_set_cursor (widget->window, cursor);
           gdk_cursor_unref (cursor);
 


@@ -1763,10 +1748,13 @@ new_pixbuf_from_widget (GtkWidget *widget)
   GdkVisual *visual;
   gint icon_width;
   gint icon_height;
   GdkVisual *visual;
   gint icon_width;
   gint icon_height;

+  GdkScreen *screen;

 
   icon_width = DEFAULT_ICON_WIDTH;
 
 
   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))
                                          GTK_ICON_SIZE_LARGE_TOOLBAR,
                                          NULL, 
                                          &icon_height))