← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/alarm-clock/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/gtk-builder-proper-error-handling

  • Committer: Bazaar Package Importer
  • Author(s): Ryan Niebur
  • Date: 2009-09-06 12:14:17 UTC
  • mfrom: (1.1.11 upstream)
  • mto: (9.2.3 squeeze)
  • mto: This revision was merged to the branch mainline in revision 12.
  • Revision ID: james.westby@ubuntu.com-20090906121417-8er9o81ggu07jt3w
Tags: 1.2.3-2
https://launchpad.net/bugs/425163
* don't do 'make check', it doesn't work right with quilt patches
* add gtk-builder-proper-error-handling patch, used to debug LP 425163
* add fix-duplicate-id, which fixes loading on Ubuntu (LP: #425163)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/gtk-builder-proper-error-handling
 
1
--- a/src/main.c
 
2
+++ b/src/main.c
 
3
@@ -90,10 +90,11 @@
 
4
        
 
5
        g_set_application_name(_("Alarm Clock"));
 
6
        
 
7
+        GError *builder_err = NULL;
 
8
        gxml = gtk_builder_new ();
 
9
-       if (!gtk_builder_add_from_file (gxml, GTK_BUILDER_FILE, NULL))
 
10
+       if (!gtk_builder_add_from_file (gxml, GTK_BUILDER_FILE, &builder_err))
 
11
        {
 
12
-               g_print ("Cannot load GTK Builder file.\n");
 
13
+                g_print ("Cannot load GTK Builder file: %s\n", builder_err->message);
 
14
                exit(1);
 
15
        }
 
16