gnome-pilot r1528 - in trunk: . capplet

[mcdavey svn gnome org]

Author: mcdavey
Date: Wed Jan 23 09:14:40 2008
New Revision: 1528
URL: http://svn.gnome.org/viewvc/gnome-pilot?rev=1528&view=rev

Log:
2008-01-23  Matt Davey <mcdavey mrao cam ac uk>

        * capplet/gnome-pilot-druid.c:
        * capplet/gnome-pilot-pdialog.c:
        * capplet/gnome-pilot-capplet.c:
        * capplet/gnome-pilot-cdialog.c:
        * capplet/gnome-pilot-ddialog.c: Support loading glade
                files from current directory, to support running
                capplet from capplet/ dir before installation.
                Patch by Bastien Nocera. #508268



Modified:
   trunk/ChangeLog
   trunk/capplet/gnome-pilot-capplet.c
   trunk/capplet/gnome-pilot-cdialog.c
   trunk/capplet/gnome-pilot-ddialog.c
   trunk/capplet/gnome-pilot-druid.c
   trunk/capplet/gnome-pilot-pdialog.c

Modified: trunk/capplet/gnome-pilot-capplet.c
==============================================================================
--- trunk/capplet/gnome-pilot-capplet.c	(original)
+++ trunk/capplet/gnome-pilot-capplet.c	Wed Jan 23 09:14:40 2008
@@ -169,10 +169,13 @@
 	priv->state = dupPilotState (priv->orig_state);
 
 	/* Gui stuff */
-	priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "CappletMain", NULL);
+	priv->xml = glade_xml_new ("gpilotd-capplet.glade", "CappletMain", NULL);
 	if (!priv->xml) {
-		g_message ("gnome-pilot-capplet init(): Could not load the Glade XML file!");
-		goto error;
+		priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "CappletMain", NULL);
+		if (!priv->xml) {
+			g_message ("gnome-pilot-capplet init(): Could not load the Glade XML file!");
+			goto error;
+		}
 	}
 	
 	if (!get_widgets (gpcap)) {

Modified: trunk/capplet/gnome-pilot-cdialog.c
==============================================================================
--- trunk/capplet/gnome-pilot-cdialog.c	(original)
+++ trunk/capplet/gnome-pilot-cdialog.c	Wed Jan 23 09:14:40 2008
@@ -109,10 +109,13 @@
 	gpcd->priv = priv;
 
 	/* Gui stuff */
-	priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "ConduitSettings", NULL);
+	priv->xml = glade_xml_new ("gpilotd-capplet.glade", "ConduitSettings", NULL);
 	if (!priv->xml) {
-		g_message ("gnome-pilot-cdialog init(): Could not load the Glade XML file!");
-		goto error;
+		priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "ConduitSettings", NULL);
+		if (!priv->xml) {
+			g_message ("gnome-pilot-cdialog init(): Could not load the Glade XML file!");
+			goto error;
+		}
 	}
 
 	if (!get_widgets (gpcd)) {

Modified: trunk/capplet/gnome-pilot-ddialog.c
==============================================================================
--- trunk/capplet/gnome-pilot-ddialog.c	(original)
+++ trunk/capplet/gnome-pilot-ddialog.c	Wed Jan 23 09:14:40 2008
@@ -122,10 +122,13 @@
 	gpdd->priv = priv;
 
 	/* Gui stuff */
-	priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "DeviceSettings", NULL);
+	priv->xml = glade_xml_new ("gpilotd-capplet.glade", "DeviceSettings", NULL);
 	if (!priv->xml) {
-		g_message ("gnome-pilot-ddialog init(): Could not load the Glade XML file!");
-		goto error;
+		priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "DeviceSettings", NULL);
+		if (!priv->xml) {
+			g_message ("gnome-pilot-ddialog init(): Could not load the Glade XML file!");
+			goto error;
+		}
 	}
 
 	if (!get_widgets (gpdd)) {

Modified: trunk/capplet/gnome-pilot-druid.c
==============================================================================
--- trunk/capplet/gnome-pilot-druid.c	(original)
+++ trunk/capplet/gnome-pilot-druid.c	Wed Jan 23 09:14:40 2008
@@ -188,10 +188,13 @@
 	priv->device = g_new0 (GPilotDevice,1);
 
 	/* Gui stuff */
-	priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", NULL, NULL);
+	priv->xml = glade_xml_new ("gpilotd-capplet.glade", NULL, NULL);
 	if (!priv->xml) {
-		g_message ("gnome-pilot-druid init(): Could not load the Glade XML file!");
-		goto error;
+		priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", NULL, NULL);
+		if (!priv->xml) {
+			g_message ("gnome-pilot-druid init(): Could not load the Glade XML file!");
+			goto error;
+		}
 	}
 
 	if (!get_widgets (gpd)) {

Modified: trunk/capplet/gnome-pilot-pdialog.c
==============================================================================
--- trunk/capplet/gnome-pilot-pdialog.c	(original)
+++ trunk/capplet/gnome-pilot-pdialog.c	Wed Jan 23 09:14:40 2008
@@ -138,10 +138,13 @@
 	gppd->priv = priv;
 
 	/* Gui stuff */
-	priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "PilotSettings", NULL);
+	priv->xml = glade_xml_new ("gpilotd-capplet.glade", "PilotSettings", NULL);
 	if (!priv->xml) {
-		g_message ("gnome-pilot-pdialog init(): Could not load the Glade XML file!");
-		goto error;
+		priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "PilotSettings", NULL);
+		if (!priv->xml) {
+			g_message ("gnome-pilot-pdialog init(): Could not load the Glade XML file!");
+			goto error;
+		}
 	}
 
 	if (!get_widgets (gppd)) {