gnome-bluetooth r609 - trunk/properties

[hadess svn gnome org]

Author: hadess
Date: Tue Apr 14 10:18:32 2009
New Revision: 609
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=609&view=rev

Log:
Another GtkBuilder load fix (Closes: #578863)


Modified:
   trunk/properties/adapter.c

Modified: trunk/properties/adapter.c
==============================================================================
--- trunk/properties/adapter.c	(original)
+++ trunk/properties/adapter.c	Tue Apr 14 10:18:32 2009
@@ -679,8 +679,13 @@
 	GtkBuilder *xml;
 
 	xml = gtk_builder_new ();
-	if (gtk_builder_add_from_file (xml, "properties-adapter-off.ui", NULL) == 0)
-		gtk_builder_add_from_file (xml, PKGDATADIR "properties-adapter-off.ui", NULL);
+	if (gtk_builder_add_from_file (xml, "properties-adapter-off.ui", NULL) == 0) {
+		if (gtk_builder_add_from_file (xml, PKGDATADIR "/properties-adapter-off.ui", NULL) == 0) {
+			g_warning ("Failed to load properties-adapter-off.ui");
+			return;
+		}
+	}
+
 	vbox = GTK_WIDGET (gtk_builder_get_object (xml, "table1"));
 
 	mainbox = gtk_vbox_new(FALSE, 24);
@@ -709,8 +714,12 @@
 	GtkBuilder *xml;
 
 	xml = gtk_builder_new ();
-	if (gtk_builder_add_from_file (xml, "properties-no-adapter.ui", NULL) == 0)
-		gtk_builder_add_from_file (xml, PKGDATADIR "properties-no-adapter.ui", NULL);
+	if (gtk_builder_add_from_file (xml, "properties-no-adapter.ui", NULL) == 0) {
+		if (gtk_builder_add_from_file (xml, PKGDATADIR "/properties-no-adapter.ui", NULL) == 0) {
+			g_warning ("Failed to load properties-no-adapter.ui");
+			return;
+		}
+	}
 	vbox = GTK_WIDGET (gtk_builder_get_object (xml, "table1"));
 
 	mainbox = gtk_vbox_new(FALSE, 24);