# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1189989737 0
# Node ID f1ad6437a3385f05864bc73ce36fefcf10d282f3
# Parent  df2961ce071417a5a6cf7f39098cf616509aea1b
Save default Gtk+ display in the command line for session restoration.

Fixes #3137

diff -r df2961ce0714 -r f1ad6437a338 pidgin/gtksession.c
--- a/pidgin/gtksession.c	Mon Sep 17 00:40:32 2007 +0000
+++ b/pidgin/gtksession.c	Mon Sep 17 00:42:17 2007 +0000
@@ -36,6 +36,7 @@
 #include <gdk/gdkx.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <gdk/gdk.h>
 
 #define ERROR_LENGTH 512
 
@@ -141,7 +142,7 @@
 /* my magic utility function */
 
 static gchar **session_make_command(gchar *client_id, gchar *config_dir) {
-	gint i = 2;
+	gint i = 4;
 	gint j = 0;
 	gchar **ret;
 
@@ -161,6 +162,9 @@
 		ret[j++] = g_strdup(config_dir);
 	}
 
+	ret[j++] = g_strdup("--display");
+	ret[j++] = g_strdup((gchar *)gdk_display_get_name(gdk_display_get_default()));
+
 	ret[j++] = NULL;
 
 	return ret;