2008-07-20 [paul] 3.5.0cvs30

	* src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
		remove redundant GTK version check

diff --git a/ChangeLog b/ChangeLog
index 6399da5739d015f43d7c2391ac5a160417cfc9b5..933295903d4e5f8e1a4eb01c06ec8a3361e4e7ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-20 [paul]      3.5.0cvs30
+
+       * src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
+               remove redundant GTK version check
+
 2008-07-20 [ticho]     3.5.0cvs29
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 178352d0ff129a08a9d7d95eb4ed717b1ac3b1c2..ffe2bb720d36d450a65785d2638a7af69f699dba 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3441,3 +3441,4 @@
 ( cvs diff -u -r 1.5.10.22 -r 1.5.10.23 src/addrgather.c;  cvs diff -u -r 1.274.2.254 -r 1.274.2.255 src/mainwindow.c;  cvs diff -u -r 1.39.2.48 -r 1.39.2.49 src/mainwindow.h;  ) > 3.5.0cvs27.patchset
 ( cvs diff -u -r 1.5.10.23 -r 1.5.10.24 src/addrgather.c;  ) > 3.5.0cvs28.patchset
 ( cvs diff -u -r 1.207.2.202 -r 1.207.2.203 src/folderview.c;  cvs diff -u -r 1.1.2.58 -r 1.1.2.59 src/imap_gtk.c;  cvs diff -u -r 1.2.2.26 -r 1.2.2.27 src/news_gtk.c;  ) > 3.5.0cvs29.patchset
+( cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 3.5.0cvs30.patchset

diff --git a/configure.ac b/configure.ac
index 820374e7d3d9f7c83e65596427c16036bb7872e5..a1a8632edc41489b4571bc26660875e379373f80 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c b/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
index d3d66773800cca88c8304c49560af4cdc7120fbd..2e93f65da045d1f58ea88d2d48910507b311ab64 100644 (file)
--- a/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
+++ b/src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
@@ -402,12 +402,8 @@ egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
   
   g_return_if_fail (icon->manager_window != None);
 
-#if GTK_CHECK_VERSION(2,1,0)
   gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
                                          icon->manager_window);
-#else
-  gdkwin = gdk_window_lookup (icon->manager_window);
-#endif
 
   gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
 
@@ -454,19 +450,13 @@ egg_tray_icon_realize (GtkWidget *widget)
   egg_tray_icon_update_manager_window (icon, FALSE);
   egg_tray_icon_send_dock_request (icon);
 
-#if GTK_CHECK_VERSION(2,1,0)
   root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
-#else
-  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
-#endif
  
   /* Add a root window filter so that we get changes on MANAGER */
   gdk_window_add_filter (root_window,
                         egg_tray_icon_manager_filter, icon);
 }
 
-
-#if GTK_CHECK_VERSION(2,1,0)
 EggTrayIcon *
 egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
 {
@@ -474,7 +464,6 @@ egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
 
   return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title", name, NULL);
 }
-#endif
 
 EggTrayIcon*
 egg_tray_icon_new (const gchar *name)