dbus/tools dbus-viewer.c,1.11,1.12

[Havoc Pennington]

Update of /cvs/dbus/dbus/tools
In directory gabe:/tmp/cvs-serv17990/tools

Modified Files:
	dbus-viewer.c 
Log Message:
2005-03-30  Havoc Pennington  <hp at redhat.com>

	* configure.in: change check to gtk 2.4

	* tools/dbus-viewer.c (name_combo_changed_callback): remove
	gtk_combo_box_get_active_text() usage to decrement GTK requirement
	to 2.4



Index: dbus-viewer.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-viewer.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dbus-viewer.c	17 Feb 2005 21:19:48 -0000	1.11
+++ dbus-viewer.c	31 Mar 2005 02:24:12 -0000	1.12
@@ -378,14 +378,21 @@
 name_combo_changed_callback (GtkComboBox *combo,
                              TreeWindow  *w)
 {
-  char *text;
-
-  text = gtk_combo_box_get_active_text (combo);
+  GtkTreeIter iter;
 
-  if (text)
+  if (gtk_combo_box_get_active_iter (combo, &iter))
     {
-      tree_window_set_service (w, text);
-      g_free (text);
+      GtkTreeModel *model;
+      char *text;
+
+      model = gtk_combo_box_get_model (combo);
+      gtk_tree_model_get (model, &iter, 0, &text, -1);
+
+      if (text)
+        {
+          tree_window_set_service (w, text);
+          g_free (text);
+        }
     }
 }