kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- 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)
This commit is contained in:
Stefan Gehn 2008-10-03 12:06:33 +00:00
parent d8c30ffddb
commit b067125f1c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -357,4 +357,4 @@ libgkrellm.a: win32-libgkrellm.o
# Checks if the build environment is ok # Checks if the build environment is ok
check_env: check_env:
$(PKG_CONFIG) --atleast-version=2.6 gtk+-2.0 $(PKG_CONFIG) --atleast-version=2.4 gtk+-2.0

6
src/fs.c
View File

@ -1977,6 +1977,7 @@ add_cb(GtkWidget *widget)
gchar *label; gchar *label;
gint secondary, *indices; gint secondary, *indices;
gboolean a, b, err = FALSE; gboolean a, b, err = FALSE;
GtkWidget *entry;
fs = g_new0(FSmon, 1); fs = g_new0(FSmon, 1);
fs->launch_mount.command = g_strdup(""); fs->launch_mount.command = g_strdup("");
@ -1985,8 +1986,9 @@ add_cb(GtkWidget *widget)
label = gkrellm_gtk_entry_get_text(&label_entry); label = gkrellm_gtk_entry_get_text(&label_entry);
gkrellm_locale_dup_string(&fs->label, label, &fs->label_shadow); 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) if (show_button)
fs->show_if_mounted = GTK_TOGGLE_BUTTON(show_button)->active; fs->show_if_mounted = GTK_TOGGLE_BUTTON(show_button)->active;