[Initng-svn] r3641 - initng-gui/initconf/src

[svn at initng.thinktux.net]

Author: danne
Date: Mon Apr  3 08:40:23 2006
New Revision: 3641

Modified:
   initng-gui/initconf/src/callbacks.c
   initng-gui/initconf/src/initconf_globals.h
   initng-gui/initconf/src/main.c
Log:
If glade file isn't found in absolute path, look in relative "src" directory instead. This way initconf is runnable from build dir without installation.


Modified: initng-gui/initconf/src/callbacks.c
==============================================================================
--- initng-gui/initconf/src/callbacks.c	(original)
+++ initng-gui/initconf/src/callbacks.c	Mon Apr  3 08:40:23 2006
@@ -80,7 +80,10 @@
 
 void on_about1_activate (GtkMenuItem *menuitem, gpointer user_data)
 {
-  glade_xml_signal_autoconnect(glade_xml_new(FILENAME, "initconf_about", NULL));
+  GladeXML *xml_about = glade_xml_new(FILENAME, "initconf_about", NULL);
+  if(!xml_about)
+    xml_about = glade_xml_new(SECONDARY_FILENAME, "initconf_about", NULL);
+  glade_xml_signal_autoconnect(xml_about);
 }
 
 void on_save_button_clicked (GtkToolButton *toolbutton, gpointer user_data)
@@ -138,6 +141,9 @@
 void on_new_runlevel_button_clicked (GtkButton *button, gpointer user_data)
 {
   xml_new_runlevel = glade_xml_new(FILENAME, "initconf_new_runlevel", NULL);
+  if(!xml_new_runlevel)
+    xml_new_runlevel = glade_xml_new(SECONDARY_FILENAME,
+				     "initconf_new_runlevel", NULL);
   glade_xml_signal_autoconnect(xml_new_runlevel);
 }
 

Modified: initng-gui/initconf/src/initconf_globals.h
==============================================================================
--- initng-gui/initconf/src/initconf_globals.h	(original)
+++ initng-gui/initconf/src/initconf_globals.h	Mon Apr  3 08:40:23 2006
@@ -2,6 +2,7 @@
 #define INITCONF_GLOBALS_H
 
 #define FILENAME INITCONF_GLADE_DIR "/initconf.glade"
+#define SECONDARY_FILENAME "src/initconf.glade"
 #define ROOTNODE "initconf_app"
 
 GladeXML *xml;

Modified: initng-gui/initconf/src/main.c
==============================================================================
--- initng-gui/initconf/src/main.c	(original)
+++ initng-gui/initconf/src/main.c	Mon Apr  3 08:40:23 2006
@@ -100,6 +100,9 @@
   glade_init();
 
   xml = glade_xml_new(FILENAME, ROOTNODE, NULL);
+
+  if(!xml)
+    xml = glade_xml_new(SECONDARY_FILENAME, ROOTNODE, NULL);
   
   /* interface.c , This creates the main widget */
   initconf_app = glade_xml_get_widget(xml, "initconf_app");