Revision: 4927
http://geany.svn.sourceforge.net/geany/?rev=4927&view=rev
Author: eht16
Date: 2010-05-16 17:45:21 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Replace free() by g_free() (patch by Daniel Marjamaki, thanks).
Modified Paths:
--------------
trunk/ChangeLog
trunk/THANKS
trunk/src/about.c
trunk/src/prefix.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-05-16 17:45:06 UTC (rev 4926)
+++ trunk/ChangeLog 2010-05-16 17:45:21 UTC (rev 4927)
@@ -21,6 +21,8 @@
* plugins/filebrowser.c:
Implement reading and evaluating hidden file attribute on Windows.
Fix broken "Go Up" if the current path ends with a slash.
+ * THANKS, src/about.c, src/prefix.c:
+ Replace free() by g_free() (patch by Daniel Marjamaki, thanks).
2010-05-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2010-05-16 17:45:06 UTC (rev 4926)
+++ trunk/THANKS 2010-05-16 17:45:21 UTC (rev 4927)
@@ -78,6 +78,7 @@
Yoann Le Montagner <yoann(dot)le-montagner(at)m4x(dot)org> - set VTE bold color
Dimitar Zhekov <hamster(at)mbox(dot)contact(dot)bg> - matching brace improvements patch
Ondrej Donek <ondrejd(at)gmail(dot)com> - Support for creating PHP classes with the classbuilder plugin
+Daniel Marjamaki <danielm77(at)spray(dot)se> - Small improvements
Translators:
------------
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2010-05-16 17:45:06 UTC (rev 4926)
+++ trunk/src/about.c 2010-05-16 17:45:21 UTC (rev 4927)
@@ -84,7 +84,8 @@
static const gchar *contributors =
"Alexander Rodin, Alexey Antipov, Andrew Rowland, Anh Phạm, blackdog, Bo Lorentsen, Bob Doan, "
"Bronisław Białek, Can Koy, Catalin Marinas, "
-"Chris Macksey, Christoph Berg, Colomban Wendling, Conrad Steenberg, Daniel Richard G., Dave Moore, "
+"Chris Macksey, Christoph Berg, Colomban Wendling, Conrad Steenberg, Daniel Richard G., "
+"Daniel Marjamaki, Dave Moore, "
"Dimitar Zhekov, Dirk Weber, Elias Pschernig, Eric Forgeot, Eugene Arshinov, Felipe Pena, François Cami, "
"Giuseppe Torelli, Guillaume de Rorthais, Guillaume Hoffmann, Herbert Voss, Jason Oster, "
"Jean-François Wauthy, Jeff Pohlmeyer, Jesse Mayes, John Gabriele, Jon Senior, Jon Strait, Josef Whiter, "
Modified: trunk/src/prefix.c
===================================================================
--- trunk/src/prefix.c 2010-05-16 17:45:06 UTC (rev 4926)
+++ trunk/src/prefix.c 2010-05-16 17:45:21 UTC (rev 4927)
@@ -206,18 +206,18 @@
tmp = g_strndup ((char *) path, end - path);
if (!*tmp)
{
- free (tmp);
+ g_free (tmp);
return strdup ("/");
}
end = strrchr (tmp, '/');
if (!end) return tmp;
result = g_strndup (tmp, end - tmp);
- free (tmp);
+ g_free (tmp);
if (!*result)
{
- free (result);
+ g_free (result);
result = strdup ("/");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4926
http://geany.svn.sourceforge.net/geany/?rev=4926&view=rev
Author: eht16
Date: 2010-05-16 17:45:06 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Fix broken "Go Up" if the current path ends with a slash.
Modified Paths:
--------------
trunk/ChangeLog
trunk/plugins/filebrowser.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-05-16 17:44:51 UTC (rev 4925)
+++ trunk/ChangeLog 2010-05-16 17:45:06 UTC (rev 4926)
@@ -20,6 +20,7 @@
makefile.win32 based Windows builds.
* plugins/filebrowser.c:
Implement reading and evaluating hidden file attribute on Windows.
+ Fix broken "Go Up" if the current path ends with a slash.
2010-05-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/plugins/filebrowser.c
===================================================================
--- trunk/plugins/filebrowser.c 2010-05-16 17:44:51 UTC (rev 4925)
+++ trunk/plugins/filebrowser.c 2010-05-16 17:45:06 UTC (rev 4926)
@@ -343,6 +343,9 @@
static void on_go_up(void)
{
+ gsize len = strlen(current_dir);
+ if (current_dir[len-1] == G_DIR_SEPARATOR)
+ current_dir[len-1] = '\0';
/* remove the highest directory part (which becomes the basename of current_dir) */
setptr(current_dir, g_path_get_dirname(current_dir));
refresh();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4922
http://geany.svn.sourceforge.net/geany/?rev=4922&view=rev
Author: eht16
Date: 2010-05-16 17:43:35 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Explicitly check for the type when iterating the action's proxies. For some reason on Windows, a GtkImageMenuItem proxy is created.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/geanymenubuttonaction.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-05-16 17:43:24 UTC (rev 4921)
+++ trunk/ChangeLog 2010-05-16 17:43:35 UTC (rev 4922)
@@ -8,7 +8,11 @@
Small improvements to speed up quit process with many open documents.
Avoid calling gtk_notebook_remove_page() on exit as it takes
a lot of time.
+ * src/geanymenubuttonaction.c:
+ Explicitly check for the type when iterating the action's proxies.
+ For some reason on Windows, a GtkImageMenuItem proxy is created.
+
2010-05-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/win32.c:
Modified: trunk/src/geanymenubuttonaction.c
===================================================================
--- trunk/src/geanymenubuttonaction.c 2010-05-16 17:43:24 UTC (rev 4921)
+++ trunk/src/geanymenubuttonaction.c 2010-05-16 17:43:35 UTC (rev 4922)
@@ -213,20 +213,21 @@
else
enable = FALSE;
- if (enable)
+ foreach_slist(l, gtk_action_get_proxies(GTK_ACTION(action)))
{
- foreach_slist(l, gtk_action_get_proxies(GTK_ACTION(action)))
+ /* On Windows a GtkImageMenuItem proxy is created for whatever reason. So we filter
+ * by type and act only on GtkMenuToolButton proxies. */
+ /* TODO find why the GtkImageMenuItem proxy is created */
+ if (! GTK_IS_MENU_TOOL_BUTTON(l->data))
+ continue;
+
+ if (enable)
{
if (gtk_menu_tool_button_get_menu(GTK_MENU_TOOL_BUTTON(l->data)) == NULL)
gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(l->data), priv->menu);
}
- }
- else
- {
- foreach_slist(l, gtk_action_get_proxies(GTK_ACTION(action)))
- {
+ else
gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(l->data), NULL);
- }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4920
http://geany.svn.sourceforge.net/geany/?rev=4920&view=rev
Author: eht16
Date: 2010-05-16 17:43:10 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Fix project base_path detection if the path has a trailing slash.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/sidebar.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-05-16 17:42:58 UTC (rev 4919)
+++ trunk/ChangeLog 2010-05-16 17:43:10 UTC (rev 4920)
@@ -2,6 +2,8 @@
* src/prefs.c, src/project.c:
win32.h can be included unconditionally.
+ * src/sidebar.c:
+ Fix project base_path detection if the path has a trailing slash.
2010-05-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/sidebar.c
===================================================================
--- trunk/src/sidebar.c 2010-05-16 17:42:58 UTC (rev 4919)
+++ trunk/src/sidebar.c 2010-05-16 17:43:10 UTC (rev 4920)
@@ -361,7 +361,11 @@
/* check whether the dir name matches or uses the project base path */
if (!utils_str_equal(project_base_path, tmp_dirname))
- setptr(project_base_path, g_strconcat(project_base_path, G_DIR_SEPARATOR_S, NULL));
+ {
+ const gchar *sep =
+ (project_base_path[len-1] == G_DIR_SEPARATOR) ? NULL : G_DIR_SEPARATOR_S;
+ setptr(project_base_path, g_strconcat(project_base_path, sep, NULL));
+ }
if (g_str_has_prefix(tmp_dirname, project_base_path))
{
rest = tmp_dirname + len;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.