← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gdm/hardy-updates

« back to all changes in this revision

Viewing changes to debian/patches/11_powermanagement.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-05-13 10:44:34 UTC
  • mfrom: (1.4.26 upstream)
  • Revision ID: james.westby@ubuntu.com-20080513104434-xg3oi65kaoz1ux8j
Tags: 2.20.6-0ubuntu1
https://launchpad.net/bugs/229866
https://launchpad.net/bugs/229199
* New upstream version (lp: #229866):
  - Fix two related bugs that were causing GDM to crash regularly on exit.
    Refer to bug #517526.  
  - Fix a third bug that was causing the GDM daemon to crash occasionally when
    using gdmsetup.  This fix changes GDM so that when it receives an
    UPDATE_CONFIG command, it only updates the key specified rather than
    re-reading the entire configuration file.  Fixes bug #517526.
  - Sync to avoid any XIO errors after session exits.  
  - Fix so that the XDMCP configuration values are read from the configuration
    file when the XDMCP manager is started rather than initialized.  It seems
    the related fixes implemented in 2.20.2 did not fully resolve this issue.
  - Fix bug that was causing GDM session desktop file marked as "Hidden=true"
    to show up in the Session dialog.  
  - Fix gdmsetup bug that caused users to need to restart GDM in order for
    it to notice changes made in the "Server settings" dialog.
  - Fix gdmsetup so it does not save 24HourClock setting as a translated 
    string, which was causing the configuration to get confused.
  - If the user's $HOME/.dmrc file does not exist, avoid calling gkeyfile 
    functions.  This avoids useless gkeyfile warning messages about the file
    being NULL.  A previous fix in 2.20.1 minimized this problem by creating
    the file if it did not exist.  However, that does not always work if the
    user's $HOME directory is not writable (e.g. LiveCD).  So this fix avoids
    the warnings.  
  - Add default OpenBSD Halt, Reboot and Suspend commands to the configure
    script.  
  - Remove broken logic in the configure script that was trying to append
    ${prefix}/bin to the DefaultPath and RootPath.  Please use the 
    --with-post-path configure option if you want to add custom directories
    to the end of DefaultPath and RootPath.  
  - Fix the way the Xsession script is built so that distros can more easily
    add their own custom logic to the Xsession script.  Some Solaris specific
    code was moved to the Xsession.solaris file so that other distros do not
    get affected by this code.  Remove logic to normalize LC_ variables since
    this was causing problems for some users.  Refer to bug #509141
* debian/patches/11_powermanagement.patch,
  debian/patches/56_xnest-wrapper.patch,
  debian/patches/70_mandatory-relibtoolize.patch:
  - updated for the new version
* debian/Xsession:
  - set the USERXSESSIONRC environment variable (lp: #229199)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/11_powermanagement.patch
1
 
Index: gdm-2.20.4/acconfig.h
 
1
Index: gdm-2.20.6/acconfig.h
2
2
===================================================================
3
 
--- gdm-2.20.4.orig/acconfig.h  2008-03-10 23:24:01.000000000 +0100
4
 
+++ gdm-2.20.4/acconfig.h       2008-03-11 22:43:17.000000000 +0100
 
3
--- gdm-2.20.6.orig/acconfig.h  2008-05-13 02:26:43.000000000 +0200
 
4
+++ gdm-2.20.6/acconfig.h       2008-05-13 10:50:42.000000000 +0200
5
5
@@ -5,6 +5,7 @@
6
6
 #undef REBOOT_COMMAND
7
7
 #undef SOUND_PROGRAM
10
10
 #undef ENABLE_IPV6
11
11
 #undef ENABLE_NLS
12
12
 #undef ALWAYS_RESTART_SERVER
13
 
Index: gdm-2.20.4/config/gdm.conf.in
 
13
Index: gdm-2.20.6/config/gdm.conf.in
14
14
===================================================================
15
 
--- gdm-2.20.4.orig/config/gdm.conf.in  2008-03-10 23:23:01.000000000 +0100
16
 
+++ gdm-2.20.4/config/gdm.conf.in       2008-03-11 22:43:17.000000000 +0100
 
15
--- gdm-2.20.6.orig/config/gdm.conf.in  2008-05-13 02:25:54.000000000 +0200
 
16
+++ gdm-2.20.6/config/gdm.conf.in       2008-05-13 10:50:42.000000000 +0200
17
17
@@ -129,17 +129,18 @@
18
18
 RebootCommand=@REBOOT_COMMAND@
19
19
 HaltCommand=@HALT_COMMAND@
37
37
 
38
38
 # This feature is only functional if GDM is compiled with RBAC (Role Based
39
39
 # Access Control) support.
40
 
Index: gdm-2.20.4/config/Makefile.am
 
40
Index: gdm-2.20.6/config/Makefile.am
41
41
===================================================================
42
 
--- gdm-2.20.4.orig/config/Makefile.am  2008-03-10 23:23:01.000000000 +0100
43
 
+++ gdm-2.20.4/config/Makefile.am       2008-03-11 22:43:17.000000000 +0100
44
 
@@ -51,6 +51,7 @@
 
42
--- gdm-2.20.6.orig/config/Makefile.am  2008-05-13 02:25:54.000000000 +0200
 
43
+++ gdm-2.20.6/config/Makefile.am       2008-05-13 10:50:42.000000000 +0200
 
44
@@ -61,6 +61,7 @@
45
45
                -e 's,[@]REBOOT_COMMAND[@],$(REBOOT_COMMAND),g' \
46
46
                -e 's,[@]SOUND_PROGRAM[@],$(SOUND_PROGRAM),g' \
47
47
                -e 's,[@]SUSPEND_COMMAND[@],$(SUSPEND_COMMAND),g' \
49
49
                -e 's,[@]XEVIE_OPTION[@],$(XEVIE_OPTION),g' \
50
50
                -e 's,[@]ALWAYS_RESTART_SERVER[@],$(ALWAYS_RESTART_SERVER),g' \
51
51
                -e 's,[@]UTMP_LINE_ATTACHED[@],$(UTMP_LINE_ATTACHED),g' \
52
 
Index: gdm-2.20.4/configure.ac
 
52
Index: gdm-2.20.6/configure.ac
53
53
===================================================================
54
 
--- gdm-2.20.4.orig/configure.ac        2008-03-11 22:43:17.000000000 +0100
55
 
+++ gdm-2.20.4/configure.ac     2008-03-11 22:43:17.000000000 +0100
56
 
@@ -1097,6 +1097,7 @@
 
54
--- gdm-2.20.6.orig/configure.ac        2008-05-13 10:50:42.000000000 +0200
 
55
+++ gdm-2.20.6/configure.ac     2008-05-13 10:50:42.000000000 +0200
 
56
@@ -1110,6 +1110,7 @@
57
57
        HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
58
58
        HOST_REBOOT_COMMAND="/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
59
59
        HOST_SUSPEND_COMMAND=""
61
61
        HOST_XSESSION_SHELL=/bin/sh
62
62
        HOST_SOUND_PROGRAM=/usr/bin/play
63
63
        HOST_GDMGNOMESESSIONCMD=gnome-session
64
 
@@ -1113,6 +1114,7 @@
 
64
@@ -1126,6 +1127,7 @@
65
65
 test "x$HALT_COMMAND" == x && HALT_COMMAND=${HOST_HALT_COMMAND}
66
66
 test "x$REBOOT_COMMAND" == x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
67
67
 test "x$SUSPEND_COMMAND" == x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
69
69
 test "x$XSESSION_SHELL" == x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
70
70
 test "x$SOUND_PROGRAM" == x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
71
71
 test "x$GDMGNOMESESSIONCMD" == x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
72
 
@@ -1325,6 +1327,8 @@
 
72
@@ -1333,6 +1335,8 @@
73
73
 AC_DEFINE_UNQUOTED(REBOOT_COMMAND,"$REBOOT_COMMAND")
74
74
 AC_SUBST(SUSPEND_COMMAND)
75
75
 AC_DEFINE_UNQUOTED(SUSPEND_COMMAND,"$SUSPEND_COMMAND")
78
78
 AC_SUBST(XSESSION_SHELL)
79
79
 AC_DEFINE_UNQUOTED(XSESSION_SHELL,"$XSESSION_SHELL")
80
80
 AC_SUBST(GDM_USER_PATH)
81
 
Index: gdm-2.20.4/daemon/display.h
 
81
Index: gdm-2.20.6/daemon/display.h
82
82
===================================================================
83
 
--- gdm-2.20.4.orig/daemon/display.h    2008-03-10 23:22:59.000000000 +0100
84
 
+++ gdm-2.20.4/daemon/display.h 2008-03-11 22:43:17.000000000 +0100
 
83
--- gdm-2.20.6.orig/daemon/display.h    2008-05-13 02:25:54.000000000 +0200
 
84
+++ gdm-2.20.6/daemon/display.h 2008-05-13 10:50:42.000000000 +0200
85
85
@@ -62,6 +62,7 @@
86
86
        GDM_LOGOUT_ACTION_HALT,
87
87
        GDM_LOGOUT_ACTION_REBOOT,
90
90
        GDM_LOGOUT_ACTION_CUSTOM_CMD_FIRST,
91
91
        GDM_LOGOUT_ACTION_CUSTOM_CMD_LAST = GDM_LOGOUT_ACTION_CUSTOM_CMD_FIRST + GDM_CUSTOM_COMMAND_MAX - 1,
92
92
        GDM_LOGOUT_ACTION_LAST
93
 
Index: gdm-2.20.4/daemon/gdm.c
 
93
Index: gdm-2.20.6/daemon/gdm.c
94
94
===================================================================
95
 
--- gdm-2.20.4.orig/daemon/gdm.c        2008-03-11 22:43:17.000000000 +0100
96
 
+++ gdm-2.20.4/daemon/gdm.c     2008-03-11 22:43:17.000000000 +0100
 
95
--- gdm-2.20.6.orig/daemon/gdm.c        2008-05-13 10:50:42.000000000 +0200
 
96
+++ gdm-2.20.6/daemon/gdm.c     2008-05-13 10:52:48.000000000 +0200
97
97
@@ -659,6 +659,22 @@
98
98
        try_commands (suspend);
99
99
 }
117
117
 #ifdef __linux__
118
118
 static void
119
119
 change_to_first_and_clear (gboolean restart)
120
 
@@ -939,8 +955,9 @@
121
 
             (status == DISPLAY_RESTARTGDM ||
122
 
              status == DISPLAY_REBOOT ||
123
 
              status == DISPLAY_SUSPEND ||
124
 
+             status == DISPLAY_HIBERNATE ||
125
 
              status == DISPLAY_HALT)) {
126
 
-               gdm_info (_("Restart GDM, Restart machine, Suspend, or Halt request when there is no system menu from display %s"), d->name);
127
 
+               gdm_info (_("Restart GDM, Restart machine, Suspend, Hibernate, or Halt request when there is no system menu from display %s"), d->name);
128
 
                status = DISPLAY_REMANAGE;
129
 
        }
