rpms/gnome-session
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Snapshot from DBus branch

Browse Source
This commit is contained in:
William Jon McCann 2008-07-21 19:59:27 +00:00
parent 6834a752bf
commit 32261dcaab
8 changed files with 22 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
gnome-session-2.23.4.1.tar.bz2
gnome-session-2.23.5.tar.bz2

18
gnome-session-2.13.4-no-crashes.patch
View File

@ -1,18 +0,0 @@
--- gnome-session-2.13.4/gnome-session/main.c.no-crashes 2006-01-16 09:59:23.000000000 -0500
+++ gnome-session-2.13.4/gnome-session/main.c 2006-01-16 09:59:41.000000000 -0500
@@ -344,6 +344,7 @@
if (getenv ("GSM_VERBOSE_DEBUG"))
gsm_set_verbose (TRUE);
+#if 0
/* Help eradicate the critical warnings in unstable releases of GNOME */
versions = g_strsplit (VERSION, ".", 3);
if (versions && versions [0] && versions [1])
@@ -357,6 +358,7 @@
}
}
g_strfreev (versions);
+#endif
set_lang();
set_gtk1_theme_rcfile ();

121
gnome-session-2.17.91-use-gdm-at-hints-3.patch
View File

@ -1,121 +0,0 @@
--- gnome-session/main.c.gdm-hints 2007-04-12 14:31:38.000000000 -0400
+++ gnome-session/main.c 2007-04-12 14:38:56.000000000 -0400
@@ -388,6 +388,12 @@
gconf_client = gsm_get_conf_client ();
gconf_client_add_dir (gconf_client, GSM_GCONF_CONFIG_PREFIX, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
a_t_support = gconf_client_get_bool (gconf_client, ACCESSIBILITY_KEY, NULL);
+ if (g_getenv ("GDM_ATS") != NULL && !a_t_support)
+ {
+ a_t_support = TRUE;
+ gconf_client_set_bool (gconf_client, ACCESSIBILITY_KEY, TRUE, NULL);
+ }
+
if (a_t_support)
{
@@ -436,6 +442,11 @@
autosave = gconf_client_get_bool (gconf_client, AUTOSAVE_MODE_KEY, NULL);
logout_prompt = gconf_client_get_bool (gconf_client, LOGOUT_PROMPT_KEY, NULL);
a_t_support = gconf_client_get_bool (gconf_client, ACCESSIBILITY_KEY, NULL);
+ if (g_getenv ("GDM_ATS") != NULL)
+ {
+ a_t_support = TRUE;
+ }
+
gconf_client_notify_add (gconf_client,
AUTOSAVE_MODE_KEY,
--- gnome-session/gsm-at-startup.c.gdm-hints 2007-04-12 14:31:38.000000000 -0400
+++ gnome-session/gsm-at-startup.c 2007-04-12 14:31:38.000000000 -0400
@@ -17,16 +17,24 @@
static void
gsm_assistive_tech_exec (gchar *exec_string)
{
- gchar *s;
gboolean success;
-
+ char **v;
+
success = FALSE;
- s = g_find_program_in_path (exec_string);
- if (s) {
- success = gsm_exec_command_line_async (exec_string, NULL);
- g_free (s);
+ v = g_strsplit (exec_string, " ", 0);
+ if (v[0] != NULL) {
+ gchar *s;
+ fprintf (stderr, "v[0]='%s'\n", v[0]);
+ s = g_find_program_in_path (v[0]);
+ fprintf (stderr, "s='%s'\n", s);
+ if (s) {
+ success = gsm_exec_command_line_async (exec_string, NULL);
+ fprintf (stderr, "bar %d '%s'\n", success, exec_string);
+ g_free (s);
+ }
}
+ g_strfreev (v);
if (!success && !strcmp (exec_string, "gnopernicus")) {
/* backwards compatibility for 2.14 */
@@ -34,6 +42,33 @@
}
}
+static void
+gsm_assistive_tech_exec_type (gchar *at_type)
+{
+ gchar *at;
+
+ at = NULL;
+
+ fprintf (stderr, "at_type='%s'\n", at_type);
+
+ /* TODO: should
+ *
+ * 1. read from preferred applications in gconf
+ * 2. make sure that AT's execed don't overlap with users choice
+ */
+ if (strcmp (at_type, "screenreader") == 0) {
+ at = "orca";
+ } else if (strcmp (at_type, "magnifier") == 0) {
+ at = "orca -n -d main-window -d speech -e magnifier";
+ } else if (strcmp (at_type, "onscreenkeyboard") == 0) {
+ at = "gok";
+ }
+
+ if (at != NULL) {
+ gsm_assistive_tech_exec (at);
+ }
+}
+
static GdkFilterReturn
gsm_assistive_filter_watch (GdkXEvent *xevent, GdkEvent *event, gpointer data){
XEvent *xev = (XEvent *)xevent;
@@ -103,6 +138,7 @@
GError *error = NULL;
GConfClient *client;
GSList *list;
+ const char *at_suggested_by_gdm;
client = gsm_get_conf_client ();
list = gconf_client_get_list (client, AT_STARTUP_KEY, GCONF_VALUE_STRING, &error);
@@ -122,6 +158,18 @@
}
g_slist_free (list);
}
+
+ /* start AT's if user have started them from gdm */
+ if ((at_suggested_by_gdm = g_getenv ("GDM_ATS")) != NULL) {
+ int i;
+ char **at_list;
+ at_list = g_strsplit (at_suggested_by_gdm, " ", 0);
+ for (i = 0; at_list[i] != NULL; i++) {
+ gsm_assistive_tech_exec_type (at_list[i]);
+ }
+ g_strfreev (at_list);
+ }
+
}
void

15
gnome-session-2.2.2-icons.patch
View File

@ -1,15 +0,0 @@
--- gnome-session-2.5.90/splash/splash-widget.c.icons 2004-02-24 14:13:22.000000000 +0000
+++ gnome-session-2.5.90/splash/splash-widget.c 2004-02-24 14:14:24.000000000 +0000
@@ -46,7 +46,11 @@
{ N_("The Panel"), "gnome-panel", "gnome-panel" },
{ N_("Session Manager Proxy"), "gnome-smproxy", "gnome-session" },
{ N_("Nautilus"), "nautilus", "gnome-fs-desktop" },
- { N_("Desktop Settings"), "gnome-settings-daemon", "gnome-settings" }
+ { N_("Desktop Settings"), "gnome-settings-daemon", "gnome-settings" },
+ { N_("Authentication Icon"), "pam-panel-icon", "keyring.png" },
+ { N_("CD Device Handler"), "magicdev", "gnome-dev-cdrom.png" },
+ { N_("Red Hat Network Monitor"), "rhn-applet-gui", "up2date.png" },
+ { N_("Print Monitor"), "eggcups", "printer.png" }
};
static const SplashApp *

24
gnome-session-nautilus.patch
View File

@ -1,15 +1,15 @@
diff -up gnome-session-2.23.2.2/gnome-session/session.c.nautilus gnome-session-2.23.2.2/gnome-session/session.c
--- gnome-session-2.23.2.2/gnome-session/session.c.nautilus 2008-05-16 20:22:01.000000000 -0400
+++ gnome-session-2.23.2.2/gnome-session/session.c 2008-05-16 20:22:51.000000000 -0400
@@ -199,7 +199,10 @@ append_default_apps (GsmSession *session
if (!a->data)
continue;
--- gnome-session-2.23.5/gnome-session/gsm-manager.c.orig 2008-07-21 15:50:16.000000000 -0400
+++ gnome-session-2.23.5/gnome-session/gsm-manager.c 2008-07-21 15:51:18.000000000 -0400
@@ -1612,7 +1612,11 @@
continue;
}
- desktop_file = g_strdup_printf ("%s.desktop", (char *) a->data);
+ if (strcmp (a->data, "nautilus") == 0)
+ desktop_file = g_strdup ("gnome-nautilus.desktop");
+ else
+ desktop_file = g_strdup_printf ("%s.desktop", (char *) a->data);
- desktop_file = g_strdup_printf ("%s.desktop", (char *) a->data);
+ if (strcmp (a->data, "nautilus") == 0) {
+ desktop_file = g_strdup ("gnome-nautilus.desktop");
+ } else {
+ desktop_file = g_strdup_printf ("%s.desktop", (char *) a->data);
+ }
g_debug ("Look for: %s", desktop_file);
g_debug ("GsmManager: Looking for: %s", desktop_file);

36
gnome-session.spec
View File

@ -11,8 +11,8 @@
Summary: GNOME session manager
Name: gnome-session
Version: 2.23.4.1
Release: 4%{?dist}
Version: 2.23.5
Release: 0.2008.07.21.1%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
Source1: redhat-default-session
@ -33,12 +33,6 @@ Requires: dbus-x11
## we conflict with gdm that contains the GNOME gdm xsession
Conflicts: gdm < 1:2.6.0.8-5
# FIXME does this still apply ?
#Patch1: gnome-session-2.2.2-icons.patch
# FIXME does this still apply ?
#Patch9: gnome-session-2.13.4-no-crashes.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=350848
# The gconf bits weren't accepted upstream, so we'll
# need to figure something out here
@ -47,21 +41,9 @@ Patch13: gnome-session-2.17.5-window-manager.patch
# FIXME does this still apply ?
#Patch20: gnome-session-2.19.4-atspi-timeout.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=411506
#Patch21: gnome-session-2.17.91-use-gdm-at-hints-3.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=475468
Patch22: ice-leaks.patch
# Work around the assumption that the nautilus desktop file is nautilus.desktop
Patch34: gnome-session-nautilus.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=542086
Patch47: escape-comment.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=542256
Patch49: icon-names.patch
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: dbus-devel >= %{dbus_version}
@ -98,15 +80,9 @@ GNOME components and handles logout and saving the session.
%prep
%setup -q
#%patch1 -p1 -b .icons
#%patch9 -p1 -b .no-crashes
%patch13 -p1 -b .window-manager
#%patch20 -p1 -b .timeout
#%patch21 -p0 -b .use-gdm-hints
#%patch22 -p1 -b .ice-leaks
%patch34 -p1 -b .nautilus
%patch47 -p1 -b .escape-comment
%patch49 -p1 -b .icon-names
%build
@ -121,7 +97,7 @@ intltoolize --force
autoheader
autoconf
%configure --with-halt-command=/usr/bin/poweroff --with-reboot-command=/usr/bin/reboot
%configure
make %{?_smp_mflags}
%install
@ -170,7 +146,7 @@ if [ "$1" -eq 0 ]; then
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-session.schemas >& /dev/null || :
fi
%postun
%postun
/sbin/ldconfig
%files -f %{po_package}.lang
@ -181,6 +157,7 @@ fi
%{_datadir}/xsessions/*
%dir %{_datadir}/gnome-session
%{_datadir}/gnome-session/session-properties.glade
%{_datadir}/gnome-session/gsm-inhibit-dialog.glade
%{_bindir}/*
%{_sysconfdir}/gconf/schemas/*.schemas
%{_datadir}/icons/hicolor/*/apps/session-properties.png
@ -192,6 +169,9 @@ fi
%changelog
* Mon Jul 21 2008 Jon McCann <jmccann@redhat.com> - 2.23.5.0.2008.07.21.1
- Snapshot from DBus branch
* Wed Jul 9 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.4.1-4
- Fix a typo in the previous patch

17
ice-leaks.patch
View File

@ -1,17 +0,0 @@
diff -up gnome-session-2.19.92/gnome-session/ice.c.ice-leaks gnome-session-2.19.92/gnome-session/ice.c
--- gnome-session-2.19.92/gnome-session/ice.c.ice-leaks 2007-09-11 01:56:57.000000000 -0400
+++ gnome-session-2.19.92/gnome-session/ice.c 2007-09-11 01:57:49.000000000 -0400
@@ -455,10 +455,13 @@ clean_ice (void)
/* During shutdown we don't want to report errors via a dialog. */
write_authfile (authfile, entries, FALSE);
+ g_slist_foreach (entries, (GFunc)IceFreeAuthFileEntry, NULL);
g_slist_free (entries);
g_free (input_id);
IceFreeListenObjs (num_sockets, sockets);
+
+ g_slist_foreach (auth_entries, (GFunc)IceFreeAuthFileEntry, NULL);
g_slist_free (auth_entries);
ice_depth = ~0; /* We are very frozen, like totally off */

2
sources
View File

@ -1 +1 @@
2c3e3224bae4f635b122e96b8cc71687 gnome-session-2.23.4.1.tar.bz2
582d331f0427f01ec876a27702cecf17 gnome-session-2.23.5.tar.bz2