2.25.2
This commit is contained in:
Matthias Clasen
parent
ce322fb428
commit
6fa1fd4fdf
@ -1 +1 @@
|
|||||||
gnome-session-2.24.1.tar.bz2
|
gnome-session-2.25.2.tar.bz2
|
||||||
|
|||||||
@ -1,13 +0,0 @@
|
|||||||
diff -up gnome-session-2.23.92/gnome-session/gsm-xsmp-server.c.ListenObj-leak gnome-session-2.23.92/gnome-session/gsm-xsmp-server.c
|
|
||||||
--- gnome-session-2.23.92/gnome-session/gsm-xsmp-server.c.ListenObj-leak 2008-09-14 13:36:09.000000000 -0400
|
|
||||||
+++ gnome-session-2.23.92/gnome-session/gsm-xsmp-server.c 2008-09-14 13:38:00.000000000 -0400
|
|
||||||
@@ -606,6 +606,9 @@ gsm_xsmp_server_finalize (GObject *objec
|
|
||||||
|
|
||||||
g_return_if_fail (xsmp_server->priv != NULL);
|
|
||||||
|
|
||||||
+ IceFreeListenObjs (xsmp_server->priv->num_xsmp_sockets,
|
|
||||||
+ xsmp_server->priv->xsmp_sockets);
|
|
||||||
+
|
|
||||||
if (xsmp_server->priv->client_store != NULL) {
|
|
||||||
g_object_unref (xsmp_server->priv->client_store);
|
|
||||||
}
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up gnome-session-2.23.6/compat/at-spi-registryd-wrapper.c.crash gnome-session-2.23.6/compat/at-spi-registryd-wrapper.c
|
|
||||||
--- gnome-session-2.23.6/compat/at-spi-registryd-wrapper.c.crash 2008-08-12 10:07:48.000000000 -0400
|
|
||||||
+++ gnome-session-2.23.6/compat/at-spi-registryd-wrapper.c 2008-08-12 10:10:15.000000000 -0400
|
|
||||||
@@ -98,7 +98,7 @@ set_gtk_modules (DBusGProxy *gsm)
|
|
||||||
modules[i] = NULL;
|
|
||||||
|
|
||||||
value = g_strjoinv (":", modules);
|
|
||||||
- g_strfreev (modules);
|
|
||||||
+ g_free (modules);
|
|
||||||
} else {
|
|
||||||
value = g_strdup ("gail:atk-bridge");
|
|
||||||
}
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
diff -up gnome-session-2.23.92/gnome-session/gsm-manager.c.empty-string-leak gnome-session-2.23.92/gnome-session/gsm-manager.c
|
|
||||||
--- gnome-session-2.23.92/gnome-session/gsm-manager.c.empty-string-leak 2008-09-14 21:44:18.000000000 -0400
|
|
||||||
+++ gnome-session-2.23.92/gnome-session/gsm-manager.c 2008-09-14 21:48:06.000000000 -0400
|
|
||||||
@@ -913,6 +913,7 @@ _on_query_end_session_timeout (GsmManage
|
|
||||||
app_id = g_strdup (gsm_client_peek_app_id (l->data));
|
|
||||||
if (IS_STRING_EMPTY (app_id)) {
|
|
||||||
/* XSMP clients don't give us an app id unless we start them */
|
|
||||||
+ g_free (app_id);
|
|
||||||
app_id = gsm_client_get_app_name (l->data);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1529,6 +1530,7 @@ on_client_end_session_response (GsmClien
|
|
||||||
app_id = g_strdup (gsm_client_peek_app_id (client));
|
|
||||||
if (IS_STRING_EMPTY (app_id)) {
|
|
||||||
/* XSMP clients don't give us an app id unless we start them */
|
|
||||||
+ g_free (app_id);
|
|
||||||
app_id = gsm_client_get_app_name (client);
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,168 +0,0 @@
|
|||||||
diff -up gnome-session-2.24.0/gnome-session/gsm-consolekit.c.add-can-shutdown-api gnome-session-2.24.0/gnome-session/gsm-consolekit.c
|
|
||||||
--- gnome-session-2.24.0/gnome-session/gsm-consolekit.c.add-can-shutdown-api 2008-09-22 17:21:08.000000000 -0400
|
|
||||||
+++ gnome-session-2.24.0/gnome-session/gsm-consolekit.c 2008-10-10 17:43:35.000000000 -0400
|
|
||||||
@@ -825,20 +826,78 @@ gsm_consolekit_can_switch_user (GsmConso
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef HAVE_POLKIT_GNOME
|
|
||||||
+static gboolean
|
|
||||||
+gsm_consolekit_can_do_action (GsmConsolekit *manager,
|
|
||||||
+ const char *action_id)
|
|
||||||
+{
|
|
||||||
+ PolKitGnomeContext *gnome_context;
|
|
||||||
+ PolKitAction *action;
|
|
||||||
+ PolKitCaller *caller;
|
|
||||||
+ DBusError dbus_error;
|
|
||||||
+ PolKitError *error;
|
|
||||||
+ PolKitResult result;
|
|
||||||
+
|
|
||||||
+ gnome_context = polkit_gnome_context_get (NULL);
|
|
||||||
+
|
|
||||||
+ if (gnome_context == NULL) {
|
|
||||||
+ return FALSE;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (gnome_context->pk_tracker == NULL) {
|
|
||||||
+ return FALSE;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ dbus_error_init (&dbus_error);
|
|
||||||
+ caller = polkit_tracker_get_caller_from_pid (gnome_context->pk_tracker,
|
|
||||||
+ getpid (),
|
|
||||||
+ &dbus_error);
|
|
||||||
+ dbus_error_free (&dbus_error);
|
|
||||||
+
|
|
||||||
+ if (caller == NULL) {
|
|
||||||
+ return FALSE;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ action = polkit_action_new ();
|
|
||||||
+ if (!polkit_action_set_action_id (action, action_id)) {
|
|
||||||
+ polkit_action_unref (action);
|
|
||||||
+ polkit_caller_unref (caller);
|
|
||||||
+ return FALSE;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ result = POLKIT_RESULT_UNKNOWN;
|
|
||||||
+ error = NULL;
|
|
||||||
+ result = polkit_context_is_caller_authorized (gnome_context->pk_context,
|
|
||||||
+ action, caller, FALSE,
|
|
||||||
+ &error);
|
|
||||||
+ if (polkit_error_is_set (error)) {
|
|
||||||
+ polkit_error_free (error);
|
|
||||||
+ }
|
|
||||||
+ polkit_action_unref (action);
|
|
||||||
+ polkit_caller_unref (caller);
|
|
||||||
+
|
|
||||||
+ return result != POLKIT_RESULT_NO && result != POLKIT_RESULT_UNKNOWN;
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
gboolean
|
|
||||||
gsm_consolekit_can_restart (GsmConsolekit *manager)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_POLKIT_GNOME
|
|
||||||
gboolean res;
|
|
||||||
GError *error;
|
|
||||||
+
|
|
||||||
error = NULL;
|
|
||||||
res = gsm_consolekit_ensure_ck_connection (manager, &error);
|
|
||||||
if (!res) {
|
|
||||||
g_warning ("Could not connect to ConsoleKit: %s",
|
|
||||||
error->message);
|
|
||||||
g_error_free (error);
|
|
||||||
+ return FALSE;
|
|
||||||
}
|
|
||||||
- return res;
|
|
||||||
+
|
|
||||||
+ return gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.restart") ||
|
|
||||||
+ gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.restart-multiple-users");
|
|
||||||
#else
|
|
||||||
g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot restart system");
|
|
||||||
return FALSE;
|
|
||||||
@@ -857,8 +916,11 @@ gsm_consolekit_can_stop (GsmConsolekit *
|
|
||||||
g_warning ("Could not connect to ConsoleKit: %s",
|
|
||||||
error->message);
|
|
||||||
g_error_free (error);
|
|
||||||
+ return FALSE;
|
|
||||||
}
|
|
||||||
- return res;
|
|
||||||
+
|
|
||||||
+ return gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.stop") ||
|
|
||||||
+ gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.stop-multiple-users");
|
|
||||||
#else
|
|
||||||
g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot stop system");
|
|
||||||
return FALSE;
|
|
||||||
diff -up gnome-session-2.24.0/gnome-session/gsm-manager.c.add-can-shutdown-api gnome-session-2.24.0/gnome-session/gsm-manager.c
|
|
||||||
--- gnome-session-2.24.0/gnome-session/gsm-manager.c.add-can-shutdown-api 2008-09-22 17:21:08.000000000 -0400
|
|
||||||
+++ gnome-session-2.24.0/gnome-session/gsm-manager.c 2008-10-15 11:33:18.000000000 -0400
|
|
||||||
@@ -2313,6 +2313,30 @@ gsm_manager_shutdown (GsmManager *manage
|
|
||||||
}
|
|
||||||
|
|
||||||
gboolean
|
|
||||||
+gsm_manager_can_shutdown (GsmManager *manager,
|
|
||||||
+ gboolean *shutdown_available,
|
|
||||||
+ GError **error)
|
|
||||||
+{
|
|
||||||
+ GsmConsolekit *consolekit;
|
|
||||||
+ GsmPowerManager *power_manager;
|
|
||||||
+
|
|
||||||
+ g_debug ("GsmManager: CanShutdown called");
|
|
||||||
+
|
|
||||||
+ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
|
|
||||||
+
|
|
||||||
+ consolekit = gsm_get_consolekit ();
|
|
||||||
+ power_manager = gsm_get_power_manager ();
|
|
||||||
+ *shutdown_available = gsm_consolekit_can_stop (consolekit)
|
|
||||||
+ || gsm_consolekit_can_restart (consolekit)
|
|
||||||
+ || gsm_power_manager_can_suspend (power_manager)
|
|
||||||
+ || gsm_power_manager_can_hibernate (power_manager);
|
|
||||||
+ g_object_unref (consolekit);
|
|
||||||
+ g_object_unref (power_manager);
|
|
||||||
+
|
|
||||||
+ return TRUE;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+gboolean
|
|
||||||
gsm_manager_logout (GsmManager *manager,
|
|
||||||
guint logout_mode,
|
|
||||||
GError **error)
|
|
||||||
diff -up gnome-session-2.24.0/gnome-session/gsm-manager.h.add-can-shutdown-api gnome-session-2.24.0/gnome-session/gsm-manager.h
|
|
||||||
--- gnome-session-2.24.0/gnome-session/gsm-manager.h.add-can-shutdown-api 2008-09-22 17:21:08.000000000 -0400
|
|
||||||
+++ gnome-session-2.24.0/gnome-session/gsm-manager.h 2008-10-10 16:41:14.000000000 -0400
|
|
||||||
@@ -151,6 +151,10 @@ gboolean gsm_manager_is_inhib
|
|
||||||
|
|
||||||
gboolean gsm_manager_shutdown (GsmManager *manager,
|
|
||||||
GError **error);
|
|
||||||
+
|
|
||||||
+gboolean gsm_manager_can_shutdown (GsmManager *manager,
|
|
||||||
+ gboolean *shutdown_available,
|
|
||||||
+ GError **error);
|
|
||||||
gboolean gsm_manager_logout (GsmManager *manager,
|
|
||||||
guint logout_mode,
|
|
||||||
GError **error);
|
|
||||||
diff -up gnome-session-2.24.0/gnome-session/org.gnome.SessionManager.xml.add-can-shutdown-api gnome-session-2.24.0/gnome-session/org.gnome.SessionManager.xml
|
|
||||||
--- gnome-session-2.24.0/gnome-session/org.gnome.SessionManager.xml.add-can-shutdown-api 2008-09-22 17:21:08.000000000 -0400
|
|
||||||
+++ gnome-session-2.24.0/gnome-session/org.gnome.SessionManager.xml 2008-10-10 16:41:14.000000000 -0400
|
|
||||||
@@ -252,6 +252,20 @@
|
|
||||||
</doc:doc>
|
|
||||||
</method>
|
|
||||||
|
|
||||||
+ <method name="CanShutdown">
|
|
||||||
+ <arg name="is_available" direction="out" type="b">
|
|
||||||
+ <doc:doc>
|
|
||||||
+ <doc:summary>True if shutdown is available to the user, false otherwise</doc:summary>
|
|
||||||
+ </doc:doc>
|
|
||||||
+ </arg>
|
|
||||||
+ <doc:doc>
|
|
||||||
+ <doc:description>
|
|
||||||
+ <doc:para>Allows the caller to determine whether or not it's okay to show
|
|
||||||
+ a shutdown option in the UI</doc:para>
|
|
||||||
+ </doc:description>
|
|
||||||
+ </doc:doc>
|
|
||||||
+ </method>
|
|
||||||
+
|
|
||||||
<method name="Logout">
|
|
||||||
<arg name="mode" type="u" direction="in">
|
|
||||||
<doc:doc>
|
|
||||||
@ -11,10 +11,10 @@
|
|||||||
|
|
||||||
Summary: GNOME session manager
|
Summary: GNOME session manager
|
||||||
Name: gnome-session
|
Name: gnome-session
|
||||||
Version: 2.24.1
|
Version: 2.25.2
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
URL: http://www.gnome.org
|
URL: http://www.gnome.org
|
||||||
Source0: http://download.gnome.org/sources/gnome-session/2.24/%{name}-%{version}.tar.bz2
|
Source0: http://download.gnome.org/sources/gnome-session/2.25/%{name}-%{version}.tar.bz2
|
||||||
Source1: redhat-default-session
|
Source1: redhat-default-session
|
||||||
Source2: gnome.desktop
|
Source2: gnome.desktop
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -64,15 +64,6 @@ Requires(pre): GConf2 >= %{gconf2_version}
|
|||||||
Requires(post): GConf2 >= %{gconf2_version}
|
Requires(post): GConf2 >= %{gconf2_version}
|
||||||
Requires(preun): GConf2 >= %{gconf2_version}
|
Requires(preun): GConf2 >= %{gconf2_version}
|
||||||
|
|
||||||
# http://bugzilla.gnome.org/show_bug.cgi?id=536915
|
|
||||||
Patch9: gnome-session-2.24.0-add-can-shutdown-api.patch
|
|
||||||
|
|
||||||
# fixed upstream
|
|
||||||
Patch10: resizable.patch
|
|
||||||
|
|
||||||
# fixed upstream
|
|
||||||
Patch11: registration.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
gnome-session manages a GNOME desktop or GDM login session. It starts up
|
gnome-session manages a GNOME desktop or GDM login session. It starts up
|
||||||
the other core GNOME components and handles logout and saving the session.
|
the other core GNOME components and handles logout and saving the session.
|
||||||
@ -87,9 +78,6 @@ Desktop file to add GNOME to display manager session menu.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch9 -p1 -b .add-can-shutdown-api
|
|
||||||
%patch10 -p1 -b .resizable
|
|
||||||
%patch11 -p1 -b .registration
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -190,6 +178,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 4 2008 Matthias Clasen <mclasen@redhat.com> - 2.25.2-1
|
||||||
|
- Update to 2.25.2
|
||||||
|
|
||||||
* Tue Nov 25 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.1-5
|
* Tue Nov 25 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.1-5
|
||||||
- Spec file cleanups
|
- Spec file cleanups
|
||||||
|
|
||||||
|
|||||||
@ -1,170 +0,0 @@
|
|||||||
diff -up gnome-session-2.24.0/capplet/gsm-properties-dialog.c.hig-problems gnome-session-2.24.0/capplet/gsm-properties-dialog.c
|
|
||||||
--- gnome-session-2.24.0/capplet/gsm-properties-dialog.c.hig-problems 2008-10-03 00:09:54.000000000 -0400
|
|
||||||
+++ gnome-session-2.24.0/capplet/gsm-properties-dialog.c 2008-10-03 00:12:51.000000000 -0400
|
|
||||||
@@ -998,7 +998,7 @@ edit_app_dialog (GsmPropertiesDialog *di
|
|
||||||
GTK_DIALOG_MODAL,
|
|
||||||
GTK_MESSAGE_ERROR,
|
|
||||||
GTK_BUTTONS_OK,
|
|
||||||
- error_msg);
|
|
||||||
+ "%s", error_msg);
|
|
||||||
|
|
||||||
if (error != NULL) {
|
|
||||||
g_error_free (error);
|
|
||||||
@@ -1457,15 +1457,12 @@ gsm_properties_dialog_init (GsmPropertie
|
|
||||||
widget = glade_xml_get_widget (dialog->priv->xml, "main-notebook");
|
|
||||||
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), widget);
|
|
||||||
|
|
||||||
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
|
|
||||||
- gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
|
|
||||||
+ gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
|
|
||||||
+ gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
|
|
||||||
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
|
|
||||||
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
|
|
||||||
gtk_window_set_icon_name (GTK_WINDOW (dialog), "session-properties");
|
|
||||||
gtk_window_set_title (GTK_WINDOW (dialog), _("Sessions Preferences"));
|
|
||||||
- g_object_set (dialog,
|
|
||||||
- "allow-shrink", FALSE,
|
|
||||||
- "allow-grow", FALSE,
|
|
||||||
- NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
diff -up gnome-session-2.24.0/data/session-properties.glade.hig-problems gnome-session-2.24.0/data/session-properties.glade
|
|
||||||
--- gnome-session-2.24.0/data/session-properties.glade.hig-problems 2008-09-22 17:21:08.000000000 -0400
|
|
||||||
+++ gnome-session-2.24.0/data/session-properties.glade 2008-10-03 00:09:54.000000000 -0400
|
|
||||||
@@ -1,6 +1,4 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
|
|
||||||
-<!--Generated with glade3 3.4.4 on Mon Aug 11 15:28:59 2008 -->
|
|
||||||
+<?xml version="1.0"?>
|
|
||||||
<glade-interface>
|
|
||||||
<widget class="GtkDialog" id="session_properties_edit_dialog">
|
|
||||||
<property name="border_width">5</property>
|
|
||||||
@@ -36,7 +34,6 @@
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
<property name="receives_default">True</property>
|
|
||||||
<property name="label" translatable="yes">Browse...</property>
|
|
||||||
- <property name="response_id">0</property>
|
|
||||||
</widget>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
@@ -163,7 +160,7 @@
|
|
||||||
</child>
|
|
||||||
</widget>
|
|
||||||
<widget class="GtkDialog" id="session_properties_capplet">
|
|
||||||
- <property name="border_width">10</property>
|
|
||||||
+ <property name="border_width">5</property>
|
|
||||||
<property name="title" translatable="yes">Sessions Preferences</property>
|
|
||||||
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
|
|
||||||
<property name="icon_name">session-properties</property>
|
|
||||||
@@ -177,6 +174,7 @@
|
|
||||||
<widget class="GtkNotebook" id="main-notebook">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
+ <property name="border_width">5</property>
|
|
||||||
<child>
|
|
||||||
<widget class="GtkVBox" id="vbox1">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
@@ -217,9 +215,10 @@
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
- <widget class="GtkVBox" id="vbox2">
|
|
||||||
+ <widget class="GtkVButtonBox" id="vbuttonbox1">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
- <property name="spacing">5</property>
|
|
||||||
+ <property name="spacing">6</property>
|
|
||||||
+ <property name="layout_style">GTK_BUTTONBOX_START</property>
|
|
||||||
<child>
|
|
||||||
<widget class="GtkButton" id="session_properties_add_button">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
@@ -227,7 +226,6 @@
|
|
||||||
<property name="receives_default">True</property>
|
|
||||||
<property name="label">gtk-add</property>
|
|
||||||
<property name="use_stock">True</property>
|
|
||||||
- <property name="response_id">0</property>
|
|
||||||
</widget>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
@@ -241,7 +239,6 @@
|
|
||||||
<property name="receives_default">True</property>
|
|
||||||
<property name="label">gtk-remove</property>
|
|
||||||
<property name="use_stock">True</property>
|
|
||||||
- <property name="response_id">0</property>
|
|
||||||
</widget>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
@@ -256,19 +253,16 @@
|
|
||||||
<property name="receives_default">True</property>
|
|
||||||
<property name="label">gtk-edit</property>
|
|
||||||
<property name="use_stock">True</property>
|
|
||||||
- <property name="response_id">0</property>
|
|
||||||
</widget>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
<property name="position">2</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
- <child>
|
|
||||||
- <placeholder/>
|
|
||||||
- </child>
|
|
||||||
</widget>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
+ <property name="fill">False</property>
|
|
||||||
<property name="position">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
@@ -285,22 +279,21 @@
|
|
||||||
<property name="label" translatable="yes">Startup Programs</property>
|
|
||||||
</widget>
|
|
||||||
<packing>
|
|
||||||
- <property name="type">tab</property>
|
|
||||||
<property name="tab_fill">False</property>
|
|
||||||
+ <property name="type">tab</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<widget class="GtkVBox" id="vbox3">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="border_width">12</property>
|
|
||||||
- <property name="spacing">4</property>
|
|
||||||
+ <property name="spacing">6</property>
|
|
||||||
<child>
|
|
||||||
<widget class="GtkCheckButton" id="session_properties_remember_toggle">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
<property name="label" translatable="yes">_Automatically remember running applications when logging out</property>
|
|
||||||
<property name="use_underline">True</property>
|
|
||||||
- <property name="response_id">0</property>
|
|
||||||
<property name="draw_indicator">True</property>
|
|
||||||
</widget>
|
|
||||||
<packing>
|
|
||||||
@@ -309,15 +302,13 @@
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
- <widget class="GtkHBox" id="hbox2">
|
|
||||||
+ <widget class="GtkHButtonBox" id="hbuttonbox1">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
- <property name="homogeneous">True</property>
|
|
||||||
<child>
|
|
||||||
<widget class="GtkButton" id="session_properties_save_button">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
<property name="receives_default">True</property>
|
|
||||||
- <property name="response_id">0</property>
|
|
||||||
<child>
|
|
||||||
<widget class="GtkHBox" id="hbox2">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
@@ -368,9 +359,9 @@
|
|
||||||
<property name="label" translatable="yes">Options</property>
|
|
||||||
</widget>
|
|
||||||
<packing>
|
|
||||||
- <property name="type">tab</property>
|
|
||||||
<property name="position">1</property>
|
|
||||||
<property name="tab_fill">False</property>
|
|
||||||
+ <property name="type">tab</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
</widget>
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
Index: gnome-session/gsm-xsmp-client.c
|
|
||||||
===================================================================
|
|
||||||
--- gnome-session/gsm-xsmp-client.c (revision 5088)
|
|
||||||
+++ gnome-session/gsm-xsmp-client.c (working copy)
|
|
||||||
@@ -78,25 +78,37 @@ client_iochannel_watch (GIOChannel *c
|
|
||||||
GIOCondition condition,
|
|
||||||
GsmXSMPClient *client)
|
|
||||||
{
|
|
||||||
+ gboolean keep_going;
|
|
||||||
|
|
||||||
+ g_object_ref (client);
|
|
||||||
switch (IceProcessMessages (client->priv->ice_connection, NULL, NULL)) {
|
|
||||||
case IceProcessMessagesSuccess:
|
|
||||||
- return TRUE;
|
|
||||||
+ keep_going = TRUE;
|
|
||||||
+ break;
|
|
||||||
|
|
||||||
case IceProcessMessagesIOError:
|
|
||||||
g_debug ("GsmXSMPClient: IceProcessMessagesIOError on '%s'", client->priv->description);
|
|
||||||
gsm_client_set_status (GSM_CLIENT (client), GSM_CLIENT_FAILED);
|
|
||||||
+ /* Emitting "disconnected" will eventually cause
|
|
||||||
+ * IceCloseConnection() to be called.
|
|
||||||
+ */
|
|
||||||
gsm_client_disconnected (GSM_CLIENT (client));
|
|
||||||
- return FALSE;
|
|
||||||
+ keep_going = FALSE;
|
|
||||||
+ break;
|
|
||||||
|
|
||||||
case IceProcessMessagesConnectionClosed:
|
|
||||||
g_debug ("GsmXSMPClient: IceProcessMessagesConnectionClosed on '%s'",
|
|
||||||
client->priv->description);
|
|
||||||
- return FALSE;
|
|
||||||
+ client->priv->ice_connection = NULL;
|
|
||||||
+ keep_going = FALSE;
|
|
||||||
+ break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
g_assert_not_reached ();
|
|
||||||
}
|
|
||||||
+ g_object_unref (client);
|
|
||||||
+
|
|
||||||
+ return keep_going;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Called if too much time passes between the initial connection and
|
|
||||||
@@ -621,7 +633,9 @@ gsm_xsmp_client_disconnect (GsmXSMPClien
|
|
||||||
|
|
||||||
if (client->priv->conn != NULL) {
|
|
||||||
SmsCleanUp (client->priv->conn);
|
|
||||||
- } else {
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (client->priv->ice_connection != NULL) {
|
|
||||||
IceCloseConnection (client->priv->ice_connection);
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up gnome-session-2.23.6/capplet/commands.c.icon-name gnome-session-2.23.6/capplet/commands.c
|
|
||||||
--- gnome-session-2.23.6/capplet/commands.c.icon-name 2008-08-07 00:03:55.000000000 -0400
|
|
||||||
+++ gnome-session-2.23.6/capplet/commands.c 2008-08-07 00:04:16.000000000 -0400
|
|
||||||
@@ -32,7 +32,7 @@
|
|
||||||
#include "gsm-util.h"
|
|
||||||
|
|
||||||
#define DESKTOP_ENTRY_GROUP "Desktop Entry"
|
|
||||||
-#define STARTUP_APP_ICON "gnome-run"
|
|
||||||
+#define STARTUP_APP_ICON "system-run"
|
|
||||||
|
|
||||||
#define REALLY_IDENTICAL_STRING(a, b) \
|
|
||||||
((a && b && !strcmp (a, b)) || (!a && !b))
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
diff -up gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c.inhibitor-leak gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c
|
|
||||||
--- gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c.inhibitor-leak 2008-09-14 19:48:46.000000000 -0400
|
|
||||||
+++ gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c 2008-09-14 19:47:48.000000000 -0400
|
|
||||||
@@ -496,6 +496,7 @@ add_inhibitor (GsmInhibitDialog *dialog,
|
|
||||||
|
|
||||||
/* FIXME: get info from xid */
|
|
||||||
|
|
||||||
+ desktop_file = NULL;
|
|
||||||
name = NULL;
|
|
||||||
pixbuf = NULL;
|
|
||||||
freeme = NULL;
|
|
||||||
@@ -602,6 +603,9 @@ add_inhibitor (GsmInhibitDialog *dialog,
|
|
||||||
if (pixbuf != NULL) {
|
|
||||||
g_object_unref (pixbuf);
|
|
||||||
}
|
|
||||||
+ if (desktop_file != NULL) {
|
|
||||||
+ egg_desktop_file_free (desktop_file);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
diff -up gnome-session-2.24.0/capplet/gsm-app-dialog.c.missing-translations gnome-session-2.24.0/capplet/gsm-app-dialog.c
|
|
||||||
--- gnome-session-2.24.0/capplet/gsm-app-dialog.c.missing-translations 2008-10-03 00:03:05.000000000 -0400
|
|
||||||
+++ gnome-session-2.24.0/capplet/gsm-app-dialog.c 2008-10-03 00:03:10.000000000 -0400
|
|
||||||
@@ -162,7 +162,7 @@ setup_dialog (GsmAppDialog *dialog)
|
|
||||||
|
|
||||||
xml = glade_xml_new (GLADEDIR "/" GLADE_XML_FILE,
|
|
||||||
"main-table",
|
|
||||||
- PACKAGE);
|
|
||||||
+ GETTEXT_PACKAGE);
|
|
||||||
g_assert (xml != NULL);
|
|
||||||
|
|
||||||
widget = glade_xml_get_widget (xml, "main-table");
|
|
||||||
diff -up gnome-session-2.24.0/capplet/gsm-properties-dialog.c.missing-translations gnome-session-2.24.0/capplet/gsm-properties-dialog.c
|
|
||||||
--- gnome-session-2.24.0/capplet/gsm-properties-dialog.c.missing-translations 2008-10-03 00:02:36.000000000 -0400
|
|
||||||
+++ gnome-session-2.24.0/capplet/gsm-properties-dialog.c 2008-10-03 00:02:50.000000000 -0400
|
|
||||||
@@ -1451,7 +1451,7 @@ gsm_properties_dialog_init (GsmPropertie
|
|
||||||
|
|
||||||
dialog->priv->xml = glade_xml_new (GLADEDIR "/" GLADE_XML_FILE,
|
|
||||||
"main-notebook",
|
|
||||||
- PACKAGE);
|
|
||||||
+ GETTEXT_PACKAGE);
|
|
||||||
g_assert (dialog->priv->xml != NULL);
|
|
||||||
|
|
||||||
widget = glade_xml_get_widget (dialog->priv->xml, "main-notebook");
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
diff -up gnome-session-2.23.92/gnome-session/gsm-xsmp-client.c.previous_id-leak.patch gnome-session-2.23.92/gnome-session/gsm-xsmp-client.c
|
|
||||||
--- gnome-session-2.23.92/gnome-session/gsm-xsmp-client.c.previous_id-leak.patch 2008-09-14 18:57:14.000000000 -0400
|
|
||||||
+++ gnome-session-2.23.92/gnome-session/gsm-xsmp-client.c 2008-09-14 18:57:30.000000000 -0400
|
|
||||||
@@ -857,13 +857,12 @@ register_client_callback (SmsConn con
|
|
||||||
g_debug ("GsmXSMPClient: Sending initial SaveYourself");
|
|
||||||
SmsSaveYourself (conn, SmSaveLocal, False, SmInteractStyleNone, False);
|
|
||||||
client->priv->current_save_yourself = SmSaveLocal;
|
|
||||||
-
|
|
||||||
- free (previous_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
gsm_client_set_status (GSM_CLIENT (client), GSM_CLIENT_REGISTERED);
|
|
||||||
|
|
||||||
g_free (id);
|
|
||||||
+ free (previous_id);
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
diff -up gnome-session-2.24.1/gnome-session/gsm-manager.c.registration gnome-session-2.24.1/gnome-session/gsm-manager.c
|
|
||||||
--- gnome-session-2.24.1/gnome-session/gsm-manager.c.registration 2008-11-10 13:54:08.000000000 -0500
|
|
||||||
+++ gnome-session-2.24.1/gnome-session/gsm-manager.c 2008-11-10 14:01:41.000000000 -0500
|
|
||||||
@@ -2436,13 +2436,10 @@ gsm_manager_register_client (GsmManager
|
|
||||||
|
|
||||||
g_debug ("GsmManager: Adding new client %s to session", new_startup_id);
|
|
||||||
|
|
||||||
- if (IS_STRING_EMPTY (startup_id) && IS_STRING_EMPTY (app_id)) {
|
|
||||||
- /* just accept the client - we can't associate with an
|
|
||||||
- existing App */
|
|
||||||
- app = NULL;
|
|
||||||
- } else if (IS_STRING_EMPTY (startup_id)) {
|
|
||||||
+ if (app == NULL && !IS_STRING_EMPTY (startup_id)) {
|
|
||||||
app = find_app_for_startup_id (manager, startup_id);
|
|
||||||
- } else if (IS_STRING_EMPTY (startup_id)) {
|
|
||||||
+ }
|
|
||||||
+ if (app == NULL && !IS_STRING_EMPTY (app_id)) {
|
|
||||||
/* try to associate this app id with a known app */
|
|
||||||
app = find_app_for_app_id (manager, app_id);
|
|
||||||
}
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
diff -up gnome-session-2.24.1/capplet/gsm-properties-dialog.c.resizable gnome-session-2.24.1/capplet/gsm-properties-dialog.c
|
|
||||||
--- gnome-session-2.24.1/capplet/gsm-properties-dialog.c.resizable 2008-10-26 15:14:18.000000000 -0400
|
|
||||||
+++ gnome-session-2.24.1/capplet/gsm-properties-dialog.c 2008-10-26 15:14:46.000000000 -0400
|
|
||||||
@@ -1463,10 +1463,6 @@ gsm_properties_dialog_init (GsmPropertie
|
|
||||||
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
|
|
||||||
gtk_window_set_icon_name (GTK_WINDOW (dialog), "session-properties");
|
|
||||||
gtk_window_set_title (GTK_WINDOW (dialog), _("Sessions Preferences"));
|
|
||||||
- g_object_set (dialog,
|
|
||||||
- "allow-shrink", FALSE,
|
|
||||||
- "allow-grow", FALSE,
|
|
||||||
- NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
2
sources
2
sources
@ -1 +1 @@
|
|||||||
5bf6f5753eab034638aee80d993801d2 gnome-session-2.24.1.tar.bz2
|
b0664665659f60d540764a9028f6dda6 gnome-session-2.25.2.tar.bz2
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
diff -up gnome-session-2.23.92/gnome-session/gsm-autostart-app.c.startup_id-leak gnome-session-2.23.92/gnome-session/gsm-autostart-app.c
|
|
||||||
--- gnome-session-2.23.92/gnome-session/gsm-autostart-app.c.startup_id-leak 2008-09-15 17:42:11.000000000 -0400
|
|
||||||
+++ gnome-session-2.23.92/gnome-session/gsm-autostart-app.c 2008-09-15 17:46:24.000000000 -0400
|
|
||||||
@@ -793,6 +793,7 @@ autostart_app_start_spawn (GsmAutostartA
|
|
||||||
g_debug ("GsmAutostartApp: starting %s: command=%s startup-id=%s", app->priv->desktop_id, command, startup_id);
|
|
||||||
g_free (command);
|
|
||||||
|
|
||||||
+ g_free (app->priv->startup_id);
|
|
||||||
local_error = NULL;
|
|
||||||
success = egg_desktop_file_launch (app->priv->desktop_file,
|
|
||||||
NULL,
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
diff -up gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c.xml-leak gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c
|
|
||||||
--- gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c.xml-leak 2008-09-18 01:39:26.000000000 -0400
|
|
||||||
+++ gnome-session-2.23.92/gnome-session/gsm-inhibit-dialog.c 2008-09-18 01:38:56.000000000 -0400
|
|
||||||
@@ -1001,6 +1001,11 @@ gsm_inhibit_dialog_dispose (GObject *obj
|
|
||||||
dialog->priv->inhibitors = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (dialog->priv->xml != NULL) {
|
|
||||||
+ g_object_unref (dialog->priv->xml);
|
|
||||||
+ dialog->priv->xml = NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
G_OBJECT_CLASS (gsm_inhibit_dialog_parent_class)->dispose (object);
|
|
||||||
}
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user