130
 
 
131
 
@@ -948,8 +965,9 @@
132
 
             (status == DISPLAY_RESTARTGDM ||
133
 
              status == DISPLAY_REBOOT ||
134
 
              status == DISPLAY_SUSPEND ||
135
 
+             status == DISPLAY_HIBERNATE ||
136
 
              status == DISPLAY_HALT)) {
137
 
-               gdm_info (_("Restart GDM, Restart machine, Suspend or Halt request from a non-static display %s"), d->name);
138
 
+               gdm_info (_("Restart GDM, Restart machine, Suspend, Hibernate, or Halt request from a non-static display %s"), d->name);
139
 
                status = DISPLAY_REMANAGE;
140
 
        }
141
 
 
142
 
@@ -999,6 +1017,10 @@
143
 
                if (gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND) == NULL)
144
 
                        status = DISPLAY_REMANAGE;
145
 
                break;
146
 
+       case DISPLAY_HIBERNATE:
147
 
+               if (gdm_daemon_config_get_value_string_array (GDM_KEY_HIBERNATE) == NULL)
148
 
+                       status = DISPLAY_REMANAGE;
149
 
+               break;
150
 
        default:
151
 
                break;
152
 
        }
153
 
@@ -1050,6 +1072,15 @@
 
120
@@ -939,6 +955,7 @@
 
