From b067125f1c1b8d1c73e03d69f35a2df04c0de740 Mon Sep 17 00:00:00 2001 From: Stefan Gehn Date: Fri, 3 Oct 2008 12:06:33 +0000 Subject: [PATCH] - lower minimum required gtk+ version to 2.4 by removing the (hopefully) only call to a gtk+-2.6 function - merge in translation changes from gkrellm-2.3.2 snapshot (forgot pl.po) --- src/Makefile | 2 +- src/fs.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index e341b7b..ff6860d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -357,4 +357,4 @@ libgkrellm.a: win32-libgkrellm.o # Checks if the build environment is ok check_env: - $(PKG_CONFIG) --atleast-version=2.6 gtk+-2.0 + $(PKG_CONFIG) --atleast-version=2.4 gtk+-2.0 diff --git a/src/fs.c b/src/fs.c index 56e1d38..67d3ae6 100644 --- a/src/fs.c +++ b/src/fs.c @@ -1977,6 +1977,7 @@ add_cb(GtkWidget *widget) gchar *label; gint secondary, *indices; gboolean a, b, err = FALSE; + GtkWidget *entry; fs = g_new0(FSmon, 1); fs->launch_mount.command = g_strdup(""); @@ -1985,8 +1986,9 @@ add_cb(GtkWidget *widget) label = gkrellm_gtk_entry_get_text(&label_entry); gkrellm_locale_dup_string(&fs->label, label, &fs->label_shadow); - fs->mount.directory = gtk_combo_box_get_active_text( - GTK_COMBO_BOX(dir_combo_box)); + + entry = gtk_bin_get_child(GTK_BIN(dir_combo_box)); + fs->mount.directory = g_strdup(gkrellm_gtk_entry_get_text(&entry)); if (show_button) fs->show_if_mounted = GTK_TOGGLE_BUTTON(show_button)->active;