Revision: 5661 http://geany.svn.sourceforge.net/geany/?rev=5661&view=rev Author: ntrel Date: 2011-03-31 15:34:55 +0000 (Thu, 31 Mar 2011)
Log Message: ----------- Fix applying default setting for hide_object_files (oops). Fix warning when enabling plugin from the Plugin Manager.
Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-31 15:01:24 UTC (rev 5660) +++ trunk/ChangeLog 2011-03-31 15:34:55 UTC (rev 5661) @@ -3,6 +3,9 @@ * plugins/filebrowser.c: Make 'Hide object files' preference configurable with file extensions. + * plugins/filebrowser.c: + Fix applying default setting for hide_object_files (oops). + Fix warning when enabling plugin from the Plugin Manager.
2011-03-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> @@ -17,7 +20,7 @@ * plugins/saveactions.c: Fix Instant Save preferences combo box filetype order. * plugins/filebrowser.c: - Remove confusing macro CHECK_READ_SETTING(). + Remove macro CHECK_READ_SETTING().
2011-03-30 Colomban Wendling <colomban(at)geany(dot)org>
Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2011-03-31 15:01:24 UTC (rev 5660) +++ trunk/plugins/filebrowser.c 2011-03-31 15:34:55 UTC (rev 5661) @@ -853,6 +853,7 @@ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view)); gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
+ /* Show the current path when the FB is first needed */ g_signal_connect(file_view, "realize", G_CALLBACK(on_current_path), NULL); g_signal_connect(selection, "changed", G_CALLBACK(on_tree_selection_changed), NULL); g_signal_connect(file_view, "button-press-event", G_CALLBACK(on_button_press), NULL); @@ -1002,8 +1003,9 @@ g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL);
open_cmd = utils_get_setting_string(config, "filebrowser", "open_command", "nautilus "%d""); + /* g_key_file_get_boolean defaults to FALSE */ show_hidden_files = g_key_file_get_boolean(config, "filebrowser", "show_hidden_files", NULL); - hide_object_files = g_key_file_get_boolean(config, "filebrowser", "hide_object_files", NULL); + hide_object_files = utils_get_setting_boolean(config, "filebrowser", "hide_object_files", TRUE); hidden_file_extensions = utils_get_setting_string(config, "filebrowser", "hidden_file_extensions", ".o .obj .so .dll .a .lib .pyc"); fb_follow_path = g_key_file_get_boolean(config, "filebrowser", "fb_follow_path", NULL); @@ -1113,12 +1115,13 @@ gtk_container_add(GTK_CONTAINER(scrollwin), file_view); gtk_container_add(GTK_CONTAINER(file_view_vbox), scrollwin);
+ /* load settings before file_view "realize" callback */ + load_settings(); + gtk_widget_show_all(file_view_vbox); page_number = gtk_notebook_append_page(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), file_view_vbox, gtk_label_new(_("Files")));
- load_settings(); - /* setup keybindings */ keybindings_set_item(plugin_key_group, KB_FOCUS_FILE_LIST, kb_activate, 0, 0, "focus_file_list", _("Focus File List"), NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.