121
        if (status == DISPLAY_RESTARTGDM ||
 
122
            status == DISPLAY_REBOOT     ||
 
123
            status == DISPLAY_SUSPEND    ||
 
124
+           status == DISPLAY_HIBERNATE  ||
 
125
            status == DISPLAY_HALT) {
 
126
                /*
 
127
                 * Reset status to DISPLAY_REMANAGE if it is not valid to
 
128
@@ -948,13 +965,13 @@
 
129
                        GDM_KEY_SYSTEM_MENU, d->name);
 
130
 
 
131
                if (!sysmenu) {
 
132
-                       gdm_info (_("Restart GDM, Restart machine, Suspend, or Halt request when there is no system menu from display %s"), d->name);
 
133
+                       gdm_info (_("Restart GDM, Restart machine, Suspend, Hibernate, or Halt request when there is no system menu from display %s"), d->name);
 
134
                        status = DISPLAY_REMANAGE;
 
135
                }
 
136
 
 
137
 
 
138
                if ( ! d->attached) {
 
139
-                       gdm_info (_("Restart GDM, Restart machine, Suspend or Halt request from a non-static display %s"), d->name);
 
140
+                       gdm_info (_("Restart GDM, Restart machine, Suspend Hibernate, or Halt request from a non-static display %s"), d->name);
 
141
                        status = DISPLAY_REMANAGE;
 
142
                }
 
143
 
 
144
@@ -972,6 +989,10 @@
 
145
                        if (gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND) == NULL)
 
146
                                status = DISPLAY_REMANAGE;
 
147
                        break;
 
148
+               case DISPLAY_HIBERNATE:
 
149
+                       if (gdm_daemon_config_get_value_string_array (GDM_KEY_HIBERNATE) == NULL)
 
150
+                               status = DISPLAY_REMANAGE;
 
151
+                       break;
 
152
                default:
 
153
                        break;
 
154
                }
 
155
@@ -1066,6 +1087,15 @@
154
156
                goto start_autopsy;
155
157
                break;
156
158
 
166
168
        case DISPLAY_RESTARTGDM:
167
169
                gdm_restart_now ();
168
170
                break;
169
 
@@ -1217,6 +1248,10 @@
 
171
@@ -1243,6 +1273,10 @@
170
172
                suspend_machine ();
171
173
                break;
172
174
 
177
179
        default:
178
180
                /* This is a bit ugly but its the only place we can
179
181
                   check for the range of values */
180
 
@@ -2536,6 +2571,22 @@
 
182
@@ -2562,6 +2596,22 @@
181
183
                if (sysmenu && gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND) != NULL) {
182
184
                        suspend_machine ();
183
185
                }
