[Pkg-xfce-commits] r3318 - in desktop/trunk/xfce4-settings/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue Jun 16 08:03:33 UTC 2009
Author: corsac
Date: 2009-06-16 20:03:33 +0000 (Tue, 16 Jun 2009)
New Revision: 3318
Added:
desktop/trunk/xfce4-settings/debian/patches/
desktop/trunk/xfce4-settings/debian/patches/01_fix-timeout-startup.patch
desktop/trunk/xfce4-settings/debian/patches/02_fix-keyrepeat-typo.patch
desktop/trunk/xfce4-settings/debian/patches/10_pc.patch
desktop/trunk/xfce4-settings/debian/patches/series
Modified:
desktop/trunk/xfce4-settings/debian/changelog
desktop/trunk/xfce4-settings/debian/control
desktop/trunk/xfce4-settings/debian/rules
Log:
* debian/patches:
- 01_fix-timeout-startup: avoid timeouting at startup. (Xfce Bug #5040,
Xfce Svn r29991)
- 02_fix-keyrepeat-typo: fix typo in KeyRepeart property name so the
settings is correctly applied. Thanks Sven Marnach! closes: #527238
Modified: desktop/trunk/xfce4-settings/debian/changelog
===================================================================
--- desktop/trunk/xfce4-settings/debian/changelog 2009-06-16 08:08:47 UTC (rev 3317)
+++ desktop/trunk/xfce4-settings/debian/changelog 2009-06-16 20:03:33 UTC (rev 3318)
@@ -1,3 +1,13 @@
+xfce4-settings (4.6.1-2) UNRELEASED; urgency=low
+
+ * debian/patches:
+ - 01_fix-timeout-startup: avoid timeouting at startup. (Xfce Bug #5040,
+ Xfce Svn r29991)
+ - 02_fix-keyrepeat-typo: fix typo in KeyRepeart property name so the
+ settings is correctly applied. Thanks Sven Marnach! closes: #527238
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 16 Jun 2009 21:27:41 +0200
+
xfce4-settings (4.6.1-1) unstable; urgency=low
* New upstream release.
Modified: desktop/trunk/xfce4-settings/debian/control
===================================================================
--- desktop/trunk/xfce4-settings/debian/control 2009-06-16 08:08:47 UTC (rev 3317)
+++ desktop/trunk/xfce4-settings/debian/control 2009-06-16 20:03:33 UTC (rev 3318)
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 7.0.50), libxfce4util-dev (>= 4.6.0),
libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libglade2-dev,
libxfconf-0-dev, libwnck-dev, libxklavier12-dev, libnotify-dev,
- intltool (>= 0.31)
+ intltool (>= 0.31), quilt
Standards-Version: 3.8.1
Homepage: http://www.xfce.org
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfconf
Added: desktop/trunk/xfce4-settings/debian/patches/01_fix-timeout-startup.patch
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/01_fix-timeout-startup.patch (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/01_fix-timeout-startup.patch 2009-06-16 20:03:33 UTC (rev 3318)
@@ -0,0 +1,213 @@
+commit fa550da4a52172b4074922a2962c44613e96e3f0
+Author: kelnos <kelnos at a0aa69c2-05f4-0310-b83c-d5d913b14636>
+Date: Thu Jun 4 09:19:51 2009 +0000
+
+ avoid timing out xfce4-session on startup (bug 5040)
+
+ xfce4-settings-helper was trying to be clever to migrate itself from
+ autostart to the actual session. it was doing a poor job. this should
+ keep the cleverness, but make sure it always connects to the session
+ manager and makes sure the SM can continue. it also allows the copy of
+ x-s-h that was started via the session (and not autostart) to force
+ itself to start, even if it's already running. the other instance will
+ lose its hold on the selection, notice, and quit.
+
+ git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-settings/trunk@29991 a0aa69c2-05f4-0310-b83c-d5d913b14636
+
+diff --git a/xfce4-settings-helper/main.c b/xfce4-settings-helper/main.c
+index c0e7712..1553c58 100644
+--- a/xfce4-settings-helper/main.c
++++ b/xfce4-settings-helper/main.c
+@@ -60,7 +60,14 @@
+ #include "displays.h"
+ #endif
+
++#define SELECTION_NAME "_XFCE_SETTINGS_HELPER"
+
++static GdkFilterReturn xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
++ GdkEvent *evt,
++ gpointer user_data);
++
++
++static SessionClient *sm_client = NULL;
+
+ static gboolean opt_version = FALSE;
+ static gboolean opt_debug = FALSE;
+@@ -124,15 +131,14 @@ xfce_settings_helper_set_autostart_enabled (gboolean enabled)
+ }
+
+
+-/* returns TRUE if we're now connected to the SM, FALSE otherwise */
++/* returns TRUE if we got started by the SM and our client ID was
++ * valid, FALSE otherwise */
+ static gboolean
+ xfce_settings_helper_connect_session (int argc,
+ char **argv,
+ const gchar *sm_client_id,
+ gboolean debug_mode)
+ {
+- SessionClient *sm_client;
+-
+ /* we can't be sure that the SM will save the session later, so we only
+ * disable the autostart item if we're launching because we got *resumed*
+ * from a previous session. */
+@@ -148,69 +154,96 @@ xfce_settings_helper_connect_session (int argc,
+ {
+ g_warning ("Failed to connect to session manager");
+ client_session_free (sm_client);
+- xfce_settings_helper_set_autostart_enabled (TRUE);
++ sm_client = NULL;
+ return FALSE;
+ }
+
+ if (sm_client_id && !g_ascii_strcasecmp (sm_client_id, sm_client->given_client_id))
+ {
+ /* we passed a client id, and got the same one back, which means
+- * we were definitely restarted as a part of the session. so
+- * it's safe to disable the autostart item. */
+- xfce_settings_helper_set_autostart_enabled (FALSE);
++ * we were definitely restarted as a part of the session. */
+ return TRUE;
+ }
+
+- /* otherwise, let's just ensure the autostart item is enabled. */
+- xfce_settings_helper_set_autostart_enabled (TRUE);
+-
+- return TRUE;
++ return FALSE;
+ }
+
+
++#ifdef GDK_WINDOWING_X11
++static GdkFilterReturn
++xfce_settings_helper_selection_watcher (GdkXEvent *xevt,
++ GdkEvent *evt,
++ gpointer user_data)
++{
++ Window xwin = GPOINTER_TO_UINT(user_data);
++ XEvent *xe = (XEvent *)xevt;
++
++ if (xe->type == SelectionClear && xe->xclient.window == xwin)
++ {
++ if (sm_client)
++ client_session_set_restart_style (sm_client, SESSION_RESTART_IF_RUNNING);
++ signal_handler (SIGINT, NULL);
++ }
++
++ return GDK_FILTER_CONTINUE;
++}
++#endif
++
+ static gboolean
+-xfce_settings_helper_acquire_selection ()
++xfce_settings_helper_acquire_selection (gboolean force)
+ {
+ #ifdef GDK_WINDOWING_X11
+ GdkDisplay *gdpy = gdk_display_get_default ();
++ GtkWidget *invisible;
+ Display *dpy = GDK_DISPLAY_XDISPLAY (gdpy);
+ GdkWindow *rootwin = gdk_screen_get_root_window (gdk_display_get_screen (gdpy, 0));
+ Window xroot = GDK_WINDOW_XID (rootwin);
+- Window xwin;
+- Atom selection_atom, manager_atom;
++ GdkAtom selection_atom;
++ Atom selection_atom_x11;
+ XClientMessageEvent xev;
+
+- xwin = XCreateSimpleWindow (dpy, xroot, -100, -100, 1, 1, 0, 0,
+- XBlackPixel (GDK_DISPLAY (), 0));
+- XSelectInput (dpy, xwin, PropertyChangeMask | StructureNotifyMask);
++ selection_atom = gdk_atom_intern (SELECTION_NAME, FALSE);
++ selection_atom_x11 = gdk_x11_atom_to_xatom_for_display (gdpy, selection_atom);
++
++ /* can't use gdk for the selection owner here because it returns NULL
++ * if the selection owner is in another process */
++ if (!force && XGetSelectionOwner (dpy, selection_atom_x11) != None)
++ return FALSE;
+
+- selection_atom = XInternAtom (dpy, "_XFCE_SETTINGS_HELPER", False);
+- manager_atom = XInternAtom (dpy, "MANAGER", False);
++ invisible = gtk_invisible_new ();
++ gtk_widget_realize (invisible);
++ gtk_widget_add_events (invisible, GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK);
+
+- if (XGetSelectionOwner (dpy, selection_atom) != None)
++ if (!gdk_selection_owner_set_for_display (gdpy, invisible->window,
++ selection_atom, GDK_CURRENT_TIME,
++ TRUE))
+ {
+- XDestroyWindow (dpy, xwin);
++ g_critical ("Unable to get selection " SELECTION_NAME);
++ gtk_widget_destroy (invisible);
+ return FALSE;
+ }
+
+- XSetSelectionOwner (dpy, selection_atom, xwin, CurrentTime);
+-
+- if (XGetSelectionOwner (dpy, selection_atom) != xwin)
++ /* but we can use gdk here since we only care if it's our window */
++ if (gdk_selection_owner_get_for_display (gdpy, selection_atom) != invisible->window)
+ {
+- XDestroyWindow (dpy, xwin);
++ gtk_widget_destroy (invisible);
+ return FALSE;
+ }
+
+ xev.type = ClientMessage;
+ xev.window = xroot;
+- xev.message_type = manager_atom;
++ xev.message_type = gdk_x11_get_xatom_by_name_for_display (gdpy, "MANAGER");
+ xev.format = 32;
+ xev.data.l[0] = CurrentTime;
+- xev.data.l[1] = selection_atom;
+- xev.data.l[2] = xwin;
++ xev.data.l[1] = selection_atom_x11;
++ xev.data.l[2] = GDK_WINDOW_XID (invisible->window);
+ xev.data.l[3] = xev.data.l[4] = 0;
+
+ XSendEvent (dpy, xroot, False, StructureNotifyMask, (XEvent *)&xev);
++
++ gdk_window_add_filter (invisible->window,
++ xfce_settings_helper_selection_watcher,
++ GUINT_TO_POINTER (GDK_WINDOW_XID (invisible->window)));
+ #endif
+
+ return TRUE;
+@@ -221,6 +254,7 @@ gint
+ main (gint argc, gchar **argv)
+ {
+ GError *error = NULL;
++ gboolean in_session;
+ GObject *pointer_helper;
+ GObject *keyboards_helper;
+ GObject *accessibility_helper;
+@@ -284,12 +318,19 @@ main (gint argc, gchar **argv)
+ return EXIT_FAILURE;
+ }
+
+- if (!xfce_settings_helper_acquire_selection ())
++ /* connect to session always, even if we quit below. this way the
++ * session manager won't wait for us to time out. */
++ in_session = xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id, opt_debug);
++
++ if (!xfce_settings_helper_acquire_selection (in_session))
+ {
+ g_printerr ("%s is already running\n", G_LOG_DOMAIN);
+ return EXIT_FAILURE;
+ }
+
++ /* if we were restarted as part of the session, remove us from autostart */
++ xfce_settings_helper_set_autostart_enabled (!in_session);
++
+ /* daemonize the process when not running in debug mode */
+ if (!opt_debug)
+ {
+@@ -308,8 +349,6 @@ main (gint argc, gchar **argv)
+ }
+ }
+
+- xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id, opt_debug);
+-
+ /* create the sub daemons */
+ pointer_helper = g_object_new (XFCE_TYPE_POINTERS_HELPER, NULL);
+ keyboards_helper = g_object_new (XFCE_TYPE_KEYBOARDS_HELPER, NULL);
Added: desktop/trunk/xfce4-settings/debian/patches/02_fix-keyrepeat-typo.patch
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/02_fix-keyrepeat-typo.patch (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/02_fix-keyrepeat-typo.patch 2009-06-16 20:03:33 UTC (rev 3318)
@@ -0,0 +1,13 @@
+diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+index d372ee9..d1cb69c 100644
+--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
++++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+@@ -322,7 +322,7 @@ xfce_keyboard_settings_constructed (GObject *object)
+ xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/KeyRepeat/Rate", G_TYPE_INT, G_OBJECT (xkb_key_repeat_rate_scale), "value");
+
+ xkb_key_repeat_delay_scale = gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (settings->priv->glade_xml, "xkb_key_repeat_delay_scale")));
+- xfconf_g_property_bind (settings->priv->keyboards_channel, "/DefaultKeyRepeat/Delay", G_TYPE_INT, G_OBJECT (xkb_key_repeat_delay_scale), "value");
++ xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/KeyRepeat/Delay", G_TYPE_INT, G_OBJECT (xkb_key_repeat_delay_scale), "value");
+
+ /* XSETTINGS */
+ net_cursor_blink_check = glade_xml_get_widget (settings->priv->glade_xml, "net_cursor_blink_check");
Added: desktop/trunk/xfce4-settings/debian/patches/10_pc.patch
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/10_pc.patch (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/10_pc.patch 2009-06-16 20:03:33 UTC (rev 3318)
@@ -0,0 +1,8 @@
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+new file mode 100644
+index 0000000..7d4b0ca
+--- /dev/null
++++ b/po/POTFILES.skip
+@@ -0,0 +1,2 @@
++.pc/01_fix-timeout-startup.patch/xfce4-settings-helper/main.c
++.pc/02_fix-keyrepeat-typo.patch/dialogs/keyboard-settings/xfce-keyboard-settings.c
Added: desktop/trunk/xfce4-settings/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/series (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/series 2009-06-16 20:03:33 UTC (rev 3318)
@@ -0,0 +1,3 @@
+01_fix-timeout-startup.patch
+02_fix-keyrepeat-typo.patch
+10_pc.patch
Modified: desktop/trunk/xfce4-settings/debian/rules
===================================================================
--- desktop/trunk/xfce4-settings/debian/rules 2009-06-16 08:08:47 UTC (rev 3317)
+++ desktop/trunk/xfce4-settings/debian/rules 2009-06-16 20:03:33 UTC (rev 3318)
@@ -9,4 +9,4 @@
dh_installman debian/*.1
%:
- dh $@
+ dh --with quilt $@
More information about the Pkg-xfce-commits
mailing list