SF.net SVN: geany:[3547] trunk

[eht16 at users.sourceforge.net]

Revision: 3547
          http://geany.svn.sourceforge.net/geany/?rev=3547&view=rev
Author:   eht16
Date:     2009-02-04 20:04:49 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
It's enough to check for GTK 2.14 at runtime, not at build time when to determine whether to show non-local folders in the file chooser dialogs.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/dialogs.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-02-04 20:01:32 UTC (rev 3546)
+++ trunk/ChangeLog	2009-02-04 20:04:49 UTC (rev 3547)
@@ -7,6 +7,10 @@
    (neither in the user's config nor in the global filetypes.php) and
    (un)commenting is used outside of the PHP tags
    (reported by Frank, thanks).
+ * src/dialogs.c:
+   It's enough to check for GTK 2.14 at runtime, not at build time when
+   to determine whether to show non-local folders in the file chooser
+   dialogs.
 
 
 2009-02-02  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c	2009-02-04 20:01:32 UTC (rev 3546)
+++ trunk/src/dialogs.c	2009-02-04 20:04:49 UTC (rev 3547)
@@ -195,9 +195,8 @@
 	gtk_window_set_type_hint(GTK_WINDOW(ui_widgets.open_filesel), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.open_filesel), GTK_WINDOW(main_widgets.window));
 	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(ui_widgets.open_filesel), TRUE);
-#if GTK_CHECK_VERSION(2, 14, 0)
-	gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(ui_widgets.open_filesel), FALSE);
-#endif
+	if (gtk_check_version(2, 14, 0) == NULL)
+		gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(ui_widgets.open_filesel), FALSE);
 
 	/* add checkboxes and filename entry */
 	gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(ui_widgets.open_filesel),
@@ -481,9 +480,8 @@
 	gtk_widget_show_all(vbox);
 	gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(ui_widgets.save_filesel), vbox);
 	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(ui_widgets.save_filesel), TRUE);
-#if GTK_CHECK_VERSION(2, 14, 0)
-	gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(ui_widgets.save_filesel), FALSE);
-#endif
+	if (gtk_check_version(2, 14, 0) == NULL)
+		gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(ui_widgets.save_filesel), FALSE);
 
 	g_signal_connect(check_open_new_tab, "toggled",
 				G_CALLBACK(on_save_as_new_tab_toggled), rename_btn);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.