200
202
        } else if (strncmp (msg, GDM_SOP_CHOSEN_THEME " ",
201
203
                            strlen (GDM_SOP_CHOSEN_THEME " ")) == 0) {
202
204
                GdmDisplay *d;
203
 
@@ -3780,6 +3831,14 @@
 
205
@@ -3806,6 +3856,14 @@
204
206
                        g_string_append (reply, "!");
205
207
                sep = ";";
206
208
        }
215
217
 
216
218
        if (is_action_available (disp, GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE)) {
217
219
                for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) {
218
 
@@ -4029,6 +4088,11 @@
 
220
@@ -4055,6 +4113,11 @@
219
221
                   is_action_available (disp, GDM_SUP_LOGOUT_ACTION_SUSPEND)) {
220
222
                disp->logout_action = GDM_LOGOUT_ACTION_SUSPEND;
221
223
                was_ok = TRUE;
227
229
        }
228
230
        else if (strncmp (action, GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE,
229
231
                          strlen (GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE)) == 0 &&
230
 
@@ -4097,6 +4161,11 @@
 
232
@@ -4123,6 +4186,11 @@
231
233
                   is_action_available (disp, GDM_SUP_LOGOUT_ACTION_SUSPEND)) {
232
234
                safe_logout_action = GDM_LOGOUT_ACTION_SUSPEND;
233
235
                was_ok = TRUE;
239
241
        }
