← 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-03-11 22:31:15 UTC
  • mfrom: (1.4.24 upstream)
  • Revision ID: james.westby@ubuntu.com-20080311223115-px728qtz2e2sgs3o
Tags: 2.20.4-0ubuntu1
* New upstream version:
  - The Custom Widgetry code in gdmgreeter was broken, and would not create
    the /var/lib/$DISPLAY.GreeterInfo file properly.  Due to the move away
    from vicious-extensions and towards GKeyFile, the format of this file
    changed slightly to INI format with the [GreeterInfo] group.  The docs
    were modified to explain this change.
  - Now the default local and remote welcome strings ("Welcome" and
    "Welcome to %n") are translated.
  - If the user picks the default local welcome string to be used as the
    remote welcome string, or vice versa, then the strings will be
    translated also.
  - Get default locale from LC_MESSAGES rather than from g_get_language_names.
  - Honor GTK+ default password character rather than hardcoding to '*'.  The
    docs were modified to explain this change.  Fixes bug #477881.
  - Provide better tooltip for entry field in gdmgreeter.
  - Get the environment variable XDG_DATA_DIRS before clearing the 
    environment variables.  This way if the user sets XDG_DATA_DIRS before
    running GDM, this should now be honored.
  - Fix gdmsetup bug that was causing the Welcome (local and remote)
    message to not be saved properly when changed.
  - Fix the setting of the custom command NOTIFY key to avoid crashing when
    changing the label values of a custom command in gdmsetup.
  - Add include of "gdm-log.h" to daemon/verify-crypt.c and
    daemon/verify-shadow.c to fix compile issue on some platforms.
* debian/patches/11_powermanagement.patch:
  - new version update
* debian/patches/35_gdm.conf.patch:
  - new version update
* debian/patches/36_use_correct_locale.patch:
  - dropped, fixed in the new version
* debian/patches/70_mandatory-relibtoolize.patch:
  - new version update

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/11_powermanagement.patch
1
 
Index: gdm-2.20.3/acconfig.h
 
1
Index: gdm-2.20.4/acconfig.h
2
2
===================================================================
3
 
--- gdm-2.20.3.orig/acconfig.h  2008-01-07 20:41:21.000000000 +0100
4
 
+++ gdm-2.20.3/acconfig.h       2008-02-29 11:54:23.000000000 +0100
 
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
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.3/config/gdm.conf.in
 
13
Index: gdm-2.20.4/config/gdm.conf.in
14
14
===================================================================
15
 
--- gdm-2.20.3.orig/config/gdm.conf.in  2008-01-07 20:39:39.000000000 +0100
16
 
+++ gdm-2.20.3/config/gdm.conf.in       2008-02-29 11:54:23.000000000 +0100
 
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
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.3/config/Makefile.am
 
40
Index: gdm-2.20.4/config/Makefile.am
41
41
===================================================================
42
 
--- gdm-2.20.3.orig/config/Makefile.am  2008-01-07 20:39:39.000000000 +0100
43
 
+++ gdm-2.20.3/config/Makefile.am       2008-02-29 11:54:23.000000000 +0100
 
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
44
@@ -51,6 +51,7 @@
45
45
                -e 's,[@]REBOOT_COMMAND[@],$(REBOOT_COMMAND),g' \
46
46
                -e 's,[@]SOUND_PROGRAM[@],$(SOUND_PROGRAM),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.3/configure.ac
 
52
Index: gdm-2.20.4/configure.ac
53
53
===================================================================
54
 
--- gdm-2.20.3.orig/configure.ac        2008-02-29 11:54:23.000000000 +0100
55
 
+++ gdm-2.20.3/configure.ac     2008-02-29 11:54:23.000000000 +0100
 
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
56
@@ -1097,6 +1097,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"
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.3/daemon/display.h
 
81
Index: gdm-2.20.4/daemon/display.h
82
82
===================================================================
83
 
--- gdm-2.20.3.orig/daemon/display.h    2008-01-07 20:39:37.000000000 +0100
84
 
+++ gdm-2.20.3/daemon/display.h 2008-02-29 11:54:23.000000000 +0100
 
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
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.3/daemon/gdm.c
 
93
Index: gdm-2.20.4/daemon/gdm.c
94
94
===================================================================
95
 
--- gdm-2.20.3.orig/daemon/gdm.c        2008-02-29 11:54:23.000000000 +0100
96
 
+++ gdm-2.20.3/daemon/gdm.c     2008-02-29 11:54:23.000000000 +0100
 
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
97
97
@@ -659,6 +659,22 @@
98
98
        try_commands (suspend);
99
99
 }
239
239
        }
240
240
        else if (strncmp (action, GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE,
241
241
                          strlen (GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE)) == 0 &&
242
 
Index: gdm-2.20.3/daemon/gdm-daemon-config.c
 
242
Index: gdm-2.20.4/daemon/gdm-daemon-config.c
243
243
===================================================================
244
 
--- gdm-2.20.3.orig/daemon/gdm-daemon-config.c  2008-01-07 20:39:38.000000000 +0100
245
 
+++ gdm-2.20.3/daemon/gdm-daemon-config.c       2008-02-29 11:54:23.000000000 +0100
246
 
@@ -1827,6 +1827,7 @@
 
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 @@
247
247
         case GDM_ID_HALT:
248
248
         case GDM_ID_REBOOT:
249
249
         case GDM_ID_SUSPEND:
251
251
                res = validate_power_action (config, source, value);
252
252
                break;
253
253
         case GDM_ID_STANDARD_XSERVER:
254
 
Index: gdm-2.20.3/daemon/gdm-daemon-config-entries.h
 
254
Index: gdm-2.20.4/daemon/gdm-daemon-config-entries.h
255
255
===================================================================
256
 
--- gdm-2.20.3.orig/daemon/gdm-daemon-config-entries.h  2008-01-07 20:39:37.000000000 +0100
257
 
+++ gdm-2.20.3/daemon/gdm-daemon-config-entries.h       2008-02-29 11:54:23.000000000 +0100
 
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
258
@@ -78,6 +78,7 @@
259
259
        GDM_ID_BASE_XSESSION,
260
260
        GDM_ID_DEFAULT_SESSION,
282
282
        { GDM_CONFIG_GROUP_DAEMON, "RBACSystemCommandKeys", GDM_CONFIG_VALUE_STRING_ARRAY, GDM_RBAC_SYSCMD_KEYS, GDM_ID_RBAC_SYSTEM_COMMAND_KEYS },
283
283
 
284
284
        { GDM_CONFIG_GROUP_SECURITY, "AllowRoot", GDM_CONFIG_VALUE_BOOL, "true", GDM_ID_ALLOW_ROOT },
285
 
Index: gdm-2.20.3/daemon/gdm-daemon-config-keys.h
 
285
Index: gdm-2.20.4/daemon/gdm-daemon-config-keys.h
286
286
===================================================================
287
 
--- gdm-2.20.3.orig/daemon/gdm-daemon-config-keys.h     2008-02-29 11:54:23.000000000 +0100
288
 
+++ gdm-2.20.3/daemon/gdm-daemon-config-keys.h  2008-02-29 11:54:23.000000000 +0100
 
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
289
@@ -61,6 +61,7 @@
290
290
 #define GDM_KEY_BASE_XSESSION "daemon/BaseXsession=" GDMCONFDIR "/Xsession"
291
291
 #define GDM_KEY_DEFAULT_SESSION "daemon/DefaultSession=gnome.desktop"
305
305
 #define GDM_KEY_RBAC_SYSTEM_COMMAND_KEYS "daemon/RBACSystemCommandKeys=" GDM_RBAC_SYSCMD_KEYS
306
306
 
307
307
 #define GDM_KEY_SERVER_PREFIX "server-"
308
 
Index: gdm-2.20.3/daemon/gdm.h
 
308
Index: gdm-2.20.4/daemon/gdm.h
309
309
===================================================================
310
 
--- gdm-2.20.3.orig/daemon/gdm.h        2008-01-07 20:39:37.000000000 +0100
311
 
+++ gdm-2.20.3/daemon/gdm.h     2008-02-29 11:54:23.000000000 +0100
 
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
312
@@ -33,6 +33,7 @@
313
313
 #define DISPLAY_REBOOT 8       /* Rebewt */
314
314
 #define DISPLAY_HALT 16                /* Halt */
317
317
 #define DISPLAY_CHOSEN 20      /* successful chooser session,
318
318
                                   restart display */
319
319
 #define DISPLAY_RUN_CHOOSER 30 /* Run chooser */
320
 
Index: gdm-2.20.3/daemon/gdm-socket-protocol.h
 
320
Index: gdm-2.20.4/daemon/gdm-socket-protocol.h
321
321
===================================================================
322
 
--- gdm-2.20.3.orig/daemon/gdm-socket-protocol.h        2008-01-07 20:39:37.000000000 +0100
323
 
+++ gdm-2.20.3/daemon/gdm-socket-protocol.h     2008-02-29 11:54:23.000000000 +0100
 
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
324
@@ -69,6 +69,7 @@
325
325
 #define GDM_INTERRUPT_TIMED_LOGIN 'T'
326
326
 #define GDM_INTERRUPT_CONFIGURE   'C'
345
345
 #define GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE "CUSTOM_CMD"
346
346
 #define GDM_SUP_QUERY_VT "QUERY_VT"
347
347
 #define GDM_SUP_SET_VT "SET_VT"
348
 
Index: gdm-2.20.3/daemon/Makefile.in
 
348
Index: gdm-2.20.4/daemon/Makefile.in
349
349
===================================================================
350
 
--- gdm-2.20.3.orig/daemon/Makefile.in  2008-01-07 20:42:26.000000000 +0100
351
 
+++ gdm-2.20.3/daemon/Makefile.in       2008-02-29 11:54:23.000000000 +0100
352
 
@@ -270,6 +270,7 @@
 
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
@@ -272,6 +272,7 @@
353
353
 SSHDESKTOP = @SSHDESKTOP@
354
354
 STRIP = @STRIP@
355
355
 SUSPEND_COMMAND = @SUSPEND_COMMAND@
357
357
 SYSCONFDIR = @SYSCONFDIR@
358
358
 USE_NLS = @USE_NLS@
359
359
 UTILS_CFLAGS = @UTILS_CFLAGS@
360
 
Index: gdm-2.20.3/daemon/slave.c
 
360
Index: gdm-2.20.4/daemon/slave.c
361
361
===================================================================
362
 
--- gdm-2.20.3.orig/daemon/slave.c      2008-02-29 11:54:23.000000000 +0100
363
 
+++ gdm-2.20.3/daemon/slave.c   2008-02-29 11:54:23.000000000 +0100
 
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
364
@@ -5238,6 +5238,7 @@
365
365
                             WEXITSTATUS (status) == DISPLAY_REBOOT ||
366
366
                             WEXITSTATUS (status) == DISPLAY_HALT ||
390
390
                case GDM_INTERRUPT_LOGIN_SOUND:
391
391
                        if (d->attached &&
392
392
                            ! play_login_sound (gdm_daemon_config_get_value_string (GDM_KEY_SOUND_ON_LOGIN_FILE))) {
393
 
Index: gdm-2.20.3/gui/gdmlogin.c
 
393
Index: gdm-2.20.4/gui/gdmlogin.c
394
394
===================================================================
395
 
--- gdm-2.20.3.orig/gui/gdmlogin.c      2008-01-07 20:39:05.000000000 +0100
396
 
+++ gdm-2.20.3/gui/gdmlogin.c   2008-02-29 11:54:23.000000000 +0100
 
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
397
@@ -72,6 +72,7 @@
398
398
 gboolean GdmConfiguratorFound               = FALSE;
399
399
 gboolean *GdmCustomCmdsFound                = NULL;
440
440
        
441
441
        if (gdm_common_is_action_available ("CUSTOM_CMD")) {
442
442
                for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) {                  
443
 
@@ -2879,6 +2904,7 @@
 
443
@@ -2877,6 +2902,7 @@
444
444
        gdm_config_get_string (GDM_KEY_SOUND_PROGRAM);
445
445
        gdm_config_get_string (GDM_KEY_SOUND_ON_LOGIN_FILE);
446
446
        gdm_config_get_string (GDM_KEY_SUSPEND);
448
448
        gdm_config_get_string (GDM_KEY_TIMED_LOGIN);
449
449
        gdm_config_get_string (GDM_KEY_USE_24_CLOCK);
450
450
        gdm_config_get_string (GDM_KEY_WELCOME);
451
 
@@ -2994,6 +3020,7 @@
 
451
@@ -2992,6 +3018,7 @@
452
452
            gdm_config_reload_string (GDM_KEY_REBOOT) ||
453
453
            gdm_config_reload_string (GDM_KEY_SESSION_DESKTOP_DIR) ||
454
454
            gdm_config_reload_string (GDM_KEY_SUSPEND) ||
456
456
            gdm_config_reload_string (GDM_KEY_TIMED_LOGIN) ||
457
457
            gdm_config_reload_string (GDM_KEY_RBAC_SYSTEM_COMMAND_KEYS) ||
458
458
            gdm_config_reload_string (GDM_KEY_SYSTEM_COMMANDS_IN_MENU) ||
459
 
Index: gdm-2.20.3/gui/gdmsetup.c
 
459
Index: gdm-2.20.4/gui/gdmsetup.c
460
460
===================================================================
461
 
--- gdm-2.20.3.orig/gui/gdmsetup.c      2008-01-07 20:39:05.000000000 +0100
462
 
+++ gdm-2.20.3/gui/gdmsetup.c   2008-02-29 11:54:23.000000000 +0100
 
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
463
@@ -147,6 +147,7 @@
464
464
        HALT_CMD,
465
465
        REBOOT_CMD,
468
468
        CUSTOM_CMD
469
469
 };
470
470
 
471
 
@@ -1575,6 +1576,11 @@
 
471
@@ -1568,6 +1569,11 @@
472
472
                        gtk_entry_set_text (GTK_ENTRY (hrs_cmd_entry), ve_sure_string (val));
473
473
                        enabled_command = !ve_string_empty (val);
474
474
                }
480
480
                else {
481
481
                        gchar *key_string = NULL;
482
482
 
483
 
@@ -2033,7 +2039,7 @@
 
483
@@ -2026,7 +2032,7 @@
484
484
 
485
485
                hrs_cmd_vbox = glade_xml_get_widget (xml_commands, "hrs_command_vbox");
486
486
                custom_cmd_vbox = glade_xml_get_widget (xml_commands, "custom_command_vbox");
489
489
                        /* We are dealing with custom commands */                                                       
490
490
                        gtk_widget_show (custom_cmd_vbox);
491
491
                        gtk_widget_hide (hrs_cmd_vbox);                                 
492
 
@@ -2326,7 +2332,9 @@
 
492
@@ -2310,7 +2316,9 @@
493
493
                else if (selected == REBOOT_CMD)
494
494
                        cmd_key = g_strdup (GDM_KEY_REBOOT);
495
495
                else if (selected == SUSPEND_CMD)
500
500
                
501
501
                old_val = gdm_config_get_string (cmd_key);              
502
502
                        
503
 
@@ -3668,6 +3676,8 @@
 
503
@@ -3637,6 +3645,8 @@
504
504
                value = gdm_config_get_string (GDM_KEY_REBOOT);         
505
505
        else if (selected == SUSPEND_CMD) 
506
506
                value = gdm_config_get_string (GDM_KEY_SUSPEND);
509
509
        else {
510
510
                gchar *key_string;
511
511
                gint i;
512
 
@@ -3908,6 +3918,7 @@
 
512
@@ -3877,6 +3887,7 @@
513
513
                gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), _("Halt command"));
514
514
                gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), _("Reboot command"));
515
515
                gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), _("Suspend command"));
517
517
                
518
518
                /* Add all the custom commands */
519
519
                for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) {
520
 
Index: gdm-2.20.3/gui/greeter/greeter.c
 
520
Index: gdm-2.20.4/gui/greeter/greeter.c
521
521
===================================================================
522
 
--- gdm-2.20.3.orig/gui/greeter/greeter.c       2008-01-07 20:39:04.000000000 +0100
523
 
+++ gdm-2.20.3/gui/greeter/greeter.c    2008-02-29 11:54:23.000000000 +0100
 
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
524
@@ -75,6 +75,7 @@
525
525
 gboolean *GdmCustomCmdsFound   = NULL;
526
526
 gboolean GdmAnyCustomCmdsFound = FALSE;
553
553
   GdmConfiguratorFound    = gdm_working_command_exists (gdm_config_get_string (GDM_KEY_CONFIGURATOR));
554
554
 
555
555
   GdmCustomCmdsFound = g_new0 (gboolean, GDM_CUSTOM_COMMAND_MAX);
556
 
Index: gdm-2.20.3/gui/greeter/greeter_configuration.h
 
556
Index: gdm-2.20.4/gui/greeter/greeter_configuration.h
557
557
===================================================================
558
 
--- gdm-2.20.3.orig/gui/greeter/greeter_configuration.h 2008-02-29 11:54:23.000000000 +0100
559
 
+++ gdm-2.20.3/gui/greeter/greeter_configuration.h      2008-02-29 11:54:23.000000000 +0100
 
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
560
@@ -31,6 +31,7 @@
561
561
 extern gchar *GdmHalt;
562
562
 extern gchar *GdmReboot;
573
573
 extern gboolean GdmConfiguratorFound;
574
574
 extern gchar *GdmSessionDir;
575
575
 extern gchar *GdmDefaultSession;
576
 
Index: gdm-2.20.3/gui/greeter/greeter_item.c
 
576
Index: gdm-2.20.4/gui/greeter/greeter_item.c
577
577
===================================================================
578
 
--- gdm-2.20.3.orig/gui/greeter/greeter_item.c  2008-01-07 20:39:03.000000000 +0100
579
 
+++ gdm-2.20.3/gui/greeter/greeter_item.c       2008-02-29 11:54:23.000000000 +0100
 
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
580
@@ -240,6 +240,11 @@
581
581
       (info->show_type != NULL &&
582
582
        strcmp (info->show_type, "timed") == 0))
