Menu
▾
▴
[Pkgbuild-sfe-commits] SF.net SVN: pkgbuild: [1154] spec-files-extra/trunk/patches/ gdm-04-dynamic-display.diff
|
From: <sim...@us...> - 2008-05-23 21:00:47
|
Revision: 1154
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1154&view=rev
Author: simonzheng
Date: 2008-05-23 14:00:53 -0700 (Fri, 23 May 2008)
Log Message:
-----------
2008-05-24 simon.zheng <sim...@su...>
* patches/gdm-04-dynamic-display.diff: Reworked.
Modified Paths:
--------------
spec-files-extra/trunk/patches/gdm-04-dynamic-display.diff
Modified: spec-files-extra/trunk/patches/gdm-04-dynamic-display.diff
===================================================================
--- spec-files-extra/trunk/patches/gdm-04-dynamic-display.diff 2008-05-23 16:59:44 UTC (rev 1153)
+++ spec-files-extra/trunk/patches/gdm-04-dynamic-display.diff 2008-05-23 21:00:53 UTC (rev 1154)
@@ -1,6 +1,6 @@
diff -Nur gdm-2.22.0-orig/daemon/Makefile.am gdm-2.22.0/daemon/Makefile.am
--- gdm-2.22.0-orig/daemon/Makefile.am 2008-04-18 11:29:28.000000000 +0800
-+++ gdm-2.22.0/daemon/Makefile.am 2008-05-24 00:49:07.093091000 +0800
++++ gdm-2.22.0/daemon/Makefile.am 2008-05-24 04:37:49.036590000 +0800
@@ -301,6 +301,8 @@
gdm-static-display.h \
gdm-transient-display.c \
@@ -12,7 +12,7 @@
gdm-product-display.c \
diff -Nur gdm-2.22.0-orig/daemon/gdm-display.c gdm-2.22.0/daemon/gdm-display.c
--- gdm-2.22.0-orig/daemon/gdm-display.c 2008-04-18 11:29:28.000000000 +0800
-+++ gdm-2.22.0/daemon/gdm-display.c 2008-05-24 00:49:07.094867000 +0800
++++ gdm-2.22.0/daemon/gdm-display.c 2008-05-24 04:38:28.185974000 +0800
@@ -58,6 +58,8 @@
GTimer *slave_timer;
char *slave_command;
@@ -30,12 +30,17 @@
};
static void gdm_display_class_init (GdmDisplayClass *klass);
-@@ -483,7 +486,13 @@
+@@ -483,7 +486,18 @@
G_CALLBACK (slave_died),
display);
- command = g_strdup_printf ("%s --display-id %s",
-+ if (display->priv->xserver_command)
++ /* Use --xserver-command only when custom Xserver is
++ * specified. Because X_SERVER needs extra arguments
++ * like "-br -verbose", leave it to gdm-server.
++ */
++ if (display->priv->xserver_command != NULL
++ && strcmp (display->priv->xserver_command, X_SERVER) != 0)
+ command = g_strdup_printf ("%s --display-id %s --xserver-command %s",
+ display->priv->slave_command,
+ display->priv->id,
@@ -45,7 +50,7 @@
display->priv->slave_command,
display->priv->id);
-@@ -703,6 +712,14 @@
+@@ -703,6 +717,14 @@
}
static void
@@ -60,7 +65,7 @@
gdm_display_set_property (GObject *object,
guint prop_id,
const GValue *value,
-@@ -740,6 +757,9 @@
+@@ -740,6 +762,9 @@
case PROP_SLAVE_COMMAND:
_gdm_display_set_slave_command (self, g_value_get_string (value));
break;
@@ -70,7 +75,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -788,6 +808,9 @@
+@@ -788,6 +813,9 @@
case PROP_SLAVE_COMMAND:
g_value_set_string (value, self->priv->slave_command);
break;
@@ -80,7 +85,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -970,6 +993,14 @@
+@@ -970,6 +998,14 @@
G_MAXINT,
GDM_DISPLAY_UNMANAGED,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
@@ -90,14 +95,31 @@
+ g_param_spec_string ("xserver-command",
+ "xserver command",
+ "xserver command",
-+ NULL,
++ X_SERVER,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_type_class_add_private (klass, sizeof (GdmDisplayPrivate));
+@@ -1005,6 +1041,7 @@
+ g_free (display->priv->x11_display_name);
+ g_free (display->priv->x11_cookie);
+ g_free (display->priv->slave_command);
++ g_free (display->priv->xserver_command);
+
+ if (display->priv->access_file != NULL) {
+ g_object_unref (display->priv->access_file);
+@@ -1016,7 +1053,7 @@
+
+ if (display->priv->slave_timer != NULL) {
+ g_timer_destroy (display->priv->slave_timer);
+- }
++ }
+
+ G_OBJECT_CLASS (gdm_display_parent_class)->finalize (object);
+ }
diff -Nur gdm-2.22.0-orig/daemon/gdm-dynamic-display.c gdm-2.22.0/daemon/gdm-dynamic-display.c
--- gdm-2.22.0-orig/daemon/gdm-dynamic-display.c 1970-01-01 08:00:00.000000000 +0800
-+++ gdm-2.22.0/daemon/gdm-dynamic-display.c 2008-05-24 00:49:07.095384000 +0800
++++ gdm-2.22.0/daemon/gdm-dynamic-display.c 2008-05-24 04:37:49.038687000 +0800
@@ -0,0 +1,209 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -310,7 +332,7 @@
+}
diff -Nur gdm-2.22.0-orig/daemon/gdm-dynamic-display.h gdm-2.22.0/daemon/gdm-dynamic-display.h
--- gdm-2.22.0-orig/daemon/gdm-dynamic-display.h 1970-01-01 08:00:00.000000000 +0800
-+++ gdm-2.22.0/daemon/gdm-dynamic-display.h 2008-05-24 00:49:07.095694000 +0800
++++ gdm-2.22.0/daemon/gdm-dynamic-display.h 2008-05-24 04:37:49.039037000 +0800
@@ -0,0 +1,59 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -373,7 +395,7 @@
+#endif /* __GDM_DYNAMIC_DISPLAY_H */
diff -Nur gdm-2.22.0-orig/daemon/gdm-local-display-factory.c gdm-2.22.0/daemon/gdm-local-display-factory.c
--- gdm-2.22.0-orig/daemon/gdm-local-display-factory.c 2008-04-18 11:29:28.000000000 +0800
-+++ gdm-2.22.0/daemon/gdm-local-display-factory.c 2008-05-24 00:49:07.096760000 +0800
++++ gdm-2.22.0/daemon/gdm-local-display-factory.c 2008-05-24 04:37:49.040419000 +0800
@@ -34,6 +34,7 @@
#include "gdm-display-store.h"
#include "gdm-static-display.h"
@@ -607,7 +629,7 @@
GParamSpec *arg1,
diff -Nur gdm-2.22.0-orig/daemon/gdm-local-display-factory.h gdm-2.22.0/daemon/gdm-local-display-factory.h
--- gdm-2.22.0-orig/daemon/gdm-local-display-factory.h 2008-04-18 11:29:28.000000000 +0800
-+++ gdm-2.22.0/daemon/gdm-local-display-factory.h 2008-05-24 00:49:07.097673000 +0800
++++ gdm-2.22.0/daemon/gdm-local-display-factory.h 2008-05-24 04:37:49.041491000 +0800
@@ -71,6 +71,21 @@
char **id,
GError **error);
@@ -632,7 +654,7 @@
#endif /* __GDM_LOCAL_DISPLAY_FACTORY_H */
diff -Nur gdm-2.22.0-orig/daemon/gdm-local-display-factory.xml gdm-2.22.0/daemon/gdm-local-display-factory.xml
--- gdm-2.22.0-orig/daemon/gdm-local-display-factory.xml 2008-04-18 11:29:28.000000000 +0800
-+++ gdm-2.22.0/daemon/gdm-local-display-factory.xml 2008-05-24 00:49:07.097982000 +0800
++++ gdm-2.22.0/daemon/gdm-local-display-factory.xml 2008-05-24 04:37:49.041802000 +0800
@@ -9,5 +9,17 @@
<method name="CreateTransientDisplay">
<arg name="id" direction="out" type="o"/>
@@ -653,7 +675,7 @@
</node>
diff -Nur gdm-2.22.0-orig/daemon/gdm-server.c gdm-2.22.0/daemon/gdm-server.c
--- gdm-2.22.0-orig/daemon/gdm-server.c 2008-05-24 00:11:42.341509000 +0800
-+++ gdm-2.22.0/daemon/gdm-server.c 2008-05-24 00:49:07.098891000 +0800
++++ gdm-2.22.0/daemon/gdm-server.c 2008-05-24 04:37:49.042566000 +0800
@@ -754,6 +754,13 @@
return TRUE;
}
@@ -704,7 +726,7 @@
"name",
diff -Nur gdm-2.22.0-orig/daemon/gdm-simple-slave.c gdm-2.22.0/daemon/gdm-simple-slave.c
--- gdm-2.22.0-orig/daemon/gdm-simple-slave.c 2008-05-24 00:11:42.367769000 +0800
-+++ gdm-2.22.0/daemon/gdm-simple-slave.c 2008-05-24 00:49:07.120205000 +0800
++++ gdm-2.22.0/daemon/gdm-simple-slave.c 2008-05-24 04:37:49.065619000 +0800
@@ -73,6 +73,8 @@
GPid server_pid;
guint connection_attempts;
@@ -783,7 +805,7 @@
diff -Nur gdm-2.22.0-orig/daemon/gdm-simple-slave.c.orig gdm-2.22.0/daemon/gdm-simple-slave.c.orig
--- gdm-2.22.0-orig/daemon/gdm-simple-slave.c.orig 2008-05-02 06:35:36.000000000 +0800
-+++ gdm-2.22.0/daemon/gdm-simple-slave.c.orig 2008-05-24 00:49:07.100355000 +0800
++++ gdm-2.22.0/daemon/gdm-simple-slave.c.orig 2008-05-24 04:37:49.044130000 +0800
@@ -73,6 +73,8 @@
GPid server_pid;
guint connection_attempts;
@@ -862,7 +884,7 @@
diff -Nur gdm-2.22.0-orig/daemon/simple-slave-main.c gdm-2.22.0/daemon/simple-slave-main.c
--- gdm-2.22.0-orig/daemon/simple-slave-main.c 2008-04-18 11:29:28.000000000 +0800
-+++ gdm-2.22.0/daemon/simple-slave-main.c 2008-05-24 00:49:07.102413000 +0800
++++ gdm-2.22.0/daemon/simple-slave-main.c 2008-05-24 04:37:49.046762000 +0800
@@ -153,9 +153,11 @@
DBusGConnection *connection;
GdmSlave *slave;
@@ -889,7 +911,7 @@
G_CALLBACK (on_slave_stopped),
diff -Nur gdm-2.22.0-orig/data/gdm.conf gdm-2.22.0/data/gdm.conf
--- gdm-2.22.0-orig/data/gdm.conf 2008-04-18 11:29:29.000000000 +0800
-+++ gdm-2.22.0/data/gdm.conf 2008-05-24 00:49:25.553463000 +0800
++++ gdm-2.22.0/data/gdm.conf 2008-05-24 04:37:49.047075000 +0800
@@ -42,6 +42,8 @@
<allow send_interface="org.gnome.DisplayManager.LocalDisplayFactory"
@@ -901,7 +923,7 @@
send_member="GetDisplays"/>
diff -Nur gdm-2.22.0-orig/utils/Makefile.am gdm-2.22.0/utils/Makefile.am
--- gdm-2.22.0-orig/utils/Makefile.am 2008-04-18 11:29:27.000000000 +0800
-+++ gdm-2.22.0/utils/Makefile.am 2008-05-24 00:49:07.102801000 +0800
++++ gdm-2.22.0/utils/Makefile.am 2008-05-24 04:37:49.047882000 +0800
@@ -3,6 +3,7 @@
INCLUDES = \
-I. \
@@ -937,7 +959,7 @@
gdm-restart.in \
diff -Nur gdm-2.22.0-orig/utils/gdmdynamic.c gdm-2.22.0/utils/gdmdynamic.c
--- gdm-2.22.0-orig/utils/gdmdynamic.c 1970-01-01 08:00:00.000000000 +0800
-+++ gdm-2.22.0/utils/gdmdynamic.c 2008-05-24 00:49:07.103256000 +0800
++++ gdm-2.22.0/utils/gdmdynamic.c 2008-05-24 04:37:49.048324000 +0800
@@ -0,0 +1,275 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|