240
242
        else if (strncmp (action, GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE,
241
243
                          strlen (GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE)) == 0 &&
242
 
Index: gdm-2.20.4/daemon/gdm-daemon-config.c
 
244
Index: gdm-2.20.6/daemon/gdm-daemon-config.c
243
245
===================================================================
244
 
--- gdm-2.20.4.orig/daemon/gdm-daemon-config.c  2008-03-10 23:23:00.000000000 +0100
245
 
+++ gdm-2.20.4/daemon/gdm-daemon-config.c       2008-03-11 22:43:17.000000000 +0100
246
 
@@ -1826,6 +1826,7 @@
 
246
--- gdm-2.20.6.orig/daemon/gdm-daemon-config.c  2008-05-13 02:25:54.000000000 +0200
 
247
+++ gdm-2.20.6/daemon/gdm-daemon-config.c       2008-05-13 10:50:42.000000000 +0200
 
248
@@ -1732,6 +1732,7 @@
247
249
         case GDM_ID_HALT:
248
250
         case GDM_ID_REBOOT:
249
251
         case GDM_ID_SUSPEND:
251
253
                res = validate_power_action (config, source, value);
252
254
                break;
253
255
         case GDM_ID_STANDARD_XSERVER:
254
 
Index: gdm-2.20.4/daemon/gdm-daemon-config-entries.h
 
256
Index: gdm-2.20.6/daemon/gdm-daemon-config-entries.h
255
257
===================================================================
256
 
--- gdm-2.20.4.orig/daemon/gdm-daemon-config-entries.h  2008-03-10 23:23:00.000000000 +0100
257
 
+++ gdm-2.20.4/daemon/gdm-daemon-config-entries.h       2008-03-11 22:43:17.000000000 +0100
 
258
--- gdm-2.20.6.orig/daemon/gdm-daemon-config-entries.h  2008-05-13 02:25:54.000000000 +0200
 
259
+++ gdm-2.20.6/daemon/gdm-daemon-config-entries.h       2008-05-13 10:50:42.000000000 +0200
258
260
@@ -78,6 +78,7 @@
259
261
        GDM_ID_BASE_XSESSION,
260
262
        GDM_ID_DEFAULT_SESSION,
282
284
        { GDM_CONFIG_GROUP_DAEMON, "RBACSystemCommandKeys", GDM_CONFIG_VALUE_STRING_ARRAY, GDM_RBAC_SYSCMD_KEYS, GDM_ID_RBAC_SYSTEM_COMMAND_KEYS },
283
285
 
284
286
        { GDM_CONFIG_GROUP_SECURITY, "AllowRoot", GDM_CONFIG_VALUE_BOOL, "true", GDM_ID_ALLOW_ROOT },
285
 
Index: gdm-2.20.4/daemon/gdm-daemon-config-keys.h
 
287
Index: gdm-2.20.6/daemon/gdm-daemon-config-keys.h
286
288
===================================================================
287
 
--- gdm-2.20.4.orig/daemon/gdm-daemon-config-keys.h     2008-03-11 22:43:17.000000000 +0100
288
 
+++ gdm-2.20.4/daemon/gdm-daemon-config-keys.h  2008-03-11 22:43:17.000000000 +0100
289
 
@@ -61,6 +61,7 @@
 
289
--- gdm-2.20.6.orig/daemon/gdm-daemon-config-keys.h     2008-05-13 10:50:42.000000000 +0200
 
290
+++ gdm-2.20.6/daemon/gdm-daemon-config-keys.h  2008-05-13 10:50:42.000000000 +0200
 
291
@@ -78,6 +78,7 @@
290
292
 #define GDM_KEY_BASE_XSESSION "daemon/BaseXsession=" GDMCONFDIR "/Xsession"
291
293
 #define GDM_KEY_DEFAULT_SESSION "daemon/DefaultSession=gnome.desktop"
292
294
 #define GDM_KEY_SUSPEND "daemon/SuspendCommand=" SUSPEND_COMMAND
294
296
 #define GDM_KEY_USER_AUTHDIR "daemon/UserAuthDir="
295
297
 #define GDM_KEY_USER_AUTHDIR_FALLBACK "daemon/UserAuthFBDir=/tmp"
296
298
 #define GDM_KEY_USER_AUTHFILE "daemon/UserAuthFile=.Xauthority"
297
 
@@ -82,8 +83,8 @@
 
299
@@ -99,8 +100,8 @@
298
300
 #define GDM_KEY_VT_ALLOCATION "daemon/VTAllocation=true"
299
301
 #define GDM_KEY_CONSOLE_CANNOT_HANDLE "daemon/ConsoleCannotHandle=am,ar,az,bn,el,fa,gu,hi,ja,ko,ml,mr,pa,ta,zh"
300
302
 #define GDM_KEY_XSERVER_TIMEOUT "daemon/GdmXserverTimeout=10"
305
307
 #define GDM_KEY_RBAC_SYSTEM_COMMAND_KEYS "daemon/RBACSystemCommandKeys=" GDM_RBAC_SYSCMD_KEYS
306
308
 
307
309
 #define GDM_KEY_SERVER_PREFIX "server-"
308
 
Index: gdm-2.20.4/daemon/gdm.h
 
310
Index: gdm-2.20.6/daemon/gdm.h
309
311
===================================================================
310
 
--- gdm-2.20.4.orig/daemon/gdm.h        2008-03-10 23:23:00.000000000 +0100
311
 
+++ gdm-2.20.4/daemon/gdm.h     2008-03-11 22:43:17.000000000 +0100
 
312
--- gdm-2.20.6.orig/daemon/gdm.h        2008-05-13 02:25:54.000000000 +0200
 
313
+++ gdm-2.20.6/daemon/gdm.h     2008-05-13 10:50:42.000000000 +0200
312
314
@@ -33,6 +33,7 @@
313
315
 #define DISPLAY_REBOOT 8       /* Rebewt */
314
316
 #define DISPLAY_HALT 16                /* Halt */
317
319
 #define DISPLAY_CHOSEN 20      /* successful chooser session,
318
320
                                   restart display */
319
321
 #define DISPLAY_RUN_CHOOSER 30 /* Run chooser */
320
 
Index: gdm-2.20.4/daemon/gdm-socket-protocol.h
 
322
Index: gdm-2.20.6/daemon/gdm-socket-protocol.h
321
323
===================================================================
322
 
--- gdm-2.20.4.orig/daemon/gdm-socket-protocol.h        2008-03-10 23:23:00.000000000 +0100
323
 
+++ gdm-2.20.4/daemon/gdm-socket-protocol.h     2008-03-11 22:43:17.000000000 +0100
 
324
--- gdm-2.20.6.orig/daemon/gdm-socket-protocol.h        2008-05-13 02:25:54.000000000 +0200
 
325
+++ gdm-2.20.6/daemon/gdm-socket-protocol.h     2008-05-13 10:50:42.000000000 +0200
324
326
@@ -69,6 +69,7 @@
325
327
 #define GDM_INTERRUPT_TIMED_LOGIN 'T'
326
328
 #define GDM_INTERRUPT_CONFIGURE   'C'
345
347
 #define GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE "CUSTOM_CMD"
346
348
 #define GDM_SUP_QUERY_VT "QUERY_VT"
347
349
 #define GDM_SUP_SET_VT "SET_VT"
348
 
Index: gdm-2.20.4/daemon/Makefile.in
 
350
Index: gdm-2.20.6/daemon/Makefile.in
349
351
===================================================================
350
 
--- gdm-2.20.4.orig/daemon/Makefile.in  2008-03-10 23:26:09.000000000 +0100
351
 
+++ gdm-2.20.4/daemon/Makefile.in       2008-03-11 22:43:17.000000000 +0100
 
352
--- gdm-2.20.6.orig/daemon/Makefile.in  2008-05-13 02:27:20.000000000 +0200
 
353
+++ gdm-2.20.6/daemon/Makefile.in       2008-05-13 10:50:42.000000000 +0200
352
354
@@ -272,6 +272,7 @@
353
355
 SSHDESKTOP = @SSHDESKTOP@
354
356
 STRIP = @STRIP@
357
359
 SYSCONFDIR = @SYSCONFDIR@
358
360
 USE_NLS = @USE_NLS@
359
361
 UTILS_CFLAGS = @UTILS_CFLAGS@
360
 
Index: gdm-2.20.4/daemon/slave.c
 
362
Index: gdm-2.20.6/daemon/slave.c
361
363
===================================================================
362
 
--- gdm-2.20.4.orig/daemon/slave.c      2008-03-11 22:43:17.000000000 +0100
363
 
+++ gdm-2.20.4/daemon/slave.c   2008-03-11 22:43:17.000000000 +0100
364
 
@@ -5238,6 +5238,7 @@
 
364
--- gdm-2.20.6.orig/daemon/slave.c      2008-05-13 10:50:42.000000000 +0200
 
365
+++ gdm-2.20.6/daemon/slave.c   2008-05-13 10:50:42.000000000 +0200
 
366
@@ -5242,6 +5242,7 @@
365
367
                             WEXITSTATUS (status) == DISPLAY_REBOOT ||
366
368
                             WEXITSTATUS (status) == DISPLAY_HALT ||
367
369
                             WEXITSTATUS (status) == DISPLAY_SUSPEND ||
369
371
                             WEXITSTATUS (status) == DISPLAY_RUN_CHOOSER ||
370
372
                             WEXITSTATUS (status) == DISPLAY_RESTARTGDM ||
371
373
                             WEXITSTATUS (status) == DISPLAY_GREETERFAILED)) {
372
 
@@ -5515,6 +5516,20 @@
 
374
@@ -5519,6 +5520,20 @@
373
375
                        /* Not interrupted, continue reading input,
374
376
                         * just proxy this to the master server */
375
377
                        return TRUE;
390
392
                case GDM_INTERRUPT_LOGIN_SOUND:
391
393
                        if (d->attached &&
392
394
                            ! play_login_sound (gdm_daemon_config_get_value_string (GDM_KEY_SOUND_ON_LOGIN_FILE))) {
393
 
Index: gdm-2.20.4/gui/gdmlogin.c
 
395
Index: gdm-2.20.6/gui/gdmlogin.c
394
396
===================================================================
395
 
--- gdm-2.20.4.orig/gui/gdmlogin.c      2008-03-10 23:22:20.000000000 +0100
396
 
+++ gdm-2.20.4/gui/gdmlogin.c   2008-03-11 22:43:17.000000000 +0100
 
397
--- gdm-2.20.6.orig/gui/gdmlogin.c      2008-05-13 02:25:32.000000000 +0200
 
398
+++ gdm-2.20.6/gui/gdmlogin.c   2008-05-13 10:50:42.000000000 +0200
397
399
@@ -72,6 +72,7 @@
398
400
 gboolean GdmConfiguratorFound               = FALSE;
399
401
 gboolean *GdmCustomCmdsFound                = NULL;
456
458
            gdm_config_reload_string (GDM_KEY_TIMED_LOGIN) ||
457
459
            gdm_config_reload_string (GDM_KEY_RBAC_SYSTEM_COMMAND_KEYS) ||
458
460
            gdm_config_reload_string (GDM_KEY_SYSTEM_COMMANDS_IN_MENU) ||
459
 
Index: gdm-2.20.4/gui/gdmsetup.c
 
461
Index: gdm-2.20.6/gui/gdmsetup.c
460
462
===================================================================
461
 
--- gdm-2.20.4.orig/gui/gdmsetup.c      2008-03-10 23:22:20.000000000 +0100
462
 
+++ gdm-2.20.4/gui/gdmsetup.c   2008-03-11 22:43:17.000000000 +0100
 
463
--- gdm-2.20.6.orig/gui/gdmsetup.c      2008-05-13 02:25:32.000000000 +0200
 
464
+++ gdm-2.20.6/gui/gdmsetup.c   2008-05-13 10:50:42.000000000 +0200
463
465
@@ -147,6 +147,7 @@
464
466
        HALT_CMD,
465
467
        REBOOT_CMD,
468
470
        CUSTOM_CMD
469
471
 };
470
472
 
471
 
@@ -1568,6 +1569,11 @@
 
473
@@ -1581,6 +1582,11 @@
472
474
                        gtk_entry_set_text (GTK_ENTRY (hrs_cmd_entry), ve_sure_string (val));
473
475
                        enabled_command = !ve_string_empty (val);
474
476
                }
