r35786 - /desktop/unstable/gnome-session/debian/patches/04_fallback_warning_notify.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Sep 23 09:23:06 2012
New Revision: 35786

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35786
Log:
Update patch again.

Modified:
    desktop/unstable/gnome-session/debian/patches/04_fallback_warning_notify.patch

Modified: desktop/unstable/gnome-session/debian/patches/04_fallback_warning_notify.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/04_fallback_warning_notify.patch?rev=35786&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/04_fallback_warning_notify.patch [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/04_fallback_warning_notify.patch [utf-8] Sun Sep 23 09:23:06 2012
@@ -1,14 +1,14 @@
-From 64175236ff7b2b3a31d836c8804afe3b203ef319 Mon Sep 17 00:00:00 2001
+From 2ee08ec8374d4bfacc14118c34a1bd3392d5fbf2 Mon Sep 17 00:00:00 2001
 From: Josselin Mouette <joss at debian.org>
-Date: Sun, 23 Sep 2012 09:41:10 +0200
+Date: Sun, 23 Sep 2012 11:11:03 +0200
 Subject: [PATCH] Display fallback warning using libnotify
 
 This avoids annoying users, especially those using live systems, with a
 dialog they have to click on.
 ---
  configure.ac                |    2 ++
- gnome-session/gsm-manager.c |   62 +++++++++++++++++++------------------------
- 2 files changed, 30 insertions(+), 34 deletions(-)
+ gnome-session/gsm-manager.c |   61 +++++++++++++++++++------------------------
+ 2 files changed, 29 insertions(+), 34 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index b75f269..60a7461 100644
@@ -31,7 +31,7 @@
  
  PKG_CHECK_MODULES(SESSION_PROPERTIES,
 diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
-index 9f7cff5..c85b6b1 100644
+index 9f7cff5..5aebc08 100644
 --- a/gnome-session/gsm-manager.c
 +++ b/gnome-session/gsm-manager.c
 @@ -40,6 +40,8 @@
@@ -43,7 +43,7 @@
  #include "gsm-manager.h"
  #include "gsm-manager-glue.h"
  
-@@ -1341,46 +1343,38 @@ end_session_or_show_shell_dialog (GsmManager *manager)
+@@ -1341,46 +1343,37 @@ end_session_or_show_shell_dialog (GsmManager *manager)
  }
  
  static void
@@ -53,7 +53,6 @@
 +{
 +        char *uri = data;
 +        gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL);
-+        g_free (uri);
 +}
 +
 +static gboolean
@@ -110,7 +109,7 @@
 +        notify_init ("GNOME");
 +        notif = notify_notification_new (title, description, GSM_ICON_COMPUTER_FAIL);
 +        notify_notification_set_timeout (notif, 15*1000);
-+        notify_notification_add_action (notif, "link-click", link_text, NOTIFY_ACTION_CALLBACK (on_link_clicked), g_strdup (uri), NULL);
++        notify_notification_add_action (notif, "link-click", link_text, NOTIFY_ACTION_CALLBACK (on_link_clicked), g_strdup (uri), g_free);
 +        /* Give the notification daemon a chance to finish initialization */
 +        g_timeout_add_seconds (2, (GSourceFunc) notification_show_timeout, (gpointer) notif);
  }