Fixed wrong POTFILES.in. Fixed gtk2.0 compat.

(Old svn revision: 4453)

14 files changed, 10 insertions, 11 deletions

diff --git a/TODO b/TODO
index 6a08bb75..5e107947 100644
--- a/TODO
+++ b/TODO
@@ -5,8 +5,6 @@
  * Multiscreen support is missing (e.g. with the logout screen)
  * Save to XML instead of this binary format.
  * Honor SmRestartStyleHint
- * Try to translate userids provided by smproxy to usernames if hostnames
-   match.
  * Add APM support
  * Use GScanner to parse splash.theme files?!
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b23f690f..5651895e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,5 +9,4 @@
 ./xfce4-session/util.c
 ./xfce4-session/client-list.c
 ./xfce4-session/xfce_trayicon.c
-./xfce4-session/tray-icon.c
 ./xfce4-shutdown/main.c
diff --git a/po/de.gmo b/po/de.gmo
index 3565d7fe..07800d9a 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 0112ba00..e39cef1b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XFSession 0.0.15\n"
-"POT-Creation-Date: 2003-07-12 20:26+0200\n"
+"POT-Creation-Date: 2003-07-13 10:10+0200\n"
 "PO-Revision-Date: 2003-07-011 20:10+0100\n"
 "Last-Translator: Moritz Heiber <moritz-heiber@arcor.de>\n"
 "Language-Team: none <none@none>\n"
diff --git a/po/es.gmo b/po/es.gmo
index 79117b89..e752a806 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index f4bbaa81..1fd881cb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-07-12 20:26+0200\n"
+"POT-Creation-Date: 2003-07-13 10:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es_MX.gmo b/po/es_MX.gmo
index 79117b89..e752a806 100644
--- a/po/es_MX.gmo
+++ b/po/es_MX.gmo
diff --git a/po/es_MX.po b/po/es_MX.po
index f4bbaa81..1fd881cb 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-07-12 20:26+0200\n"
+"POT-Creation-Date: 2003-07-13 10:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/nl.gmo b/po/nl.gmo
index eb726059..cf944a6f 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index bdb79621..0ba38ba8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-07-12 20:26+0200\n"
+"POT-Creation-Date: 2003-07-13 10:10+0200\n"
 "PO-Revision-Date: 2003-07-08 15:00+0200\n"
 "Last-Translator: Jasper Huijsmans <huysmans@users.sourceforge.net>\n"
 "Language-Team: Nederlands <NL@li.org>\n"
diff --git a/po/xfce4-session.pot b/po/xfce4-session.pot
index 73e30675..f965b6d0 100644
--- a/po/xfce4-session.pot
+++ b/po/xfce4-session.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-07-12 20:26+0200\n"
+"POT-Creation-Date: 2003-07-13 10:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 3c1ac715..e62dd390 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2af0a7bd..4dd86090 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XFSession 0.0.15\n"
-"POT-Creation-Date: 2003-07-12 20:26+0200\n"
+"POT-Creation-Date: 2003-07-13 10:10+0200\n"
 "PO-Revision-Date: 2003-07-10 13:10+0200\n"
 "Last-Translator: Yongtao Yang <yongtao.yang@telia.com>\n"
 "Language-Team: none <none@none>\n"
diff --git a/xfce4-session/xfce_trayicon.c b/xfce4-session/xfce_trayicon.c
index fdc65a2d..d48a3df2 100644
--- a/xfce4-session/xfce_trayicon.c
+++ b/xfce4-session/xfce_trayicon.c
@@ -28,6 +28,9 @@
 #include <config.h>
 #endif /* !HAVE_CONFIG_H */
 
+#include <X11/Xlib.h>
+
+#include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
 #include <xfce_trayicon.h>
@@ -179,8 +182,7 @@ xfce_tray_icon_embedded(GtkWidget *widget, XfceTrayIcon *icon)
 static void
 xfce_tray_icon_reconnect(XfceTrayIcon *icon)
 {
-	icon->tray = netk_tray_icon_new(GDK_SCREEN_XSCREEN(
-				gdk_screen_get_default()));
+	icon->tray = netk_tray_icon_new(DefaultScreenOfDisplay(GDK_DISPLAY()));
 	(void)g_signal_connect(G_OBJECT(icon->tray), "embedded",
 			G_CALLBACK(xfce_tray_icon_embedded), icon);
 	gtk_widget_show(icon->tray);