SF.net SVN: geany:[3281] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Wed Nov 26 16:09:48 UTC 2008
Revision: 3281
http://geany.svn.sourceforge.net/geany/?rev=3281&view=rev
Author: ntrel
Date: 2008-11-26 16:09:48 +0000 (Wed, 26 Nov 2008)
Log Message:
-----------
Move configuration_read_filetype_extensions() to
filetypes_read_extensions().
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/filetypes.c
trunk/src/filetypes.h
trunk/src/keyfile.c
trunk/src/keyfile.h
trunk/src/main.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-26 16:08:42 UTC (rev 3280)
+++ trunk/ChangeLog 2008-11-26 16:09:48 UTC (rev 3281)
@@ -10,6 +10,15 @@
Add ui_add_config_file_menu_item().
Add utils_build_path(), similar to g_build_path() but (re)using a
fixed buffer, so the result is never freed.
+ * src/notebook.c:
+ Make middle-clicking to close tabs and double-clicking to toggle
+ widgets work also for the gap between the tab label and close
+ button (shown when there are more tabs than fit on screen), and
+ when middle-clicking on the close button.
+ * src/keyfile.c, src/keyfile.h, src/filetypes.c, src/filetypes.h,
+ src/main.c:
+ Move configuration_read_filetype_extensions() to
+ filetypes_read_extensions().
2008-11-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c 2008-11-26 16:08:42 UTC (rev 3280)
+++ trunk/src/filetypes.c 2008-11-26 16:09:48 UTC (rev 3281)
@@ -40,7 +40,6 @@
#include "utils.h"
#include "sciwrappers.h"
#include "ui_utils.h"
-#include "keyfile.h"
#include "geanyobject.h"
#include <stdlib.h>
@@ -591,7 +590,7 @@
if (utils_str_equal(doc->real_path,
utils_build_path(app->configdir, "filetype_extensions.conf", NULL)))
- configuration_read_filetype_extensions();
+ filetypes_read_extensions();
}
@@ -1347,3 +1346,40 @@
#endif
}
+
+void filetypes_read_extensions(void)
+{
+ guint i;
+ gsize len = 0;
+ gchar *sysconfigfile = g_strconcat(app->datadir, G_DIR_SEPARATOR_S,
+ "filetype_extensions.conf", NULL);
+ gchar *userconfigfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S,
+ "filetype_extensions.conf", NULL);
+ gchar **list;
+ GKeyFile *sysconfig = g_key_file_new();
+ GKeyFile *userconfig = g_key_file_new();
+
+ g_key_file_load_from_file(sysconfig, sysconfigfile, G_KEY_FILE_NONE, NULL);
+ g_key_file_load_from_file(userconfig, userconfigfile, G_KEY_FILE_NONE, NULL);
+
+ /* read the keys */
+ for (i = 0; i < filetypes_array->len; i++)
+ {
+ gboolean userset =
+ g_key_file_has_key(userconfig, "Extensions", filetypes[i]->name, NULL);
+ list = g_key_file_get_string_list(
+ (userset) ? userconfig : sysconfig, "Extensions", filetypes[i]->name, &len, NULL);
+ if (list && len > 0)
+ {
+ g_strfreev(filetypes[i]->pattern);
+ filetypes[i]->pattern = list;
+ }
+ else g_strfreev(list);
+ }
+
+ g_free(sysconfigfile);
+ g_free(userconfigfile);
+ g_key_file_free(sysconfig);
+ g_key_file_free(userconfig);
+}
+
Modified: trunk/src/filetypes.h
===================================================================
--- trunk/src/filetypes.h 2008-11-26 16:08:42 UTC (rev 3280)
+++ trunk/src/filetypes.h 2008-11-26 16:09:48 UTC (rev 3281)
@@ -155,6 +155,8 @@
void filetypes_init_types(void);
+void filetypes_read_extensions(void);
+
GeanyFiletype *filetypes_detect_from_document(GeanyDocument *doc);
GeanyFiletype *filetypes_detect_from_extension(const gchar *utf8_filename);
Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c 2008-11-26 16:08:42 UTC (rev 3280)
+++ trunk/src/keyfile.c 2008-11-26 16:09:48 UTC (rev 3281)
@@ -1142,40 +1142,3 @@
#endif
-
-void configuration_read_filetype_extensions(void)
-{
- guint i;
- gsize len = 0;
- gchar *sysconfigfile = g_strconcat(app->datadir, G_DIR_SEPARATOR_S,
- "filetype_extensions.conf", NULL);
- gchar *userconfigfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S,
- "filetype_extensions.conf", NULL);
- gchar **list;
- GKeyFile *sysconfig = g_key_file_new();
- GKeyFile *userconfig = g_key_file_new();
-
- g_key_file_load_from_file(sysconfig, sysconfigfile, G_KEY_FILE_NONE, NULL);
- g_key_file_load_from_file(userconfig, userconfigfile, G_KEY_FILE_NONE, NULL);
-
- /* read the keys */
- for (i = 0; i < filetypes_array->len; i++)
- {
- gboolean userset =
- g_key_file_has_key(userconfig, "Extensions", filetypes[i]->name, NULL);
- list = g_key_file_get_string_list(
- (userset) ? userconfig : sysconfig, "Extensions", filetypes[i]->name, &len, NULL);
- if (list && len > 0)
- {
- g_strfreev(filetypes[i]->pattern);
- filetypes[i]->pattern = list;
- }
- else g_strfreev(list);
- }
-
- g_free(sysconfigfile);
- g_free(userconfigfile);
- g_key_file_free(sysconfig);
- g_key_file_free(userconfig);
-}
-
Modified: trunk/src/keyfile.h
===================================================================
--- trunk/src/keyfile.h 2008-11-26 16:08:42 UTC (rev 3280)
+++ trunk/src/keyfile.h 2008-11-26 16:09:48 UTC (rev 3281)
@@ -40,8 +40,6 @@
void configuration_save_session_files(GKeyFile *config);
-void configuration_read_filetype_extensions(void);
-
/* set some settings which are already read from the config file, but need other things, like the
* realisation of the main window */
void configuration_apply_settings(void);
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2008-11-26 16:08:42 UTC (rev 3280)
+++ trunk/src/main.c 2008-11-26 16:09:48 UTC (rev 3281)
@@ -559,7 +559,7 @@
gboolean ret;
filetypes_init_types();
- configuration_read_filetype_extensions(); /* needed for *.lang.tags filetype matching */
+ filetypes_read_extensions(); /* needed for *.lang.tags filetype matching */
ret = symbols_generate_global_tags(*argc, *argv, ! no_preprocessing);
exit(ret);
}
@@ -953,7 +953,7 @@
document_init_doclist();
treeviews_init();
symbols_init();
- configuration_read_filetype_extensions();
+ filetypes_read_extensions();
editor_snippets_init();
/* set window icon */
@@ -1175,7 +1175,7 @@
editor_snippets_init();
/* reload filetype extensions */
- configuration_read_filetype_extensions();
+ filetypes_read_extensions();
/* save possibly changed commands before re-reading them */
filetypes_save_commands();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list