480
482
                else {
481
483
                        gchar *key_string = NULL;
482
484
 
483
 
@@ -2026,7 +2032,7 @@
 
485
@@ -2039,7 +2045,7 @@
484
486
 
485
487
                hrs_cmd_vbox = glade_xml_get_widget (xml_commands, "hrs_command_vbox");
486
488
                custom_cmd_vbox = glade_xml_get_widget (xml_commands, "custom_command_vbox");
489
491
                        /* We are dealing with custom commands */                                                       
490
492
                        gtk_widget_show (custom_cmd_vbox);
491
493
                        gtk_widget_hide (hrs_cmd_vbox);                                 
492
 
@@ -2310,7 +2316,9 @@
 
494
@@ -2323,7 +2329,9 @@
493
495
                else if (selected == REBOOT_CMD)
494
496
                        cmd_key = g_strdup (GDM_KEY_REBOOT);
495
497
                else if (selected == SUSPEND_CMD)
500
502
                
501
503
                old_val = gdm_config_get_string (cmd_key);              
502
504
                        
503
 
@@ -3637,6 +3645,8 @@
 
505
@@ -3650,6 +3658,8 @@
504
506
                value = gdm_config_get_string (GDM_KEY_REBOOT);         
505
507
        else if (selected == SUSPEND_CMD) 
506
508
                value = gdm_config_get_string (GDM_KEY_SUSPEND);
509
511
        else {
510
512
                gchar *key_string;
511
513
                gint i;
512
 
@@ -3877,6 +3887,7 @@
 
514
@@ -3890,6 +3900,7 @@
513
515
                gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), _("Halt command"));
