Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gnome-session-01-gnome-atom.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 14814 309077e46ad7
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14814
309077e46ad7 Update patches to fix hunk failures.
davelam
parents: 13408
diff changeset 
     1
 
--- gnome-session-2.25.2/gnome-session/main.c.ori	2008-12-26 04:08:19.837029682 +0000
309077e46ad7 Update patches to fix hunk failures.
davelam
parents: 13408
diff changeset 
     2
 
+++ gnome-session-2.25.2/gnome-session/main.c	2008-12-26 04:09:10.959777120 +0000
13408
af4dff83091e 2008-09-04 Ghee Teo <[email protected]>
gheet
parents: 13218
diff changeset 
     3
 
@@ -30,6 +30,7 @@
5518
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
     4
12701
0ccd271ade31 2008-06-19 Niall Power <[email protected]>
niall
parents: 9995
diff changeset 
     5
 
 #include <glib/gi18n.h>
14814
309077e46ad7 Update patches to fix hunk failures.
davelam
parents: 13408
diff changeset 
     6
 
 #include <glib.h>
5518
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
     7
 
+#include <gdk/gdkx.h>
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
     8
 
 #include <gtk/gtk.h>
8396
3047112e1ba8 2006-10-23 Glynn Foster <[email protected]>
gman
parents: 7058
diff changeset 
     9
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    10
 
 #include <dbus/dbus.h>
14814
309077e46ad7 Update patches to fix hunk failures.
davelam
parents: 13408
diff changeset 
    11
 
@@ -494,6 +495,8 @@
13218
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
    12
 
         struct sigaction  sa;
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
    13
 
         GError           *error;
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
    14
 
         char             *display_str;
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    15
 
+	Display *xdisp;
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    16
 
+	GdkDisplay *gdisp;
13218
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
    17
 
         GsmManager       *manager;
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
    18
 
         GsmStore         *client_store;
96755f314561 2008-08-21 Dave Lin <[email protected]>
davelam
parents: 13113
diff changeset 
    19
 
         GsmXsmpServer    *xsmp_server;
14814
309077e46ad7 Update patches to fix hunk failures.
davelam
parents: 13408
diff changeset 
    20
 
@@ -557,6 +560,10 @@
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    21
 
         gsm_util_setenv ("DISPLAY", display_str);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    22
 
         g_free (display_str);
5518
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
    23
13113
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    24
 
+	gdisp = gdk_display_get_default ();
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    25
 
+	xdisp = gdk_x11_display_get_xdisplay (gdisp);
e0003844f498 2008-08-13 Erwann Chenede - <[email protected]>
erwannc
parents: 13088
diff changeset 
    26
 
+	XInternAtom (xdisp, "GNOME_SM_DESKTOP", FALSE);
5518
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
    27
 
+
13408
af4dff83091e 2008-09-04 Ghee Teo <[email protected]>
gheet
parents: 13218
diff changeset 
    28
 
         /* Some third-party programs rely on GNOME_DESKTOP_SESSION_ID to
af4dff83091e 2008-09-04 Ghee Teo <[email protected]>
gheet
parents: 13218
diff changeset 
    29
 
          * detect if GNOME is running. We keep this for compatibility reasons.
af4dff83091e 2008-09-04 Ghee Teo <[email protected]>
gheet
parents: 13218
diff changeset 
    30
 
          */
upstream/oracle/spec-files