Mercurial > pidgin.yaz

comparison pidgin/gtksession.c @ 22490:d128201714e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gdk_display_get_name() and gdk_display_get_default() are new in Gtk 2.2
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 17 Mar 2008 14:35:33 +0000
parents c38d72677c8a
children 584063555949
comparison
equal deleted inserted replaced
22489:2f88870f86bf 22490:d128201714e9
35 #include <X11/SM/SMlib.h> 35 #include <X11/SM/SMlib.h>
36 #include <gdk/gdkx.h> 36 #include <gdk/gdkx.h>
37 #include <unistd.h> 37 #include <unistd.h>
38 #include <fcntl.h> 38 #include <fcntl.h>
39 #include <gdk/gdk.h> 39 #include <gdk/gdk.h>
40 #include <gtk/gtk.h>
40 41
41 #define ERROR_LENGTH 512 42 #define ERROR_LENGTH 512
42 43
43 static IceIOErrorHandler ice_installed_io_error_handler; 44 static IceIOErrorHandler ice_installed_io_error_handler;
44 static SmcConn session = NULL; 45 static SmcConn session = NULL;
160 if (config_dir) { 161 if (config_dir) {
161 ret[j++] = g_strdup("--config"); 162 ret[j++] = g_strdup("--config");
162 ret[j++] = g_strdup(config_dir); 163 ret[j++] = g_strdup(config_dir);
163 } 164 }
164 165
166 #if GTK_CHECK_VERSION(2,2,0)
165 ret[j++] = g_strdup("--display"); 167 ret[j++] = g_strdup("--display");
166 ret[j++] = g_strdup((gchar *)gdk_display_get_name(gdk_display_get_default())); 168 ret[j++] = g_strdup((gchar *)gdk_display_get_name(gdk_display_get_default()));
169 #endif
167 170
168 ret[j++] = NULL; 171 ret[j++] = NULL;
169 172
170 return ret; 173 return ret;
171 } 174 }