514
516
                gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), _("Reboot command"));
515
517
                gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), _("Suspend command"));
517
519
                
518
520
                /* Add all the custom commands */
519
521
                for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) {
520
 
Index: gdm-2.20.4/gui/greeter/greeter.c
 
522
Index: gdm-2.20.6/gui/greeter/greeter.c
521
523
===================================================================
522
 
--- gdm-2.20.4.orig/gui/greeter/greeter.c       2008-03-10 23:22:16.000000000 +0100
523
 
+++ gdm-2.20.4/gui/greeter/greeter.c    2008-03-11 22:43:17.000000000 +0100
 
524
--- gdm-2.20.6.orig/gui/greeter/greeter.c       2008-05-13 02:25:31.000000000 +0200
 
525
+++ gdm-2.20.6/gui/greeter/greeter.c    2008-05-13 10:50:42.000000000 +0200
524
526
@@ -75,6 +75,7 @@
525
527
 gboolean *GdmCustomCmdsFound   = NULL;
526
528
 gboolean GdmAnyCustomCmdsFound = FALSE;
553
555
   GdmConfiguratorFound    = gdm_working_command_exists (gdm_config_get_string (GDM_KEY_CONFIGURATOR));
554
556
 
555
557
   GdmCustomCmdsFound = g_new0 (gboolean, GDM_CUSTOM_COMMAND_MAX);
556
 
Index: gdm-2.20.4/gui/greeter/greeter_configuration.h
 
558
Index: gdm-2.20.6/gui/greeter/greeter_configuration.h
557
559
===================================================================
558
 
--- gdm-2.20.4.orig/gui/greeter/greeter_configuration.h 2008-03-11 22:43:17.000000000 +0100
559
 
+++ gdm-2.20.4/gui/greeter/greeter_configuration.h      2008-03-11 22:43:17.000000000 +0100
 
560
--- gdm-2.20.6.orig/gui/greeter/greeter_configuration.h 2008-05-13 10:50:42.000000000 +0200
 
561
+++ gdm-2.20.6/gui/greeter/greeter_configuration.h      2008-05-13 10:50:42.000000000 +0200
560
562
@@ -31,6 +31,7 @@
561
563
 extern gchar *GdmHalt;
562
564
 extern gchar *GdmReboot;
573
575
 extern gboolean GdmConfiguratorFound;
574
576
 extern gchar *GdmSessionDir;
575
577
 extern gchar *GdmDefaultSession;
576
 
Index: gdm-2.20.4/gui/greeter/greeter_item.c
 
578
Index: gdm-2.20.6/gui/greeter/greeter_item.c
577
579
===================================================================
578
 
--- gdm-2.20.4.orig/gui/greeter/greeter_item.c  2008-03-10 23:22:16.000000000 +0100
579
 
+++ gdm-2.20.4/gui/greeter/greeter_item.c       2008-03-11 22:43:17.000000000 +0100
 
580
--- gdm-2.20.6.orig/gui/greeter/greeter_item.c  2008-05-13 02:25:31.000000000 +0200
 
581
+++ gdm-2.20.6/gui/greeter/greeter_item.c       2008-05-13 10:50:42.000000000 +0200
580
582
@@ -226,6 +226,10 @@
581
583
       (info->show_type != NULL &&
582
584
        strcmp (info->show_type, "suspend") == 0))
588
590
 
