From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PvxdJ-0004qT-9R for garchives@archives.gentoo.org; Sat, 05 Mar 2011 19:59:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB2501C022; Sat, 5 Mar 2011 19:59:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4F1221C022 for ; Sat, 5 Mar 2011 19:59:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0AB11B4195 for ; Sat, 5 Mar 2011 19:59:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D62808006E for ; Sat, 5 Mar 2011 19:59:12 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch gnome-base/gnome-session/gnome-session-2.91.90.1.ebuild gnome-base/gnome-session/gnome-session-9999.ebuild X-VCS-Directories: gnome-base/gnome-session/files/ gnome-base/gnome-session/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: c84e5e8b7a1b1c3e11aa560a8a65696efff287f0 Date: Sat, 5 Mar 2011 19:59:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 121277d05b317944392dc13e6a5c772e commit: c84e5e8b7a1b1c3e11aa560a8a65696efff287f0 Author: Nirbheek Chauhan gentoo org> AuthorDate: Sat Mar 5 19:54:43 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sat Mar 5 19:57:53 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dc84e5e8b gnome-base/gnome-session: sync with tree, cleanup session-saving patch * Didn't apply, and XSMP session saving is deprecated in GNOME 3 --- ...nome-session-2.32.0-session-saving-button.patch | 559 --------------= ------ .../gnome-session/gnome-session-2.91.90.1.ebuild | 12 +- gnome-base/gnome-session/gnome-session-9999.ebuild | 3 +- 3 files changed, 4 insertions(+), 570 deletions(-) diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.0-session-= saving-button.patch b/gnome-base/gnome-session/files/gnome-session-2.32.0= -session-saving-button.patch deleted file mode 100644 index b407f9a..0000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-= button.patch +++ /dev/null @@ -1,559 +0,0 @@ -From c56898dcc1a73af37333b5df28f3b298a0c0669d Mon Sep 17 00:00:00 2001 -From: Priit Laes -Date: Thu, 9 Sep 2010 15:38:37 +0300 -Subject: [PATCH] Implement session saving UI in gnome-session-properties - -Original patch by Ghee Teo and Josselin Mouette - -https://bugzilla.gnome.org/show_bug.cgi?id=3D575544 ---- - capplet/gsm-properties-dialog.c | 63 ++++++++++++- - configure.ac | 1 + - data/session-properties.ui | 12 ++ - gnome-session/gsm-client.c | 10 ++ - gnome-session/gsm-client.h | 6 + - gnome-session/gsm-dbus-client.c | 14 +++ - gnome-session/gsm-manager.c | 150 +++++++++++++++++++++= ++++++- - gnome-session/gsm-manager.h | 3 + - gnome-session/gsm-xsmp-client.c | 37 +++++++ - gnome-session/gsm-xsmp-client.h | 3 +- - gnome-session/org.gnome.SessionManager.xml | 8 ++ - 11 files changed, 303 insertions(+), 4 deletions(-) - -diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-di= alog.c -index 84ef910..f54656e 100644 ---- a/capplet/gsm-properties-dialog.c -+++ b/capplet/gsm-properties-dialog.c -@@ -35,6 +35,12 @@ - #include "gsm-util.h" - #include "gsp-app.h" - #include "gsp-app-manager.h" -+#include -+#include -+ -+#define GSM_SERVICE_DBUS "org.gnome.SessionManager" -+#define GSM_PATH_DBUS "/org/gnome/SessionManager" -+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager" -=20 - #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVA= TE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate)) -=20 -@@ -50,6 +56,7 @@ - #define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_bu= tton" - #define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_butt= on" - #define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_butt= on" -+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_s= aved_label" - #define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_= toggle" -=20 - #define STARTUP_APP_ICON "system-run" -@@ -493,10 +500,64 @@ on_autosave_value_toggled (GtkToggleButton *bu= tton, - } -=20 - static void -+session_saved_message (GsmPropertiesDialog *dialog, -+ const char *msg, -+ gboolean is_error) -+{ -+ GtkLabel *label; -+ gchar *markup; -+ label =3D GTK_LABEL (gtk_builder_get_object (dialog->priv->xml,= CAPPLET_SESSION_SAVED_WIDGET_NAME)); -+ if (is_error) -+ markup =3D g_markup_printf_escaped ("%s", msg); -+ else -+ markup =3D g_markup_escape_text (msg, -1); -+ gtk_label_set_markup (label, markup); -+ g_free (markup); -+} -+ -+static void -+session_saved_cb (DBusGProxy *proxy, -+ DBusGProxyCall *call_id, -+ void *user_data) -+{ -+ gboolean res; -+ GsmPropertiesDialog *dialog =3D user_data; -+ -+ res =3D dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INV= ALID); -+ if (res) -+ session_saved_message (dialog, _("Your session has been= saved."), FALSE); -+ else -+ session_saved_message (dialog, _("Failed to save sessio= n"), TRUE); -+ -+ g_object_unref (proxy); -+} -+ -+static void - on_save_session_clicked (GtkWidget *widget, - GsmPropertiesDialog *dialog) - { -- g_debug ("Session saving is not implemented yet!"); -+ DBusGConnection *conn; -+ DBusGProxy *proxy; -+ DBusGProxyCall *call; -+ -+ conn =3D dbus_g_bus_get (DBUS_BUS_SESSION, NULL); -+ if (conn =3D=3D NULL) { -+ session_saved_message (dialog, _("Could not connect to = the session bus"), TRUE); -+ return; -+ } -+ -+ proxy =3D dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GS= M_PATH_DBUS, GSM_INTERFACE_DBUS); -+ if (proxy =3D=3D NULL) { -+ session_saved_message (dialog, _("Could not connect to = the session manager"), TRUE); -+ return; -+ } -+ -+ call =3D dbus_g_proxy_begin_call (proxy, "SaveSession", session= _saved_cb, dialog, NULL, G_TYPE_INVALID); -+ if (call =3D=3D NULL) { -+ session_saved_message (dialog, _("Failed to save sessio= n"), TRUE); -+ g_object_unref (proxy); -+ return; -+ } - } -=20 - static void -diff --git a/configure.ac b/configure.ac -index 3988b4a..b2b96b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,6 +76,7 @@ PKG_CHECK_MODULES(GNOME_SESSION, - PKG_CHECK_MODULES(SESSION_PROPERTIES, - glib-2.0 >=3D $GLIB_REQUIRED - gtk+-$GTK_API_VERSION >=3D $GTK_REQUIRED -+ dbus-glib-1 >=3D $DBUS_GLIB_REQUIRED - ) -=20 - PKG_CHECK_MODULES(SM, sm) -diff --git a/data/session-properties.ui b/data/session-properties.ui -index 24f721d..3083fc1 100644 ---- a/data/session-properties.ui -+++ b/data/session-properties.ui -@@ -148,6 +148,7 @@ - True - - -+ True - True - True - -@@ -191,6 +192,17 @@ - 1 - - -+ -+ -+ True -+ True -+ -+ -+ False -+ False -+ 2 -+ -+ - - - 1 -diff --git a/gnome-session/gsm-client.c b/gnome-session/gsm-client.c -index b1c3c02..b063aca 100644 ---- a/gnome-session/gsm-client.c -+++ b/gnome-session/gsm-client.c -@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *client) - g_signal_emit (client, signals[DISCONNECTED], 0); - } -=20 -+gboolean -+gsm_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); -+ -+ return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client= , flags, error); -+} -+ - GKeyFile * - gsm_client_save (GsmClient *client, - GError **error) -diff --git a/gnome-session/gsm-client.h b/gnome-session/gsm-client.h -index 8fa28ad..a191e1d 100644 ---- a/gnome-session/gsm-client.h -+++ b/gnome-session/gsm-client.h -@@ -92,6 +92,9 @@ struct _GsmClientClass - GError = **error); - gboolean (*impl_stop) (GsmClient= *client, - GError = **error); -+ gboolean (*impl_request_save) (GsmClient= *client, -+ guint = flags, -+ GError = **error); - GKeyFile * (*impl_save) (GsmClient= *client, - GError = **error); - }; -@@ -137,6 +140,9 @@ gboolean gsm_client_cancel_end_session = (GsmClient *client, -=20 - void gsm_client_disconnected (GsmClient = *client); -=20 -+gboolean gsm_client_request_save (GsmClient = *client, -+ guint = flags, -+ GError = **error); - GKeyFile *gsm_client_save (GsmClient = *client, - GError = **error); - /* exported to bus */ -diff --git a/gnome-session/gsm-dbus-client.c b/gnome-session/gsm-dbus-cl= ient.c -index e0aaf3d..a6ab43a 100644 ---- a/gnome-session/gsm-dbus-client.c -+++ b/gnome-session/gsm-dbus-client.c -@@ -413,6 +413,19 @@ gsm_dbus_client_finalize (GObject *object) - G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object= ); - } -=20 -+static gboolean -+dbus_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_debug ("GsmDBusClient: sending save request to client with id= %s", -+ gsm_client_peek_id (client)); -+ -+ /* FIXME: The protocol does not support this */ -+ -+ return FALSE; -+} -+ - static GKeyFile * - dbus_client_save (GsmClient *client, - GError **error) -@@ -665,6 +678,7 @@ gsm_dbus_client_class_init (GsmDBusClientClass *klas= s) - object_class->set_property =3D gsm_dbus_client_set_prop= erty; - object_class->dispose =3D gsm_dbus_client_dispose; -=20 -+ client_class->impl_request_save =3D dbus_client_reque= st_save; - client_class->impl_save =3D dbus_client_save; - client_class->impl_stop =3D dbus_client_stop; - client_class->impl_query_end_session =3D dbus_client_query= _end_session; -diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c -index c85cea6..ca1a0ae 100644 ---- a/gnome-session/gsm-manager.c -+++ b/gnome-session/gsm-manager.c -@@ -68,6 +68,7 @@ - #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager" -=20 - #define GSM_MANAGER_PHASE_TIMEOUT 10 /* seconds */ -+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2 -=20 - #define GDM_FLEXISERVER_COMMAND "gdmflexiserver" - #define GDM_FLEXISERVER_ARGS "--startnew Standard" -@@ -1153,6 +1154,69 @@ query_end_session_complete (GsmManager *manager) -=20 - } -=20 -+static gboolean -+_client_request_save (GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ gboolean ret; -+ GError *error; -+ -+ error =3D NULL; -+ ret =3D gsm_client_request_save (client, data->flags, &error); -+ if (ret) { -+ g_debug ("GsmManager: adding client to query clients: %= s", gsm_client_peek_id (client)); -+ data->manager->priv->query_clients =3D g_slist_prepend = (data->manager->priv->query_clients, -+ c= lient); -+ } else if (error) { -+ g_debug ("GsmManager: unable to query client: %s", erro= r->message); -+ g_error_free (error); -+ } -+ -+ return FALSE; -+} -+ -+static gboolean -+_client_request_save_helper (const char *id, -+ GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ return _client_request_save (client, data); -+} -+ -+static void -+query_save_session_complete (GsmManager *manager) -+{ -+ GError *error =3D NULL; -+ -+ if (g_slist_length (manager->priv->next_query_clients) > 0) { -+ ClientEndSessionData data; -+ -+ data.manager =3D manager; -+ data.flags =3D GSM_CLIENT_END_SESSION_FLAG_LAST; -+ -+ g_slist_foreach (manager->priv->next_query_clients, -+ (GFunc)_client_request_save, -+ &data); -+ -+ g_slist_free (manager->priv->next_query_clients); -+ manager->priv->next_query_clients =3D NULL; -+ -+ return; -+ } -+ -+ if (manager->priv->query_timeout_id > 0) { -+ g_source_remove (manager->priv->query_timeout_id); -+ manager->priv->query_timeout_id =3D 0; -+ } -+ -+ gsm_session_save (manager->priv->clients, &error); -+ -+ if (error) { -+ g_warning ("Error saving session: %s", error->message); -+ g_error_free (error); -+ } -+} -+ - static guint32 - generate_cookie (void) - { -@@ -1227,6 +1291,21 @@ _on_query_end_session_timeout (GsmManager *manage= r) - return FALSE; - } -=20 -+static gboolean -+_on_query_save_session_timeout (GsmManager *manager) -+{ -+ manager->priv->query_timeout_id =3D 0; -+ -+ g_debug ("GsmManager: query to save session timed out"); -+ -+ g_slist_free (manager->priv->query_clients); -+ manager->priv->query_clients =3D NULL; -+ -+ query_save_session_complete (manager); -+ -+ return FALSE; -+} -+ - static void - do_phase_query_end_session (GsmManager *manager) - { -@@ -1863,13 +1942,32 @@ on_client_end_session_response (GsmClient *clie= nt, - const char *reason, - GsmManager *manager) - { -- /* just ignore if received outside of shutdown */ -- if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION)= { -+ /* just ignore if we are not yet running */ -+ if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) { - return; - } -=20 - g_debug ("GsmManager: Response from end session request: is-ok=3D= %d do-last=3D%d cancel=3D%d reason=3D%s", is_ok, do_last, cancel, reason = ? reason :""); -=20 -+ if (manager->priv->phase =3D=3D GSM_MANAGER_PHASE_RUNNING) { -+ /* Ignore responses when no requests were sent */ -+ if (manager->priv->query_clients =3D=3D NULL) { -+ return; -+ } -+ -+ manager->priv->query_clients =3D g_slist_remove (manage= r->priv->query_clients, client); -+ -+ if (do_last) { -+ manager->priv->next_query_clients =3D g_slist_p= repend (manager->priv->next_query_clients, -+ = client); -+ } -+ -+ if (manager->priv->query_clients =3D=3D NULL) { -+ query_save_session_complete (manager); -+ } -+ return; -+ } -+ - if (cancel) { - cancel_end_session (manager); - return; -@@ -1968,6 +2066,15 @@ on_xsmp_client_logout_request (GsmXSMPClient *cli= ent, - } -=20 - static void -+on_xsmp_client_save_request (GsmXSMPClient *client, -+ gboolean show_dialog, -+ GsmManager *manager) -+{ -+ g_debug ("GsmManager: save_request"); -+ gsm_manager_save_session (manager, NULL); -+} -+ -+static void - on_store_client_added (GsmStore *store, - const char *id, - GsmManager *manager) -@@ -1988,6 +2095,10 @@ on_store_client_added (GsmStore *store, - "logout-request", - G_CALLBACK (on_xsmp_client_logout_req= uest), - manager); -+ g_signal_connect (client, -+ "save-request", -+ G_CALLBACK (on_xsmp_client_save_request), -+ manager); - } -=20 - g_signal_connect (client, -@@ -2945,6 +3056,41 @@ gsm_manager_shutdown (GsmManager *manager, - } -=20 - gboolean -+gsm_manager_save_session (GsmManager *manager, -+ GError **error) -+{ -+ ClientEndSessionData data; -+ -+ g_debug ("GsmManager: SaveSession called"); -+ -+ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); -+ -+ if (manager->priv->phase !=3D GSM_MANAGER_PHASE_RUNNING) { -+ g_set_error (error, -+ GSM_MANAGER_ERROR, -+ GSM_MANAGER_ERROR_NOT_IN_RUNNING, -+ "SaveSession interface is only available d= uring the Running phase"); -+ return FALSE; -+ } -+ -+ data.manager =3D manager; -+ data.flags =3D 0; -+ gsm_store_foreach (manager->priv->clients, -+ (GsmStoreFunc)_client_request_save_helper, -+ &data); -+ -+ if (manager->priv->query_clients) { -+ manager->priv->query_timeout_id =3D g_timeout_add_secon= ds (GSM_MANAGER_SAVE_SESSION_TIMEOUT, -+ = (GSourceFunc)_on_query_save_session_timeout, -+ = manager); -+ return TRUE; -+ } else { -+ g_debug ("GsmManager: Nothing to save"); -+ return FALSE; -+ } -+} -+ -+gboolean - gsm_manager_can_shutdown (GsmManager *manager, - gboolean *shutdown_available, - GError **error) -diff --git a/gnome-session/gsm-manager.h b/gnome-session/gsm-manager.h -index 17c70b3..dd6f198 100644 ---- a/gnome-session/gsm-manager.h -+++ b/gnome-session/gsm-manager.h -@@ -152,6 +152,9 @@ gboolean gsm_manager_is_inhibited = (GsmManager - gboolean gsm_manager_shutdown (GsmMana= ger *manager, - GError = **error); -=20 -+gboolean gsm_manager_save_session (GsmMana= ger *manager, -+ GError = **error); -+ - gboolean gsm_manager_can_shutdown (GsmMana= ger *manager, - gboolea= n *shutdown_available, - GError = **error); -diff --git a/gnome-session/gsm-xsmp-client.c b/gnome-session/gsm-xsmp-cl= ient.c -index ce22ed9..ed55406 100644 ---- a/gnome-session/gsm-xsmp-client.c -+++ b/gnome-session/gsm-xsmp-client.c -@@ -69,6 +69,7 @@ enum { - enum { - REGISTER_REQUEST, - LOGOUT_REQUEST, -+ SAVE_REQUEST, - LAST_SIGNAL - }; -=20 -@@ -502,6 +503,30 @@ xsmp_cancel_end_session (GsmClient *client, - return TRUE; - } -=20 -+static gboolean -+xsmp_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ GsmXSMPClient *xsmp =3D (GsmXSMPClient *) client; -+ -+ g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv-= >description); -+ -+ if (xsmp->priv->conn =3D=3D NULL) { -+ g_set_error (error, -+ GSM_CLIENT_ERROR, -+ GSM_CLIENT_ERROR_NOT_REGISTERED, -+ "Client is not registered"); -+ return FALSE; -+ } -+ -+ if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST) -+ xsmp_save_yourself_phase2 (client); -+ else -+ do_save_yourself (xsmp, SmSaveLocal, FALSE); -+ -+ return TRUE; -+} - static char * - get_desktop_file_path (GsmXSMPClient *client) - { -@@ -976,6 +1001,7 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *kla= ss) - object_class->get_property =3D gsm_xsmp_client_get_prop= erty; - object_class->set_property =3D gsm_xsmp_client_set_prop= erty; -=20 -+ client_class->impl_request_save =3D xsmp_request_save= ; - client_class->impl_save =3D xsmp_save; - client_class->impl_stop =3D xsmp_stop; - client_class->impl_query_end_session =3D xsmp_query_end_se= ssion; -@@ -1006,6 +1032,17 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *k= lass) - G_TYPE_NONE, - 1, G_TYPE_BOOLEAN); -=20 -+ signals[SAVE_REQUEST] =3D -+ g_signal_new ("save-request", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (GsmXSMPClientClass, save= _request), -+ NULL, -+ NULL, -+ g_cclosure_marshal_VOID__BOOLEAN, -+ G_TYPE_NONE, -+ 1, G_TYPE_BOOLEAN); -+ - g_object_class_install_property (object_class, - PROP_ICE_CONNECTION, - g_param_spec_pointer ("ice-con= nection", -diff --git a/gnome-session/gsm-xsmp-client.h b/gnome-session/gsm-xsmp-cl= ient.h -index b80f933..4fa24fb 100644 ---- a/gnome-session/gsm-xsmp-client.h -+++ b/gnome-session/gsm-xsmp-client.h -@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass - char **client_id); - gboolean (*logout_request) (GsmXSMPClient *client, - gboolean prompt); -- -+ gboolean (*save_request) (GsmXSMPClient *client, -+ gboolean prompt); -=20 - void (*saved_state) (GsmXSMPClient *client); -=20 -diff --git a/gnome-session/org.gnome.SessionManager.xml b/gnome-session/= org.gnome.SessionManager.xml -index b8bec4e..bece3f5 100644 ---- a/gnome-session/org.gnome.SessionManager.xml -+++ b/gnome-session/org.gnome.SessionManager.xml -@@ -256,6 +256,14 @@ - - -=20 -+ -+ -+ -+ Request to save session -+ -+ -+ -+ - - - ---=20 -1.7.2.2 - diff --git a/gnome-base/gnome-session/gnome-session-2.91.90.1.ebuild b/gn= ome-base/gnome-session/gnome-session-2.91.90.1.ebuild index 3e71c94..f001356 100644 --- a/gnome-base/gnome-session/gnome-session-2.91.90.1.ebuild +++ b/gnome-base/gnome-session/gnome-session-2.91.90.1.ebuild @@ -5,7 +5,7 @@ EAPI=3D"3" GCONF_DEBUG=3D"yes" =20 -inherit autotools eutils gnome2 +inherit gnome2 =20 DESCRIPTION=3D"Gnome session manager" HOMEPAGE=3D"http://www.gnome.org/" @@ -58,6 +58,7 @@ DEPEND=3D"${COMMON_DEPEND} doc? ( app-text/xmlto dev-libs/libxslt )" +# gnome-common needed for eautoreconf # gnome-base/gdm does not provide gnome.desktop anymore =20 src_prepare() { @@ -72,15 +73,6 @@ src_prepare() { $(use_enable ipv6)" DOCS=3D"AUTHORS ChangeLog NEWS README" =20 - # Add "session saving" button back, upstream bug #575544 - # FIXME: Doesn't apply anymore -# epatch "${FILESDIR}/${PN}-2.32.0-session-saving-button.patch" -# -# if [[ ${PV} !=3D 9999 ]]; then -# intltoolize --force --copy --automake || die "intltoolize failed" -# eautoreconf -# fi - gnome2_src_prepare } =20 diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-b= ase/gnome-session/gnome-session-9999.ebuild index 1762c08..4dce076 100644 --- a/gnome-base/gnome-session/gnome-session-9999.ebuild +++ b/gnome-base/gnome-session/gnome-session-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D"3" GCONF_DEBUG=3D"yes" =20 -inherit eutils gnome2 +inherit gnome2 =20 DESCRIPTION=3D"Gnome session manager" HOMEPAGE=3D"http://www.gnome.org/" @@ -58,6 +58,7 @@ DEPEND=3D"${COMMON_DEPEND} doc? ( app-text/xmlto dev-libs/libxslt )" +# gnome-common needed for eautoreconf # gnome-base/gdm does not provide gnome.desktop anymore =20 src_prepare() {