589
589
 
590
590
   return TRUE;
591
591
 }
592
 
Index: gdm-2.20.3/gui/greeter/greeter_system.c
 
592
Index: gdm-2.20.4/gui/greeter/greeter_system.c
593
593
===================================================================
594
 
--- gdm-2.20.3.orig/gui/greeter/greeter_system.c        2008-01-07 20:39:03.000000000 +0100
595
 
+++ gdm-2.20.3/gui/greeter/greeter_system.c     2008-02-29 11:55:17.000000000 +0100
 
594
--- gdm-2.20.4.orig/gui/greeter/greeter_system.c        2008-03-10 23:22:16.000000000 +0100
 
595
+++ gdm-2.20.4/gui/greeter/greeter_system.c     2008-03-11 22:43:17.000000000 +0100
596
596
@@ -47,6 +47,7 @@
597
597
 extern gboolean *GdmCustomCmdsFound;
598
598
 extern gboolean  GdmAnyCustomCmdsFound;
714
714
   greeter_item_register_action_callback ("system_button",
715
715
                                         (ActionFunc)greeter_system_handler,
716
716
                                         NULL);
717
 
Index: gdm-2.20.3/pixmaps/24x24/Makefile.am
 
717
Index: gdm-2.20.4/pixmaps/24x24/Makefile.am
718
718
===================================================================
719
 
