Revision: 4655
http://geany.svn.sourceforge.net/geany/?rev=4655&view=rev
Author: ntrel
Date: 2010-02-09 17:31:17 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
Update for ntrel's changes for 0.18.1.
Modified Paths:
--------------
branches/geany-0.18.1/NEWS
Modified: branches/geany-0.18.1/NEWS
===================================================================
--- branches/geany-0.18.1/NEWS 2010-02-07 18:37:25 UTC (rev 4654)
+++ branches/geany-0.18.1/NEWS 2010-02-09 17:31:17 UTC (rev 4655)
@@ -1,3 +1,54 @@
+Geany 0.18.1 (TBA)
+
+ Build fixes:
+ * Define G_GNUC_WARN_UNUSED_RESULT to fix build on GLib 2.8.
+ * Use AC_PATH_PROG instead of 'which' for portability (patch by Erik
+ Southworth, thanks).
+
+ Incompatibilities:
+ * Remove filetypes.common invert_all option - use 'Invert syntax
+ highlighting colors' pref instead (fixes #2854525).
+
+ Bug fixes:
+ * Fix 'Open Selected File' for unsaved new documents.
+ * Fix updating main menu accelerators after changing keybindings
+ (thanks to Lex Trotman).
+ * Fix using 'Insert date' keybinding when a custom date string has
+ not been set.
+ * Set the cursor color for the split window plugin.
+ * Remove plugin from plugin manager dialog on unloading if it no
+ longer exists or is incompatible.
+ * Fix 'Reflow block' command when at the last paragraph and there's
+ no last newline (patch by Eugene Arshinov, thanks).
+ * Fix opening filenames beginning with two dots (closes #2858487).
+ * Show Find in Files stderr output in messages window instead of
+ debug window so that invalid regex messages can be seen easily.
+ * Speed up sorting in utils_get_file_list(). This reduces the file
+ browser delay on displaying a big directory, e.g. /usr/bin.
+
+ Filetype fixes:
+ * Parse contents of D extern{} and version{} blocks.
+ * Fix creating D interface tags properly.
+ * Parse D functions with contracts (fixes #1885480).
+ * Parse D alias statement like typedef.
+
+ Documentation:
+ * Add 'Scope autocompletion' section.
+ * Add 'Tools menu items' section to explain configuration files
+ submenu, reload configuration item.
+ * Minor updates/fixes.
+
+ API:
+ * Add gcc commands to build a plugin to the HowTo.
+
+ HACKING file:
+ * Add section 'Plugin API/ABI design'.
+ * Add 'Compiler options & warnings' section.
+ * Update Style section to be clearer about code alignment and show
+ some example code.
+ * Add 'Doc-comments' plugin API subsection.
+
+
Geany 0.18 (August 16, 2009)
General:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4654
http://geany.svn.sourceforge.net/geany/?rev=4654&view=rev
Author: eht16
Date: 2010-02-07 18:37:25 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
Fix possible endless loop when trying to detect the encoding of non-text files (patch by Alexey Antipov, thanks).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/encodings.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-07 18:24:45 UTC (rev 4653)
+++ trunk/ChangeLog 2010-02-07 18:37:25 UTC (rev 4654)
@@ -5,6 +5,9 @@
Unref the new files toolbar menu when freeing templates as it
was done before but unref it *after* the menu has been removed
from the GeanyMenuButtonAction.
+ * src/encodings.c:
+ Fix possible endless loop when trying to detect the encoding of
+ non-text files (patch by Alexey Antipov, thanks).
2010-02-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/encodings.c
===================================================================
--- trunk/src/encodings.c 2010-02-07 18:24:45 UTC (rev 4653)
+++ trunk/src/encodings.c 2010-02-07 18:37:25 UTC (rev 4654)
@@ -550,13 +550,17 @@
/* First check for preferred charset, if specified */
preferred_charset = file_prefs.default_open_encoding;
- if (preferred_charset == encodings[GEANY_ENCODING_NONE].idx || preferred_charset < 0 || preferred_charset >= GEANY_ENCODINGS_MAX)
+ if (preferred_charset == encodings[GEANY_ENCODING_NONE].idx ||
+ preferred_charset < 0 ||
+ preferred_charset >= GEANY_ENCODINGS_MAX)
+ {
preferred_charset = -1;
+ }
/* -1 means "Preferred charset" */
for (i = -1; i < GEANY_ENCODINGS_MAX; i++)
{
- if (G_UNLIKELY(i == encodings[GEANY_ENCODING_NONE].idx) || G_UNLIKELY(i == -2))
+ if (G_UNLIKELY(i == encodings[GEANY_ENCODING_NONE].idx))
continue;
if (i == -1)
@@ -565,7 +569,6 @@
{
charset = encodings[preferred_charset].charset;
geany_debug("Preferred charset: %s", charset);
- i = -2;
}
else
continue;
@@ -574,13 +577,11 @@
{
check_regex = FALSE;
charset = regex_charset;
- i = -2;
}
else if (check_locale)
{
check_locale = FALSE;
charset = locale_charset;
- i = -2;
}
else
charset = encodings[i].charset;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4652
http://geany.svn.sourceforge.net/geany/?rev=4652&view=rev
Author: eht16
Date: 2010-02-07 18:19:25 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
Partly revert last commit:
Unref the new files toolbar menu when freeing templates as it was done before but unref it *after* the menu has been removed from the GeanyMenuButtonAction.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/geanymenubuttonaction.c
trunk/src/templates.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-02-07 08:31:37 UTC (rev 4651)
+++ trunk/ChangeLog 2010-02-07 18:19:25 UTC (rev 4652)
@@ -1,3 +1,12 @@
+2010-02-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/geanymenubuttonaction.c, src/templates.c:
+ Partly revert last commit:
+ Unref the new files toolbar menu when freeing templates as it
+ was done before but unref it *after* the menu has been removed
+ from the GeanyMenuButtonAction.
+
+
2010-02-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/document.c:
Modified: trunk/src/geanymenubuttonaction.c
===================================================================
--- trunk/src/geanymenubuttonaction.c 2010-02-07 08:31:37 UTC (rev 4651)
+++ trunk/src/geanymenubuttonaction.c 2010-02-07 18:19:25 UTC (rev 4652)
@@ -236,10 +236,7 @@
priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(action);
if (priv->menu != NULL && GTK_IS_WIDGET(priv->menu))
- {
g_signal_handlers_disconnect_by_func(priv->menu, menu_items_changed_cb, action);
- g_object_unref(priv->menu);
- }
if (menu != NULL)
{
g_signal_connect(menu, "add", G_CALLBACK(menu_items_changed_cb), action);
Modified: trunk/src/templates.c
===================================================================
--- trunk/src/templates.c 2010-02-07 08:31:37 UTC (rev 4651)
+++ trunk/src/templates.c 2010-02-07 18:19:25 UTC (rev 4652)
@@ -670,6 +670,7 @@
geany_menu_button_action_set_menu(
GEANY_MENU_BUTTON_ACTION(toolbar_get_action_by_name("New")), NULL);
+ g_object_unref(new_with_template_menu);
new_with_template_menu = NULL;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4650
http://geany.svn.sourceforge.net/geany/?rev=4650&view=rev
Author: statc
Date: 2010-02-07 08:31:03 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
Move utils_option_entry_reverse_parse() function comments to utils.c instead of utils.h. Forbid Doxygen to generate documentation for it as it is not in plugin API.
Modified Paths:
--------------
branches/sm/src/utils.c
branches/sm/src/utils.h
Modified: branches/sm/src/utils.c
===================================================================
--- branches/sm/src/utils.c 2010-02-07 08:30:38 UTC (rev 4649)
+++ branches/sm/src/utils.c 2010-02-07 08:31:03 UTC (rev 4650)
@@ -1895,6 +1895,19 @@
}
+/*
+ * "Reverse parse" @c GOptionEntry
+ *
+ * @param optentry Object to parse.
+ * @return Null-terminated array of strings (@c gchar*).
+ *
+ * Function takes the information about the option entry stored in @c optentry
+ * and the option's value by the address stored in @c optentry. It returns an array
+ * of strings such that it specifies the option's value when used like @c argv.
+ *
+ * Elements of the resulting array must be freed with @c g_free(). The array
+ * itself must be freed with @c g_array_free().
+ */
GArray * utils_option_entry_reverse_parse(const GOptionEntry * optentry)
{
GArray * ret = g_array_new(TRUE, TRUE, sizeof(gchar *));
Modified: branches/sm/src/utils.h
===================================================================
--- branches/sm/src/utils.h 2010-02-07 08:30:38 UTC (rev 4649)
+++ branches/sm/src/utils.h 2010-02-07 08:31:03 UTC (rev 4650)
@@ -229,20 +229,6 @@
gchar *utils_str_remove_chars(gchar *string, const gchar *chars);
-
-/**
- * "Reverse parse" @c GOptionEntry
- *
- * @param optentry Object to parse.
- * @return Null-terminated array of strings (@c gchar*).
- *
- * Function takes the information about the option entry stored in @c optentry
- * and the option's value by the address stored in @c optentry. It returns an array
- * of strings such that it specifies the option's value when used like @c argv.
- *
- * Elements of the resulting array must be freed with @c g_free(). The array
- * itself must be freed with @c g_array_free().
- */
GArray * utils_option_entry_reverse_parse(const GOptionEntry * optentry);
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4649
http://geany.svn.sourceforge.net/geany/?rev=4649&view=rev
Author: statc
Date: 2010-02-07 08:30:38 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
Fix alignment.
Modified Paths:
--------------
branches/sm/src/sm.c
Modified: branches/sm/src/sm.c
===================================================================
--- branches/sm/src/sm.c 2010-02-07 08:30:12 UTC (rev 4648)
+++ branches/sm/src/sm.c 2010-02-07 08:30:38 UTC (rev 4649)
@@ -63,7 +63,7 @@
static void ice_connection_watch(IceConn icecon, IcePointer client_data, Bool opening,
- IcePointer *watch_data);
+ IcePointer *watch_data);
static gboolean ice_iochannel_watch(GIOChannel * source, GIOCondition condition, gpointer data);
static SmcConn sm_connect(const char * libsm_client_id, char ** new_client_id);
@@ -137,12 +137,12 @@
smc_conn = sm_connect(libsm_client_id, &new_client_id);
if (!smc_conn)
- return;
+ return;
- sm_store_props(argv0, new_client_id);
- sm_set_constant_props(smc_conn);
- free(new_client_id);
- #endif
+ sm_store_props(argv0, new_client_id);
+ sm_set_constant_props(smc_conn);
+ free(new_client_id);
+ #endif
}
@@ -265,7 +265,7 @@
gchar err[256] = "";
SmcConn smcon;
- if (!g_getenv("SESSION_MANAGER"))
+ if (!g_getenv("SESSION_MANAGER"))
return 0;
IceAddConnectionWatch(ice_connection_watch, NULL);
@@ -284,11 +284,11 @@
{
g_warning("While connecting to session manager:\n%s.", err);
- IceRemoveConnectionWatch(ice_connection_watch, NULL);
+ IceRemoveConnectionWatch(ice_connection_watch, NULL);
return 0;
}
- return smcon;
+ return smcon;
}
@@ -501,10 +501,10 @@
* @param smcon LibSM connection object.
* @param client_data Client data specified when the callback was registered.
* Currently it is not used.
- * @param save_type Specifies the type of information that should be saved.
- * @param shutdown Specifies if a shutdown is taking place.
- * @param interact_style The type of interaction allowed with the user.
- * @param fast If True, the client should save its state as quickly as possible.
+ * @param save_type Specifies the type of information that should be saved.
+ * @param shutdown Specifies if a shutdown is taking place.
+ * @param interact_style The type of interaction allowed with the user.
+ * @param fast If True, the client should save its state as quickly as possible.
*
* See libSM documentation for more details.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4646
http://geany.svn.sourceforge.net/geany/?rev=4646&view=rev
Author: eht16
Date: 2010-02-06 17:41:43 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
When reloading configuration, process the current document at last so the symbol list will be updated correctly.
Modified Paths:
--------------
branches/geany-0.18.1/ChangeLog
branches/geany-0.18.1/src/main.c
Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog 2010-02-06 17:41:19 UTC (rev 4645)
+++ branches/geany-0.18.1/ChangeLog 2010-02-06 17:41:43 UTC (rev 4646)
@@ -3,6 +3,9 @@
* src/geanymenubuttonaction.c, src/templates.c:
Unref the new files toolbar menu when setting a new menu to fix
possible crashes when reloading configuration.
+ * src/main.c:
+ When reloading configuration, process the current document at last
+ so the symbol list will be updated correctly.
2010-02-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: branches/geany-0.18.1/src/main.c
===================================================================
--- branches/geany-0.18.1/src/main.c 2010-02-06 17:41:19 UTC (rev 4645)
+++ branches/geany-0.18.1/src/main.c 2010-02-06 17:41:43 UTC (rev 4646)
@@ -1188,6 +1188,7 @@
void main_reload_configuration(void)
{
guint i;
+ GeanyDocument *current_doc;
/* reload templates */
templates_free_templates();
@@ -1209,8 +1210,15 @@
/* filetypes_load_config() will skip not loaded filetypes */
filetypes_load_config(i, TRUE);
}
+ /* update document styling */
+ current_doc = document_get_current();
documents_foreach(i)
- document_reload_config(documents[i]);
+ {
+ if (current_doc != documents[i])
+ document_reload_config(documents[i]);
+ }
+ /* process the current document at last */
+ document_reload_config(current_doc);
/* C tag names to ignore */
symbols_reload_config_files();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.