← Back to branch summary

~ubuntu-branches/ubuntu/lucid/libnotify/lucid-updates

« back to all changes in this revision

Viewing changes to debian/patches/04_no_error_messages.patch

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould, Ted Gould, Guillaume Mazoyer
  • Date: 2010-07-07 11:57:03 UTC
  • Revision ID: james.westby@ubuntu.com-20100707115703-01h1fjwa5t81601z
Tags: 0.4.5-1ubuntu4
https://launchpad.net/bugs/537208
https://launchpad.net/bugs/570462
[ Ted Gould ]
* debian/patches/04_no_error_msg.patch: Remove reporting
  of proxy_call error messages as they don't always exist and
  have been removed upstream in 0.5.0.  (LP: #537208)

[ Guillaume Mazoyer ]
* debian/patches/04_assertion-on-exit.patch: Fix an assertion when a process
  would init and uninit libnotify without send a notification (LP: #570462).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_no_error_messages.patch
 
1
=== modified file 'libnotify/notify.c'
 
2
--- old/libnotify/notify.c      2008-11-21 10:21:01 +0000
 
3
+++ new/libnotify/notify.c      2010-07-07 16:52:16 +0000
 
4
@@ -191,8 +191,7 @@
 
5
                                                   G_TYPE_INVALID,
 
6
                                                   G_TYPE_STRV, &caps, G_TYPE_INVALID))
 
7
        {
 
8
-               g_message("GetCapabilities call failed: %s", error->message);
 
9
-               g_error_free(error);
 
10
+               if (error != NULL) g_error_free(error);
 
11
                return NULL;
 
12
        }
 
13
 
 
14
@@ -239,7 +238,7 @@
 
15
                                                   G_TYPE_STRING, &spec_version,
 
16
                                                   G_TYPE_INVALID))
 
17
        {
 
18
-               g_message("GetServerInformation call failed: %s", error->message);
 
19
+               if (error != NULL) g_error_free(error);
 
20
                return FALSE;
 
21
        }
 
22
 
 
23