2005-09-28 [martin] 1.9.14cvs60
authorMartin Schaaf <mascha@ma-scha.de>
Wed, 28 Sep 2005 11:10:58 +0000 (11:10 +0000)
committerMartin Schaaf <mascha@ma-scha.de>
Wed, 28 Sep 2005 11:10:58 +0000 (11:10 +0000)
* src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
fix bug #790 (Crash when restarting window manager (fluxbox))

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/plugins/trayicon/libeggtrayicon/eggtrayicon.c

index 76334d5be4a51d4e6067086cdb26898fd1d5ca54..2609094ce9e1470f4172f57683e4e9740640dfbc 100644 (file)
@@ -1,3 +1,8 @@
+2005-09-28 [martin]    1.9.14cvs60
+
+       * src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
+               fix bug #790 (Crash when restarting window manager (fluxbox))
+
 2005-09-28 [paul]      1.9.14cvs59
 
        * src/gtk/gtkaspell.c
index ec7d0aeb1582000ba5f9ff515bb84cf33d66adbd..958215bc10b01a5c47c852364580fb865f4d0508 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_quote.c;  ) > 1.9.14cvs57.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/sgpgme.c;  ) > 1.9.14cvs58.patchset
 ( cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/gtk/gtkaspell.c;  ) > 1.9.14cvs59.patchset
+( cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 1.9.14cvs60.patchset
index 595883b451f920283cd618df8337bfda7d6edab0..2f6030079decc7f901585c005239d382dba6f54a 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=59
+EXTRA_VERSION=60
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index a3e3baa16f312f083c123b8e989b72c98d6082eb..f10ca9f5e834f3df8f911ba9263aef24be26f5e8 100644 (file)
@@ -153,8 +153,12 @@ egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
   int error, result;
 
   g_assert (icon->manager_window != None);
-  
+#ifndef GDK_MULTIHEAD_SAFE
+  xdisplay = gdk_display;
+#else
   xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
+#endif
 
   gdk_error_trap_push ();
   type = None;
@@ -228,8 +232,12 @@ egg_tray_icon_unrealize (GtkWidget *widget)
     {
       GdkWindow *gdkwin;
 
+#ifndef GDK_MULTIHEAD_SAFE
+      gdkwin = gdk_window_lookup (icon->manager_window);
+#else
       gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
-                                              icon->manager_window);
+                                             icon->manager_window);
+#endif
 
       gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
     }
@@ -263,8 +271,12 @@ egg_tray_icon_send_manager_message (EggTrayIcon *icon,
   ev.data.l[3] = data2;
   ev.data.l[4] = data3;
 
+#ifndef GDK_MULTIHEAD_SAFE
+  display = gdk_display;
+#else
   display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-  
+#endif
+
   gdk_error_trap_push ();
   XSendEvent (display,
              icon->manager_window, False, NoEventMask, (XEvent *)&ev);
@@ -287,14 +299,22 @@ egg_tray_icon_update_manager_window (EggTrayIcon *icon)
 {
   Display *xdisplay;
   
+#ifndef GDK_MULTIHEAD_SAFE
+  xdisplay = gdk_display;
+#else
   xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-  
+#endif
+
   if (icon->manager_window != None)
     {
       GdkWindow *gdkwin;
 
+#ifndef GDK_MULTIHEAD_SAFE
+      gdkwin = gdk_window_lookup (icon->manager_window);
+#else
       gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
                                              icon->manager_window);
+#endif
       
       gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
     }
@@ -315,9 +335,13 @@ egg_tray_icon_update_manager_window (EggTrayIcon *icon)
     {
       GdkWindow *gdkwin;
 
+#ifndef GDK_MULTIHEAD_SAFE
+      gdkwin = gdk_window_lookup (icon->manager_window);
+#else
       gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
                                              icon->manager_window);
-      
+#endif
       gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
 
       /* Send a request that we'd like to dock */
@@ -428,7 +452,11 @@ egg_tray_icon_send_message (EggTrayIcon *icon,
       XClientMessageEvent ev;
       Display *xdisplay;
 
+#ifndef GDK_MULTIHEAD_SAFE
+      xdisplay = gdk_display;
+#else
       xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
+#endif
       
       ev.type = ClientMessage;
       ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));