mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-02-06 23:20:31 +01:00
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
This commit is contained in:
parent
8e0bd8c06c
commit
6cd7cb575d
3 changed files with 23 additions and 8 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue