[Pkg-xfce-commits] r4256 - in desktop/branches/experimental/xfce4-session/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-09-05 13:52:40 +0000 (Sun, 05 Sep 2010)
New Revision: 4256

Modified:
   desktop/branches/experimental/xfce4-session/debian/changelog
   desktop/branches/experimental/xfce4-session/debian/patches/02_fix-fortune-path.patch
   desktop/branches/experimental/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch
Log:
* New upstream development release.
* debian/patches:
  - 02_fix-fortune-path refreshed.
  - 04_gk-dont-check-running-use-start refreshed. 

Modified: desktop/branches/experimental/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/changelog	2010-09-05 13:41:10 UTC (rev 4255)
+++ desktop/branches/experimental/xfce4-session/debian/changelog	2010-09-05 13:52:40 UTC (rev 4256)
@@ -1,3 +1,12 @@
+xfce4-session (4.7.0-1) UNRELEASED; urgency=low
+
+  * New upstream development release.
+  * debian/patches:
+    - 02_fix-fortune-path refreshed.
+    - 04_gk-dont-check-running-use-start refreshed. 
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 15:44:09 +0200
+
 xfce4-session (4.6.2-2) unstable; urgency=low
 
   * debian/patches:

Modified: desktop/branches/experimental/xfce4-session/debian/patches/02_fix-fortune-path.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/02_fix-fortune-path.patch	2010-09-05 13:41:10 UTC (rev 4255)
+++ desktop/branches/experimental/xfce4-session/debian/patches/02_fix-fortune-path.patch	2010-09-05 13:52:40 UTC (rev 4256)
@@ -1,18 +1,13 @@
 diff --git a/xfce4-tips/main.c b/xfce4-tips/main.c
-index 0961879..4f88935 100644
+index 355d6bd..c22fbd7 100644
 --- a/xfce4-tips/main.c
 +++ b/xfce4-tips/main.c
-@@ -115,11 +115,11 @@ next_cb(GtkWidget *btn, GtkTextBuffer *textbuf)
+@@ -274,7 +274,7 @@ main (int argc, char **argv)
+   channel = xfconf_channel_get ("xfce4-tips");
  
-   switch (option) {
-   case OPTION_TIPS:
--    strcpy(buffer, "fortune " TIPSDIR "/tips");
-+    strcpy(buffer, "/usr/games/fortune " TIPSDIR "/tips");
-     break;
+   /* test for fortune */
+-  fortune_cmd = g_find_program_in_path ("fortune");
++  fortune_cmd = g_find_program_in_path ("/usr/games/fortune");
  
-   case OPTION_FORTUNES:
--    strcpy(buffer, "fortune");
-+    strcpy(buffer, "/usr/games/fortune");
-     break;
-   }
+   read_tips_from_file ();
  

Modified: desktop/branches/experimental/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch	2010-09-05 13:41:10 UTC (rev 4255)
+++ desktop/branches/experimental/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch	2010-09-05 13:52:40 UTC (rev 4256)
@@ -1,8 +1,8 @@
-Index: xfce4-session-4.6.2/xfce4-session/xfsm-compat-gnome.c
-===================================================================
---- xfce4-session-4.6.2.orig/xfce4-session/xfsm-compat-gnome.c	2010-05-31 14:36:01.988123134 +0200
-+++ xfce4-session-4.6.2/xfce4-session/xfsm-compat-gnome.c	2010-05-31 14:37:08.787058601 +0200
-@@ -100,34 +100,23 @@
+diff --git a/xfce4-session/xfsm-compat-gnome.c b/xfce4-session/xfsm-compat-gnome.c
+index b088c6f..cee64ed 100644
+--- a/xfce4-session/xfsm-compat-gnome.c
++++ b/xfce4-session/xfsm-compat-gnome.c
+@@ -104,27 +104,15 @@ child_setup (gpointer user_data)
  static void
  gnome_keyring_daemon_startup (void)
  {
@@ -31,7 +31,8 @@
 +  char *argv[3];
  
    /* Pipe to slave keyring lifetime to */
-   pipe (keyring_lifetime_pipe);
+   if (pipe (keyring_lifetime_pipe))
+@@ -135,7 +123,8 @@ gnome_keyring_daemon_startup (void)
  
    error = NULL;
    argv[0] = GNOME_KEYRING_DAEMON;
@@ -41,13 +42,12 @@
    g_spawn_sync (NULL, argv, NULL,
                  G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
                  child_setup, NULL,
-@@ -147,20 +136,22 @@
+@@ -155,20 +144,22 @@ gnome_keyring_daemon_startup (void)
      {
        if (WIFEXITED (status) && WEXITSTATUS (status) == 0 && sout != NULL)
          {
 -          lines = g_strsplit (sout, "\n", 3);
-+          lines = g_strsplit (sout, "\n", 0);
- 
+-
 -          if (lines[0] != NULL && lines[1] != NULL
 -              && g_str_has_prefix (lines[1], "GNOME_KEYRING_PID="))
 -          {
@@ -60,6 +60,8 @@
 -                xfce_putenv (lines[0]);
 -              }
 -          }
++          lines = g_strsplit (sout, "\n", 0);
++
 +          for (lineno = 0; lines[lineno] != NULL; lineno++)
 +            {
 +              xfce_putenv (lines[lineno]);