--- gdm-2.20.3.orig/pixmaps/24x24/Makefile.am   2008-01-07 20:38:54.000000000 +0100
720
 
+++ gdm-2.20.3/pixmaps/24x24/Makefile.am        2008-02-29 11:54:23.000000000 +0100
 
719
--- gdm-2.20.4.orig/pixmaps/24x24/Makefile.am   2008-03-10 23:22:08.000000000 +0100
 
720
+++ gdm-2.20.4/pixmaps/24x24/Makefile.am        2008-03-11 22:43:17.000000000 +0100
721
721
@@ -3,6 +3,7 @@
722
722
 icons = \
723
723
        preferences-desktop-locale.png \
734
734
        system_log_out_24 $(srcdir)/system-log-out.png \
735
735
        system_restart_24 $(srcdir)/system-restart.png \
736
736
        system_shut_down_24 $(srcdir)/system-shut-down.png \
737
 
Index: gdm-2.20.3/pixmaps/24x24/system-hibernate.png.uue
 
737
Index: gdm-2.20.4/pixmaps/24x24/system-hibernate.png.uue
738
738
===================================================================
739
739
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
740
 
+++ gdm-2.20.3/pixmaps/24x24/system-hibernate.png.uue   2008-02-29 11:54:23.000000000 +0100
 
