# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1207172673 -10800
# Node ID 94186706beed6397c3eabaf8840893a5bd3fd2cb
# Parent  0fef72dce601b90733b2231b5dd4d20b4a4bbd8e
Use macro wrapping for Gtk+ v1 vs v2 differences, yet again.

diff -r 0fef72dce601 -r 94186706beed src/xmms-sid.h
--- a/src/xmms-sid.h	Thu Apr 03 00:34:07 2008 +0300
+++ b/src/xmms-sid.h	Thu Apr 03 00:44:33 2008 +0300
@@ -218,6 +218,8 @@
 #define XS_SIGNAL_CONNECT(SOBJ, SNAME, SFUNC, SDATA)        \
     gtk_signal_connect(GTK_OBJECT(SOBJ), SNAME, GTK_SIGNAL_FUNC(SFUNC), SDATA)
 
+#define XS_WINDOW_PRESENT(SWIN) gdk_window_raise(SWIN ->window)
+
 #ifdef __cplusplus
 }
 #endif
diff -r 0fef72dce601 -r 94186706beed src/xs_about.c
--- a/src/xs_about.c	Thu Apr 03 00:34:07 2008 +0300
+++ b/src/xs_about.c	Thu Apr 03 00:44:33 2008 +0300
@@ -72,7 +72,7 @@
 
     /* Check if there already is an open about window */
     if (xs_aboutwin != NULL) {
-        gdk_window_raise(xs_aboutwin->window);
+        XS_WINDOW_PRESENT(xs_aboutwin);
         return;
     }
 
diff -r 0fef72dce601 -r 94186706beed src/xs_config.c
--- a/src/xs_config.c	Thu Apr 03 00:34:07 2008 +0300
+++ b/src/xs_config.c	Thu Apr 03 00:44:33 2008 +0300
@@ -775,7 +775,7 @@
     (void) user_data;
 
     if (xs_sldb_fileselector != NULL) {
-        gdk_window_raise(xs_sldb_fileselector->window);
+        XS_WINDOW_PRESENT(xs_sldb_fileselector);
         return;
     }
 
@@ -813,7 +813,7 @@
     (void) user_data;
 
     if (xs_stil_fileselector != NULL) {
-        gdk_window_raise(xs_stil_fileselector->window);
+        XS_WINDOW_PRESENT(xs_stil_fileselector);
         return;
     }
 
@@ -852,7 +852,7 @@
     (void) user_data;
 
     if (xs_hvsc_selector != NULL) {
-        gdk_window_raise(xs_hvsc_selector->window);
+        XS_WINDOW_PRESENT(xs_hvsc_selector);
         return;
     }
 
@@ -1011,7 +1011,7 @@
     (void) user_data;
 
     if (xs_filt_importselector != NULL) {
-        gdk_window_raise(xs_filt_importselector->window);
+        XS_WINDOW_PRESENT(xs_filt_importselector);
         return;
     }
 
@@ -1050,7 +1050,7 @@
     (void) user_data;
 
     if (xs_filt_exportselector != NULL) {
-        gdk_window_raise(xs_filt_exportselector->window);
+        XS_WINDOW_PRESENT(xs_filt_exportselector);
         return;
     }
 
@@ -1260,7 +1260,7 @@
 
     /* Check if the window already exists */
     if (xs_configwin) {
-        gdk_window_raise(xs_configwin->window);
+        XS_WINDOW_PRESENT(xs_configwin);
         return;
     }
 
diff -r 0fef72dce601 -r 94186706beed src/xs_fileinfo.c
--- a/src/xs_fileinfo.c	Thu Apr 03 00:34:07 2008 +0300
+++ b/src/xs_fileinfo.c	Thu Apr 03 00:44:33 2008 +0300
@@ -202,7 +202,7 @@
 
     /* Check if there already is an open fileinfo window */
     if (xs_fileinfowin)
-        gdk_window_raise(xs_fileinfowin->window);
+        XS_WINDOW_PRESENT(xs_fileinfowin);
     else {
         xs_fileinfowin = create_xs_fileinfowin();
 #ifndef AUDACIOUS_PLUGIN