Revision: 4401
http://geany.svn.sourceforge.net/geany/?rev=4401&view=rev
Author: ntrel
Date: 2009-11-05 16:17:11 +0000 (Thu, 05 Nov 2009)
Log Message:
-----------
Deprecate PLUGIN_KEY_GROUP() macro - use plugin_set_key_group()
instead.
Modified Paths:
--------------
trunk/ChangeLog
trunk/HACKING
trunk/src/plugindata.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-11-04 18:32:52 UTC (rev 4400)
+++ trunk/ChangeLog 2009-11-05 16:17:11 UTC (rev 4401)
@@ -1,3 +1,10 @@
+2009-11-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/plugindata.h, HACKING:
+ Deprecate PLUGIN_KEY_GROUP() macro - use plugin_set_key_group()
+ instead.
+
+
2009-11-04 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* tagmanager/makefile.win32:
Modified: trunk/HACKING
===================================================================
--- trunk/HACKING 2009-11-04 18:32:52 UTC (rev 4400)
+++ trunk/HACKING 2009-11-05 16:17:11 UTC (rev 4401)
@@ -75,10 +75,10 @@
.. warning::
- Some structs like GeanyKeyGroupInfo and GeanyCallback cannot be
- appended to without breaking the ABI because they are used to declare
- structs by plugins, not just for accessing struct members through
- a pointer.
+ Some structs like GeanyCallback cannot be appended to without
+ breaking the ABI because they are used to declare structs by
+ plugins, not just for accessing struct members through a pointer.
+ Normally structs should never be allocated by plugins.
Keeping the plugin ABI stable
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Modified: trunk/src/plugindata.h
===================================================================
--- trunk/src/plugindata.h 2009-11-04 18:32:52 UTC (rev 4400)
+++ trunk/src/plugindata.h 2009-11-05 16:17:11 UTC (rev 4401)
@@ -119,7 +119,8 @@
}
-/** @see PLUGIN_KEY_GROUP() macro. */
+/** @deprecated - use plugin_set_key_group() instead.
+ * @see PLUGIN_KEY_GROUP() macro. */
typedef struct GeanyKeyGroupInfo
{
const gchar *name; /**< Group name used in the configuration file, such as @c "html_chars" */
@@ -127,7 +128,8 @@
}
GeanyKeyGroupInfo;
-/** Declare and initialise a keybinding group.
+/** @deprecated - use plugin_set_key_group() instead.
+ * Declare and initialise a keybinding group.
* @code GeanyKeyGroup *plugin_key_group; @endcode
* You must then set the @c plugin_key_group::keys[] entries for the group in plugin_init(),
* normally using keybindings_set_item().
@@ -135,8 +137,7 @@
* is called, to the name of the plugin.
* @param group_name A unique group name (without quotes) to be used in the
* configuration file, such as @c html_chars.
- * @param key_count The number of keybindings the group will hold.
- * @see plugin_set_key_group() to set the group size dynamically. */
+ * @param key_count The number of keybindings the group will hold. */
#define PLUGIN_KEY_GROUP(group_name, key_count) \
/* We have to declare this as a single element array.
* Declaring as a pointer to a struct doesn't work with g_module_symbol(). */ \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4399
http://geany.svn.sourceforge.net/geany/?rev=4399&view=rev
Author: ntrel
Date: 2009-11-04 15:28:38 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Deprecate documents_foreach() as it looks more like a function; use
foreach_document() instead.
Generate dox even for GEANY_DISABLE_DEPRECATED declarations.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/Doxyfile.in
trunk/src/document.c
trunk/src/document.h
trunk/src/filetypes.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-11-04 15:06:56 UTC (rev 4398)
+++ trunk/ChangeLog 2009-11-04 15:28:38 UTC (rev 4399)
@@ -14,6 +14,10 @@
* src/highlighting.c:
Only reload filetype files when changing color scheme, not all
configuration files.
+ * src/filetypes.c, src/document.c, src/document.h, doc/Doxyfile.in:
+ Deprecate documents_foreach() as it looks more like a function; use
+ foreach_document() instead.
+ Generate dox even for GEANY_DISABLE_DEPRECATED declarations.
2009-10-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/doc/Doxyfile.in
===================================================================
--- trunk/doc/Doxyfile.in 2009-11-04 15:06:56 UTC (rev 4398)
+++ trunk/doc/Doxyfile.in 2009-11-04 15:28:38 UTC (rev 4399)
@@ -229,7 +229,7 @@
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
# make G_GNUC_PRINTF a no-op unless doxygen would ignore functions with varargs
-PREDEFINED = "G_GNUC_PRINTF(x,y)=" GEANY_DISABLE_DEPRECATED HAVE_PLUGINS GEANY_FUNCTIONS_H
+PREDEFINED = "G_GNUC_PRINTF(x,y)=" HAVE_PLUGINS GEANY_FUNCTIONS_H
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = NO
#---------------------------------------------------------------------------
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2009-11-04 15:06:56 UTC (rev 4398)
+++ trunk/src/document.c 2009-11-04 15:28:38 UTC (rev 4399)
@@ -90,7 +90,7 @@
* file by then.
*
* You also need to check @c GeanyDocument::is_valid when iterating over this array,
- * although usually you would just use the documents_foreach() macro.
+ * although usually you would just use the foreach_document() macro.
*
* Never assume that the order of document pointers is the same as the order of notebook tabs.
* Notebook tabs can be reordered. Use @c document_get_from_page(). */
Modified: trunk/src/document.h
===================================================================
--- trunk/src/document.h 2009-11-04 15:06:56 UTC (rev 4398)
+++ trunk/src/document.h 2009-11-04 15:28:38 UTC (rev 4399)
@@ -114,10 +114,18 @@
* @see document_index(). */
#define documents ((GeanyDocument **)GEANY(documents_array)->pdata)
+/** @deprecated Use @ref foreach_document() instead.
+ * Iterates all valid documents.
+ * Use like a @c for statement.
+ * @param i @c guint index for document_index(). */
+#ifndef GEANY_DISABLE_DEPRECATED
+#define documents_foreach(i) foreach_document(i)
+#endif
+
/** Iterates all valid documents.
* Use like a @c for statement.
* @param i @c guint index for document_index(). */
-#define documents_foreach(i) \
+#define foreach_document(i) \
for (i = 0; i < GEANY(documents_array)->len; i++)\
if (!documents[i]->is_valid)\
{}\
Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c 2009-11-04 15:06:56 UTC (rev 4398)
+++ trunk/src/filetypes.c 2009-11-04 15:28:38 UTC (rev 4399)
@@ -774,7 +774,7 @@
* The user can do this manually with 'Tools->Reload Configuration' */
filetypes_load_config(GEANY_FILETYPES_NONE, TRUE);
- documents_foreach(i)
+ foreach_document(i)
document_reload_config(documents[i]);
}
}
@@ -1618,7 +1618,7 @@
filetypes_load_config(i, TRUE);
}
/* update document styling */
- documents_foreach(i)
+ foreach_document(i)
document_reload_config(documents[i]);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4398
http://geany.svn.sourceforge.net/geany/?rev=4398&view=rev
Author: ntrel
Date: 2009-11-04 15:06:56 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Only reload filetype files when changing color scheme, not all
configuration files.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-11-04 14:59:16 UTC (rev 4397)
+++ trunk/ChangeLog 2009-11-04 15:06:56 UTC (rev 4398)
@@ -11,6 +11,9 @@
* src/highlighting.c:
Fix issue with default color not being reset if overridden with a
system default color.
+ * src/highlighting.c:
+ Only reload filetype files when changing color scheme, not all
+ configuration files.
2009-10-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2009-11-04 14:59:16 UTC (rev 4397)
+++ trunk/src/highlighting.c 2009-11-04 15:06:56 UTC (rev 4398)
@@ -3370,8 +3370,7 @@
if (user_data)
{
setptr(editor_prefs.color_scheme, NULL);
- /* TODO: should be changed to only reload color schemes */
- main_reload_configuration();
+ filetypes_reload();
return;
}
fname = ui_menu_item_get_text(menuitem);
@@ -3389,8 +3388,7 @@
{
setptr(editor_prefs.color_scheme, fname);
fname = NULL;
- /* TODO: should be changed to only reload color schemes */
- main_reload_configuration();
+ filetypes_reload();
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4397
http://geany.svn.sourceforge.net/geany/?rev=4397&view=rev
Author: ntrel
Date: 2009-11-04 14:59:16 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Fix issue with default color not being reset if overridden with a
system default color.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-11-04 14:47:07 UTC (rev 4396)
+++ trunk/ChangeLog 2009-11-04 14:59:16 UTC (rev 4397)
@@ -8,6 +8,9 @@
section is read.
* src/templates.c, src/utils.c, src/highlighting.c, src/utils.h:
Add utils_get_config_files().
+ * src/highlighting.c:
+ Fix issue with default color not being reset if overridden with a
+ system default color.
2009-10-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2009-11-04 14:47:07 UTC (rev 4396)
+++ trunk/src/highlighting.c 2009-11-04 14:59:16 UTC (rev 4397)
@@ -545,6 +545,7 @@
}
/* first set default to the "default" named style */
add_named_style(config, "default");
+ read_named_style("default", &gsd_default); /* in case user overrides but not with both colors */
add_named_style(config_home, "default");
read_named_style("default", &gsd_default);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.