[Initng-svn] r4339 - in initng-gui/initng-conf-gtk: src

[svn at initng.thinktux.net]

Author: danne
Date: Fri Jun  2 14:03:44 2006
New Revision: 4339

Modified:
   initng-gui/initng-conf-gtk/TODO
   initng-gui/initng-conf-gtk/src/callbacks.c
   initng-gui/initng-conf-gtk/src/ngchandler.c
   initng-gui/initng-conf-gtk/src/serviceparser.c

Log:
Service tree is finished! A bit more testing and maybe some more languages and I think it's ready for a 0.3 release!


Modified: initng-gui/initng-conf-gtk/TODO
==============================================================================
--- initng-gui/initng-conf-gtk/TODO	(original)
+++ initng-gui/initng-conf-gtk/TODO	Fri Jun  2 14:03:44 2006
@@ -1,7 +1,5 @@
-* Some kind of grouping in the service list, like group all bluetooth stuff together and make them expandable
-* Make the gui nicer. It's crap ugly.
 * Maybe take a look at Gnome Human Interface Guidelines?
-* Nice way of editing service files, and also a way of creating new ones
+* Nicer way of editing service files, and also a way of creating new ones
 * Code commenting
-* Save settings (states of checkboxes in the view menu) using gconf
+* Save settings (states of checkboxes in the view menu, chosen service filter etc) using gconf
 * Translations. In time of writing this we've got polish and swedish.

Modified: initng-gui/initng-conf-gtk/src/callbacks.c
==============================================================================
--- initng-gui/initng-conf-gtk/src/callbacks.c	(original)
+++ initng-gui/initng-conf-gtk/src/callbacks.c	Fri Jun  2 14:03:44 2006
@@ -418,22 +418,19 @@
   GtkTreeIter serviceiter;
   GtkTreeSelection *selected;
   GtkTreeModel *servicemodel;
-  gchar *servicename;
 
   selected = gtk_tree_view_get_selection(GTK_TREE_VIEW(service_list));
   if(gtk_tree_selection_get_selected(selected, &servicemodel, &serviceiter)) {
     struct s_info *serviceinfo;
-    gtk_tree_model_get(servicemodel, &serviceiter, 0, &servicename, 4, &serviceinfo, -1);
+    gtk_tree_model_get(servicemodel, &serviceiter, 4, &serviceinfo, -1);
     if(serviceinfo)
-      service_log(servicename);
+      service_log(serviceinfo->fullname);
     else
       service_log(NULL);
-    g_free(servicename);
   } else {
     service_log(NULL);
   }
   glade_xml_signal_autoconnect(xml_show_logs);
-
 }
 
 void on_runlevel_filter_combo_changed (GtkComboBox *combobox, gpointer user_data)

Modified: initng-gui/initng-conf-gtk/src/ngchandler.c
==============================================================================
--- initng-gui/initng-conf-gtk/src/ngchandler.c	(original)
+++ initng-gui/initng-conf-gtk/src/ngchandler.c	Fri Jun  2 14:03:44 2006
@@ -90,6 +90,9 @@
   GtkTextBuffer *historybuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(history_textview));
   GtkWidget *initconf_show_logs = glade_xml_get_widget(xml_show_logs, "initconf_show_logs");
 
+  if(name)
+    gtk_window_set_title(GTK_WINDOW(initconf_show_logs), name);
+
   char *answer = ngc_send_and_reply('L', name);
   gtk_text_buffer_set_text(historybuffer, answer, -1);
   if (answer)
@@ -99,5 +102,4 @@
   gtk_text_buffer_set_text(logbuffer, answer, -1);
   if (answer)
     free(answer);
-
 }

Modified: initng-gui/initng-conf-gtk/src/serviceparser.c
==============================================================================
--- initng-gui/initng-conf-gtk/src/serviceparser.c	(original)
+++ initng-gui/initng-conf-gtk/src/serviceparser.c	Fri Jun  2 14:03:44 2006
@@ -127,6 +127,8 @@
     gtk_tree_model_get(model, &iter, 4, &serviceinfo, -1);
     if(serviceinfo) {
       g_free(serviceinfo->startline);
+      if(serviceinfo->fullname)
+	g_free(serviceinfo->fullname);
       if(serviceinfo->file_content) {
         serviceinfo->file_content->references--;
         if(serviceinfo->file_content->references == 0) {
@@ -342,7 +344,7 @@
   struct s_info *serviceinfo;
   gtk_tree_model_get(model, &iter, 4, &serviceinfo, -1);
   if(!serviceinfo) {
-    gtk_text_buffer_set_text(buffer, _("No file associated with that!"), -1);
+    gtk_text_buffer_set_text(buffer, "Unable to locate service!", -1);
     return FALSE;
   }
   struct s_file_content *file_content = serviceinfo->file_content;