2005-03-30 Havoc Pennington <hp@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

diff --git a/ChangeLog b/ChangeLog
index 4144fdb..59c3f25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-30  Havoc Pennington  <hp@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
+
 2005-03-29  John (J5) Palmieri  <johnp@redhat.com>
 
        * News: Update 0.32

diff --git a/configure.in b/configure.in
index 5ef7691..cd846f6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -853,8 +853,8 @@ if test x$have_glib = xno ; then
     AC_MSG_WARN([Can't use GTK+ since GLib not enabled])
     have_gtk=no
 else
-    PKG_CHECK_MODULES(DBUS_GTK, gtk+-2.0 >= 2.6, have_gtk=yes, have_gtk=no)
-    PKG_CHECK_MODULES(DBUS_GTK_THREADS, gtk+-2.0 >= 2.6 gthread-2.0, have_gtk_threads=yes, have_gtk_threads=no)
+    PKG_CHECK_MODULES(DBUS_GTK, gtk+-2.0 >= 2.4, have_gtk=yes, have_gtk=no)
+    PKG_CHECK_MODULES(DBUS_GTK_THREADS, gtk+-2.0 >= 2.4 gthread-2.0, have_gtk_threads=yes, have_gtk_threads=no)
 fi
 
 if test x$have_gtk = xno ; then

diff --git a/tools/dbus-viewer.c b/tools/dbus-viewer.c
index e8ed543..b031c7d 100644 (file)
--- a/tools/dbus-viewer.c
+++ b/tools/dbus-viewer.c
@@ -378,14 +378,21 @@ static void
 name_combo_changed_callback (GtkComboBox *combo,
                              TreeWindow  *w)
 {
-  char *text;
+  GtkTreeIter iter;
 
-  text = gtk_combo_box_get_active_text (combo);
-
-  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);
+        }
     }
 }