| 1 |
eva 09/02/26 23:23:29 |
| 2 |
|
| 3 |
Added: gnome-panel-2.24.3-shutdown.patch |
| 4 |
Removed: gnome-panel-2.24.1-logout.patch.gz |
| 5 |
Log: |
| 6 |
Bump to 2.24.3-r1. Add patch to allow shutdown without gdm, #259138. Clean up old revisions. |
| 7 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gnome-panel-2.24.3-shutdown.patch |
| 16 |
=================================================================== |
| 17 |
# Fix shutdown without gdm |
| 18 |
# https://bugs.gentoo.org/show_bug.cgi?id=259138 |
| 19 |
--- a/gnome-panel/panel-gdm.c 2009-02-15 20:33:57.000000000 +0000 |
| 20 |
+++ b/gnome-panel/panel-gdm.c 2009-02-15 20:38:47.000000000 +0000 |
| 21 |
@@ -233,6 +233,15 @@ |
| 22 |
char *response; |
| 23 |
|
| 24 |
g_assert (data->fd <= 0); |
| 25 |
+ |
| 26 |
+ if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS)) |
| 27 |
+ strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH); |
| 28 |
+ else if (g_file_test ("/tmp/.gdm_socket", G_FILE_TEST_EXISTS)) |
| 29 |
+ strcpy (addr.sun_path, "/tmp/.gdm_socket"); |
| 30 |
+ else { |
| 31 |
+ gdm_shutdown_protocol_connection (data); |
| 32 |
+ return FALSE; |
| 33 |
+ } |
| 34 |
|
| 35 |
data->fd = socket (AF_UNIX, SOCK_STREAM, 0); |
| 36 |
if (data->fd < 0) { |
| 37 |
@@ -242,11 +251,6 @@ |
| 38 |
return FALSE; |
| 39 |
} |
| 40 |
|
| 41 |
- if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS)) |
| 42 |
- strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH); |
| 43 |
- else |
| 44 |
- strcpy (addr.sun_path, "/tmp/.gdm_socket"); |
| 45 |
- |
| 46 |
addr.sun_family = AF_UNIX; |
| 47 |
|
| 48 |
if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) { |
| 49 |
@@ -398,6 +402,16 @@ |
| 50 |
gdm_shutdown_protocol_connection (&gdm_protocol_data); |
| 51 |
} |
| 52 |
|
| 53 |
+gboolean |
| 54 |
+gdm_available (void) |
| 55 |
+{ |
| 56 |
+ if (!gdm_init_protocol_connection (&gdm_protocol_data)) |
| 57 |
+ return FALSE; |
| 58 |
+ |
| 59 |
+ gdm_shutdown_protocol_connection (&gdm_protocol_data); |
| 60 |
+ return TRUE; |
| 61 |
+} |
| 62 |
+ |
| 63 |
void |
| 64 |
gdm_new_login (void) |
| 65 |
{ |
| 66 |
--- a/gnome-panel/panel-gdm.h 2009-02-15 20:33:57.000000000 +0000 |
| 67 |
+++ b/gnome-panel/panel-gdm.h 2009-02-15 20:38:58.000000000 +0000 |
| 68 |
@@ -46,6 +46,7 @@ |
| 69 |
void gdm_set_logout_action (GdmLogoutAction action); |
| 70 |
GdmLogoutAction gdm_get_logout_action (void); |
| 71 |
void gdm_new_login (void); |
| 72 |
+gboolean gdm_available (void); |
| 73 |
|
| 74 |
G_END_DECLS |
| 75 |
|
| 76 |
--- a/gnome-panel/panel-logout.c 2009-02-15 20:33:57.000000000 +0000 |
| 77 |
+++ b/gnome-panel/panel-logout.c 2009-02-15 20:40:48.000000000 +0000 |
| 78 |
@@ -341,10 +341,12 @@ |
| 79 |
// FIXME need to verify that this response can be used |
| 80 |
logout_dialog->priv->default_response = PANEL_LOGOUT_DIALOG_LOGOUT; |
| 81 |
|
| 82 |
- //FIXME is gdm running? |
| 83 |
- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), |
| 84 |
- _("_Switch User"), |
| 85 |
- PANEL_LOGOUT_RESPONSE_SWITCH_USER); |
| 86 |
+ //FIXME need to have a more flexible test for availability |
| 87 |
+ if (gdm_available()) |
| 88 |
+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog), |
| 89 |
+ _("_Switch User"), |
| 90 |
+ PANEL_LOGOUT_RESPONSE_SWITCH_USER); |
| 91 |
+ |
| 92 |
gtk_dialog_add_button (GTK_DIALOG (logout_dialog), |
| 93 |
GTK_STOCK_CANCEL, |
| 94 |
GTK_RESPONSE_CANCEL); |
Archives