summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-10-20 16:41:04 +0000
committerPacho Ramos <pacho@gentoo.org>2010-10-20 16:41:04 +0000
commit2755b75269aee3fd31cb29be5d7441fc3e76973a (patch)
treed0aaf94a8e960893fe08ebf08a3ca35e0cad5f94 /gnome-base/gnome-panel/files
parentReally fix QA issues (#332451), Version bump (#341001), fix init-script deps ... (diff)
downloadgentoo-2-2755b75269aee3fd31cb29be5d7441fc3e76973a.tar.gz
gentoo-2-2755b75269aee3fd31cb29be5d7441fc3e76973a.tar.bz2
gentoo-2-2755b75269aee3fd31cb29be5d7441fc3e76973a.zip
Remove old.
(Portage version: 2.1.9.19/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-panel/files')
-rw-r--r--gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch25
-rw-r--r--gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch78
2 files changed, 0 insertions, 103 deletions
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch
deleted file mode 100644
index 508aa0d6cdf5..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-daylight.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugzilla.gnome.org/show_bug.cgi?id=569737
-https://bugs.gentoo.org/show_bug.cgi?id=256859
-
---- gnome-panel-2.24.3/applets/clock/clock.c.old 2009-01-29 21:59:18 +0000
-+++ gnome-panel-2.24.3/applets/clock/clock.c 2009-01-29 21:59:29 +0000
-@@ -653,7 +653,7 @@
- time (&now_t);
- localtime_r (&now_t, &now);
-
-- if (daylight && now.tm_isdst) {
-+ if (now.tm_isdst>0) {
- zone = tzname[1];
- } else {
- zone = tzname[0];
---- gnome-panel-2.24.3/applets/clock/clock-location.c.old 2009-01-29 22:00:15 +0000
-+++ gnome-panel-2.24.3/applets/clock/clock-location.c 2009-01-29 22:00:29 +0000
-@@ -337,7 +337,7 @@
- now_t = time (NULL);
- localtime_r (&now_t, &now);
-
-- if (daylight && now.tm_isdst) {
-+ if (now.tm_isdst>0) {
- clock_location_set_tzname (this, tzname[1]);
- } else {
- clock_location_set_tzname (this, tzname[0]);
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch
deleted file mode 100644
index aefb74cb0740..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-# Fix shutdown without gdm
-# https://bugs.gentoo.org/show_bug.cgi?id=259138
---- a/gnome-panel/panel-gdm.c 2009-02-15 20:33:57.000000000 +0000
-+++ b/gnome-panel/panel-gdm.c 2009-02-15 20:38:47.000000000 +0000
-@@ -233,6 +233,15 @@
- char *response;
-
- g_assert (data->fd <= 0);
-+
-+ if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
-+ strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
-+ else if (g_file_test ("/tmp/.gdm_socket", G_FILE_TEST_EXISTS))
-+ strcpy (addr.sun_path, "/tmp/.gdm_socket");
-+ else {
-+ gdm_shutdown_protocol_connection (data);
-+ return FALSE;
-+ }
-
- data->fd = socket (AF_UNIX, SOCK_STREAM, 0);
- if (data->fd < 0) {
-@@ -242,11 +251,6 @@
- return FALSE;
- }
-
-- if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
-- strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
-- else
-- strcpy (addr.sun_path, "/tmp/.gdm_socket");
--
- addr.sun_family = AF_UNIX;
-
- if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
-@@ -398,6 +402,16 @@
- gdm_shutdown_protocol_connection (&gdm_protocol_data);
- }
-
-+gboolean
-+gdm_available (void)
-+{
-+ if (!gdm_init_protocol_connection (&gdm_protocol_data))
-+ return FALSE;
-+
-+ gdm_shutdown_protocol_connection (&gdm_protocol_data);
-+ return TRUE;
-+}
-+
- void
- gdm_new_login (void)
- {
---- a/gnome-panel/panel-gdm.h 2009-02-15 20:33:57.000000000 +0000
-+++ b/gnome-panel/panel-gdm.h 2009-02-15 20:38:58.000000000 +0000
-@@ -46,6 +46,7 @@
- void gdm_set_logout_action (GdmLogoutAction action);
- GdmLogoutAction gdm_get_logout_action (void);
- void gdm_new_login (void);
-+gboolean gdm_available (void);
-
- G_END_DECLS
-
---- a/gnome-panel/panel-logout.c 2009-02-15 20:33:57.000000000 +0000
-+++ b/gnome-panel/panel-logout.c 2009-02-15 20:40:48.000000000 +0000
-@@ -341,10 +341,12 @@
- // FIXME need to verify that this response can be used
- logout_dialog->priv->default_response = PANEL_LOGOUT_DIALOG_LOGOUT;
-
-- //FIXME is gdm running?
-- gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
-- _("_Switch User"),
-- PANEL_LOGOUT_RESPONSE_SWITCH_USER);
-+ //FIXME need to have a more flexible test for availability
-+ if (gdm_available())
-+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
-+ _("_Switch User"),
-+ PANEL_LOGOUT_RESPONSE_SWITCH_USER);
-+
- gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL);