← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Ryan Niebur
  • Date: 2009-12-23 11:43:59 UTC
  • mfrom: (9.2.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091223114359-znajerjtb229shgh
Tags: 1.2.5-1
http://bugs.debian.org/558591
* update watch file
* New Upstream Version (Closes: #558591)
* remove the gtk-builder-proper-error-handling patch, fixed upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.c
90
90
        
91
91
        g_set_application_name(_("Alarm Clock"));
92
92
        
 
93
        GError *error = NULL;
 
94
 
93
95
        gxml = gtk_builder_new ();
94
 
        if (!gtk_builder_add_from_file (gxml, GTK_BUILDER_FILE, NULL))
 
96
        if (!gtk_builder_add_from_file (gxml, GTK_BUILDER_FILE, &error))
95
97
        {
96
 
                g_print ("Cannot load GTK Builder file.\n");
 
98
                g_print ("Cannot load GTK Builder file: %s\n", error->message);
 
99
                g_error_free(error);
97
100
                exit(1);
98
101
        }
99
102
 
 
103
        if (error) g_error_free(error);
100
104
        
101
105
 
102
106
        initialize_config();