589
591
   if (info->show_type != NULL && 
590
592
       sscanf (info->show_type, "custom_cmd%d", &i) == 1 &&
591
 
Index: gdm-2.20.4/gui/greeter/greeter_system.c
 
593
Index: gdm-2.20.6/gui/greeter/greeter_system.c
592
594
===================================================================
593
 
--- gdm-2.20.4.orig/gui/greeter/greeter_system.c        2008-03-10 23:22:16.000000000 +0100
594
 
+++ gdm-2.20.4/gui/greeter/greeter_system.c     2008-03-11 22:43:17.000000000 +0100
 
595
--- gdm-2.20.6.orig/gui/greeter/greeter_system.c        2008-05-13 02:25:31.000000000 +0200
 
596
+++ gdm-2.20.6/gui/greeter/greeter_system.c     2008-05-13 10:50:42.000000000 +0200
595
597
@@ -47,6 +47,7 @@
596
598
 extern gboolean *GdmCustomCmdsFound;
597
599
 extern gboolean  GdmAnyCustomCmdsFound;
713
715
   greeter_item_register_action_callback ("system_button",
714
716
                                         (ActionFunc)greeter_system_handler,
715
717
                                         NULL);
716
 
Index: gdm-2.20.4/pixmaps/24x24/Makefile.am
 
718
Index: gdm-2.20.6/pixmaps/24x24/Makefile.am
717
719
===================================================================
718
 
--- gdm-2.20.4.orig/pixmaps/24x24/Makefile.am   2008-03-10 23:22:08.000000000 +0100
719
 
+++ gdm-2.20.4/pixmaps/24x24/Makefile.am        2008-03-11 22:43:17.000000000 +0100
 
720
--- gdm-2.20.6.orig/pixmaps/24x24/Makefile.am   2008-05-13 02:25:24.000000000 +0200
 
721
+++ gdm-2.20.6/pixmaps/24x24/Makefile.am        2008-05-13 10:50:42.000000000 +0200
720
722
@@ -3,6 +3,7 @@
721
723
 icons = \
722
724
        preferences-desktop-locale.png \
733
735
        system_log_out_24 $(srcdir)/system-log-out.png \
734
736
        system_restart_24 $(srcdir)/system-restart.png \
735
737
        system_shut_down_24 $(srcdir)/system-shut-down.png \
736
 
Index: gdm-2.20.4/pixmaps/24x24/system-hibernate.png.uue
 
738
Index: gdm-2.20.6/pixmaps/24x24/system-hibernate.png.uue
737
739
===================================================================
738
740
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
739
 
+++ gdm-2.20.4/pixmaps/24x24/system-hibernate.png.uue   2008-03-11 22:43:17.000000000 +0100
 
741
+++ gdm-2.20.6/pixmaps/24x24/system-hibernate.png.uue   2008-05-13 10:50:42.000000000 +0200
740
742
@@ -0,0 +1,30 @@
741
743
+begin 644 system-hibernate.png.uue
742
744
+MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX`````7-21T(`KLX<
768
770
+JGPH/YKXT`!NH!6J`%Y[3;XL`<L#X7TKG82!+O,(?`````$E%3D2N0F""
769
771
+`
770
772
+end
771
 
Index: gdm-2.20.4/gui/gdmcommon.c
 
773
Index: gdm-2.20.6/gui/gdmcommon.c
772
774
===================================================================
773
 
--- gdm-2.20.4.orig/gui/gdmcommon.c     2008-03-10 23:22:20.000000000 +0100
774
 
+++ gdm-2.20.4/gui/gdmcommon.c  2008-03-11 22:43:17.000000000 +0100
 
775
--- gdm-2.20.6.orig/gui/gdmcommon.c     2008-05-13 02:25:32.000000000 +0200
 
776
+++ gdm-2.20.6/gui/gdmcommon.c  2008-05-13 10:50:42.000000000 +0200
775
777
@@ -221,6 +221,7 @@
776
778
        {
777
779
                {"preferences-desktop-locale", 24, preferences_desktop_locale_24},
780
782
                {"system-log-out", 24, system_log_out_24},
781
783
                {"system-restart", 24, system_restart_24},
782
784
                {"system-shut-down", 24, system_shut_down_24},
783
 
Index: gdm-2.20.4/config.h.in
 
785
Index: gdm-2.20.6/config.h.in
784
786
===================================================================
785
 
--- gdm-2.20.4.orig/config.h.in 2008-03-11 22:43:30.000000000 +0100
786
 
+++ gdm-2.20.4/config.h.in      2008-03-11 22:43:47.000000000 +0100
 
787
--- gdm-2.20.6.orig/config.h.in 2008-05-13 02:27:18.000000000 +0200
 
788
+++ gdm-2.20.6/config.h.in      2008-05-13 10:50:42.000000000 +0200
787
789
@@ -6,6 +6,7 @@
788
790
 #undef REBOOT_COMMAND
789
791
 #undef SOUND_PROGRAM