aboutsummaryrefslogtreecommitdiff
path: root/x11/gnome-session/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gnome-session/files')
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.in8
-rw-r--r--x11/gnome-session/files/patch-gnome-session_manager.c14
2 files changed, 18 insertions, 4 deletions
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
index 60c14531bce0..2b05e8c0027e 100644
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-session/Makefile.in.orig Wed May 8 14:36:22 2002
-+++ gnome-session/Makefile.in Wed May 8 14:36:34 2002
-@@ -129,7 +129,7 @@
+--- gnome-session/Makefile.in.orig Mon May 31 14:34:48 2004
++++ gnome-session/Makefile.in Mon May 31 14:34:57 2004
+@@ -153,7 +153,7 @@
NULL =
-defaultdir = $(datadir)/gnome
+defaultdir = $(datadir)
- INCLUDES = $(GNOME_SESSION_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(WARN_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" -DHALT_COMMAND=\""$(HALT_COMMAND)\"" -DDEFAULTDIR="\"$(defaultdir)\""
+ INCLUDES = $(GNOME_SESSION_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\"" -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" -DHALT_COMMAND=\""$(HALT_COMMAND)\"" -DRSH_COMMAND=\""$(RSH_COMMAND)\"" -DGCONFTOOL_CMD=\""$(GCONFTOOL)\"" -DDEFAULTDIR="\"$(defaultdir)\"" -DESD_SERVER="\"$(ESD_SERVER)\""
diff --git a/x11/gnome-session/files/patch-gnome-session_manager.c b/x11/gnome-session/files/patch-gnome-session_manager.c
new file mode 100644
index 000000000000..7e56843ac733
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_manager.c
@@ -0,0 +1,14 @@
+--- gnome-session/manager.c.orig Tue Oct 12 14:04:26 2004
++++ gnome-session/manager.c Tue Oct 12 14:05:51 2004
+@@ -1042,9 +1042,10 @@
+
+ if (interact_ping_replied)
+ {
++ IceConn ice_conn;
+ gsm_verbose ("have interact_list; sending ping with data to client %p\n", client);
+ print_client (client);
+- IceConn ice_conn = SmsGetIceConnection (client->connection);
++ ice_conn = SmsGetIceConnection (client->connection);
+ interact_ping_replied = FALSE;
+ IcePing (ice_conn, interact_ping_reply, (IcePointer)client);
+ }