740
+++ gdm-2.20.4/pixmaps/24x24/system-hibernate.png.uue   2008-03-11 22:43:17.000000000 +0100
741
741
@@ -0,0 +1,30 @@
742
742
+begin 644 system-hibernate.png.uue
743
743
+MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX`````7-21T(`KLX<
769
769
+JGPH/YKXT`!NH!6J`%Y[3;XL`<L#X7TKG82!+O,(?`````$E%3D2N0F""
770
770
+`
771
771
+end
772
 
Index: gdm-2.20.3/gui/gdmcommon.c
 
772
Index: gdm-2.20.4/gui/gdmcommon.c
773
773
===================================================================
774
 
--- gdm-2.20.3.orig/gui/gdmcommon.c     2008-01-07 20:39:05.000000000 +0100
775
 
+++ gdm-2.20.3/gui/gdmcommon.c  2008-02-29 11:54:23.000000000 +0100
 
774
--- gdm-2.20.4.orig/gui/gdmcommon.c     2008-03-10 23:22:20.000000000 +0100
 
775
+++ gdm-2.20.4/gui/gdmcommon.c  2008-03-11 22:43:17.000000000 +0100
776
776
@@ -221,6 +221,7 @@
777
777
        {
778
778
                {"preferences-desktop-locale", 24, preferences_desktop_locale_24},
781
781
                {"system-log-out", 24, system_log_out_24},
782
782
                {"system-restart", 24, system_restart_24},
783
783
                {"system-shut-down", 24, system_shut_down_24},
 
784
Index: gdm-2.20.4/config.h.in
 
785
===================================================================
 
786
--- gdm-2.20.4.orig/config.h.in 2008-03-11 22:43:30.000000000 +0100
 
787
+++ gdm-2.20.4/config.h.in      2008-03-11 22:43:47.000000000 +0100
 
788
@@ -6,6 +6,7 @@
 
789
 #undef REBOOT_COMMAND
 
790
 #undef SOUND_PROGRAM
 
791
 #undef SUSPEND_COMMAND
 
792
+#undef HIBERNATE_COMMAND
 
793
 #undef ENABLE_IPV6
 
794
 #undef ENABLE_NLS
 
795
 #undef ALWAYS_RESTART_SERVER