Plugins-Commits October 2010

plugins-commits@lists.geany.org

8 participants
80 discussions

SF.net SVN: geany-plugins:[1676] trunk/geany-plugins/geanyvc
by frlan＠users.sourceforge.net 23 Oct '10

23 Oct '10

Revision: 1676 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1676&view=rev Author: frlan Date: 2010-10-23 09:55:39 +0000 (Sat, 23 Oct 2010) Log Message: ----------- GeanyVC: Minor Update of Documentation Modified Paths: -------------- trunk/geany-plugins/geanyvc/README trunk/geany-plugins/geanyvc/src/vc_cvs.c Modified: trunk/geany-plugins/geanyvc/README =================================================================== --- trunk/geany-plugins/geanyvc/README 2010-10-22 19:46:50 UTC (rev 1675) +++ trunk/geany-plugins/geanyvc/README 2010-10-23 09:55:39 UTC (rev 1676) @@ -53,6 +53,7 @@ * revert directory * revert base directory * update + * commit Requirements ============ Modified: trunk/geany-plugins/geanyvc/src/vc_cvs.c =================================================================== --- trunk/geany-plugins/geanyvc/src/vc_cvs.c 2010-10-22 19:46:50 UTC (rev 1675) +++ trunk/geany-plugins/geanyvc/src/vc_cvs.c 2010-10-23 09:55:39 UTC (rev 1676) @@ -3,6 +3,8 @@ * Copyright 2007-2009 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * Copyright 2007-2009 Yura Siamashka <yurand2(a)gmail.com> + * Copyright 2010 Jean-Paul Iribarren <jeanpaul.Iribarren(a)free.fr> + * * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1675] trunk/geany-plugins/geanyvc
by yurand＠users.sourceforge.net 22 Oct '10

22 Oct '10

Revision: 1675 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1675&view=rev Author: yurand Date: 2010-10-22 19:46:50 +0000 (Fri, 22 Oct 2010) Log Message: ----------- geanyvc: Added support of CVS commit patch from Jean-Paul Iribarren, thanks Modified Paths: -------------- trunk/geany-plugins/geanyvc/THANKS trunk/geany-plugins/geanyvc/src/vc_cvs.c Modified: trunk/geany-plugins/geanyvc/THANKS =================================================================== --- trunk/geany-plugins/geanyvc/THANKS 2010-10-17 19:25:27 UTC (rev 1674) +++ trunk/geany-plugins/geanyvc/THANKS 2010-10-22 19:46:50 UTC (rev 1675) @@ -10,6 +10,7 @@ Karel Kolman <kolmis(at)gmail(dot)com> - Bazaar support. David Kalnischkies <kalnischkies(at)gmail(dot)com> - Mercurial support Thomas Martitz <thomas(dot)martitz(at)student(dot)HTW-Berlin(dot)de> - Lot of improvments and patches e.g. on commit dialog +Jean-Paul Iribarren <jeanpaul(dot)iribarren(at)free(dot)fr> - patch for cvs's commit Projects -------- Modified: trunk/geany-plugins/geanyvc/src/vc_cvs.c =================================================================== --- trunk/geany-plugins/geanyvc/src/vc_cvs.c 2010-10-17 19:25:27 UTC (rev 1674) +++ trunk/geany-plugins/geanyvc/src/vc_cvs.c 2010-10-22 19:46:50 UTC (rev 1675) @@ -32,7 +32,7 @@ static const gchar *CVS_CMD_REMOVE[] = { "cvs", "remove", BASE_FILENAME, NULL }; static const gchar *CVS_CMD_LOG_FILE[] = { "cvs", "log", BASE_FILENAME, NULL }; static const gchar *CVS_CMD_LOG_DIR[] = { "cvs", "log", NULL }; -static const gchar *CVS_CMD_COMMIT[] = { "cvs", NULL }; +static const gchar *CVS_CMD_COMMIT[] = { "cvs", "commit", "-m", MESSAGE, FILE_LIST, NULL }; static const gchar *CVS_CMD_BLAME[] = { "cvs", "annotate", BASE_FILENAME, NULL }; static const gchar *CVS_CMD_SHOW[] = { "cvs", NULL }; static const gchar *CVS_CMD_UPDATE[] = { "cvs", "up", "-d", NULL }; @@ -142,10 +142,106 @@ return find_dir(filename, "CVS", FALSE); } +static GSList * +get_commit_files_cvs(const gchar * dir) +{ + enum + { + FIRST_CHAR, + SKIP_SPACE, + FILE_NAME, + }; + + gchar *txt; + GSList *ret = NULL; + gint pstatus = FIRST_CHAR; + const gchar *p; + gchar *base_name; + const gchar *start = NULL; + CommitItem *item; + + const gchar *status; + gchar *filename; + const char *argv[] = { "cvs", "-nq", "update", NULL }; + + execute_custom_command(dir, argv, NULL, &txt, NULL, dir, NULL, NULL); + if (!NZV(txt)) + return NULL; + p = txt; + + while (*p) + { + if (*p == '\r') + { + } + else if (pstatus == FIRST_CHAR) + { + status = NULL; + if (*p == '?') + status = FILE_STATUS_UNKNOWN; + else if (*p == 'M') + status = FILE_STATUS_MODIFIED; + else if (*p == 'D') + status = FILE_STATUS_DELETED; + else if (*p == 'A') + status = FILE_STATUS_ADDED; + + if (!status || *(p + 1) != ' ') + { + // skip unknown status line + while (*p) + { + p++; + if (*p == '\n') + { + p++; + break; + } + } + pstatus = FIRST_CHAR; + continue; + } + pstatus = SKIP_SPACE; + } + else if (pstatus == SKIP_SPACE) + { + if (*p == ' ' || *p == '\t') + { + } + else + { + start = p; + pstatus = FILE_NAME; + } + } + else if (pstatus == FILE_NAME) + { + if (*p == '\n') + { + if (status != FILE_STATUS_UNKNOWN) + { + base_name = g_malloc0(p - start + 1); + memcpy(base_name, start, p - start); + filename = g_build_filename(dir, base_name, NULL); + g_free(base_name); + item = g_new(CommitItem, 1); + item->status = status; + item->path = filename; + ret = g_slist_append(ret, item); + } + pstatus = FIRST_CHAR; + } + } + p++; + } + g_free(txt); + return ret; +} + VC_RECORD VC_CVS = { .commands = commands, .program = "cvs", .get_base_dir = get_base_dir, .in_vc = in_vc_cvs, - .get_commit_files = get_commit_files_null, + .get_commit_files = get_commit_files_cvs, }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1674] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 17 Oct '10

17 Oct '10

Revision: 1674 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1674&view=rev Author: dimitrov-adrian Date: 2010-10-17 19:25:27 +0000 (Sun, 17 Oct 2010) Log Message: ----------- Treebrowser: Fixed order of includes with gio.h (Patch by Enrico Troger) Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-10-17 16:56:45 UTC (rev 1673) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-17 19:25:27 UTC (rev 1674) @@ -39,6 +39,13 @@ 17-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c + Fixed order of includes with gio.h + (Patch by Enrico Troger) + + +17-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c Fixed memory leaks (Patch by Colomban Wendling) Fixed missing GIcon compilation error in gtk versions before 2.14 Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-17 16:56:45 UTC (rev 1673) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-17 19:25:27 UTC (rev 1674) @@ -10,12 +10,13 @@ #include <glib.h> #include <glib/gstdio.h> +#include "geany.h" +#include "geanyplugin.h" + #ifdef HAVE_GIO # include <gio/gio.h> #endif -#include "geany.h" -#include "geanyplugin.h" /* These items are set by Geany before plugin_init() is called. */ GeanyPlugin *geany_plugin; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1673] trunk/geany-plugins/treebrowser/src/ treebrowser.c
by dimitrov-adrian＠users.sourceforge.net 17 Oct '10

17 Oct '10

Revision: 1673 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1673&view=rev Author: dimitrov-adrian Date: 2010-10-17 16:56:45 +0000 (Sun, 17 Oct 2010) Log Message: ----------- treebrowser: correct GTK version check Modified Paths: -------------- trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-17 16:41:46 UTC (rev 1672) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-17 16:56:45 UTC (rev 1673) @@ -185,7 +185,7 @@ static GdkPixbuf * utils_pixbuf_from_path(gchar *path) { -#if defined(HAVE_GIO) && GLIB_CHECK_VERSION(2, 14, 0) +#if defined(HAVE_GIO) && GTK_CHECK_VERSION(2, 14, 0) GIcon *icon; GdkPixbuf *ret = NULL; GtkIconInfo *info; @@ -1426,8 +1426,9 @@ ui_widget_modify_font_from_string(view, geany->interface_prefs->tagbar_font); - if (gtk_check_version(2, 12, 0) == NULL) +#if GTK_CHECK_VERSION(2, 10, 0) g_object_set(view, "has-tooltip", TRUE, "tooltip-column", TREEBROWSER_COLUMN_URI, NULL); +#endif gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)), GTK_SELECTION_SINGLE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1672] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 17 Oct '10

17 Oct '10

Revision: 1672 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1672&view=rev Author: dimitrov-adrian Date: 2010-10-17 16:41:46 +0000 (Sun, 17 Oct 2010) Log Message: ----------- ... Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/README Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-10-17 16:25:12 UTC (rev 1671) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-17 16:41:46 UTC (rev 1672) @@ -3,7 +3,7 @@ +---------------------------+ (FIXED) http://sourceforge.net/tracker/?func=detail&aid=3034450&group_id=222729&ati… - * CRYTICAL warning when unloading the plugin + (FIXED) CRYTICAL warning when unloading the plugin "CRITICAL : g_object_ref: assertion `object->ref_count > 0' failed" (FIXED) Double click on bookmarks, do nothing (FIXED) show/hide hidden files not working on Windows @@ -17,9 +17,7 @@ (DONE) codestyle improve to be same as other parts as geany`s (DONE) configuration dialog (DONE) tracking path to current focused document (work only for refreshed directories) - * Better tracking for files, when they are not cached, open path to them * In windows can choice between devices (C:\, D:\,...) - * Language files (DONE) Saving state of Showbars in config file everytime where is changed (DONE) oneclick document opening (DONE) filter separating ex.: "*.c;*.cpp;*.h" @@ -47,6 +45,7 @@ Fixed some compilation warnings on unused variables Fixed translation string _("Empty") to be _("(Empty)") + 17-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c @@ -59,9 +58,17 @@ * src/treebrowser.c Fixed gio troubles (BIG THANKS TO Colomban Wendling) + +16-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c Fixed unref data in utils_pixbuf_from_path() Changed default icon for bookmarks to GTK_STOCK_HOME + +16-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c Added new option to show mime-type icons (can be configured by the preferences) (Idea from Colomban Wendling`s mail) Modified: trunk/geany-plugins/treebrowser/README =================================================================== --- trunk/geany-plugins/treebrowser/README 2010-10-17 16:25:12 UTC (rev 1671) +++ trunk/geany-plugins/treebrowser/README 2010-10-17 16:41:46 UTC (rev 1672) @@ -26,6 +26,7 @@ * Basic filesystem functionality * GTK bookmarks support * Filters in browser + * Show content-type icons Requirements @@ -42,6 +43,18 @@ Tools->Plugin Manager and set checkbox at treebrowser plugin +Download +======== + +treebrowser is part of the combined Geany Plugins release. For more information and downloads, please visit http://plugins.geany.org/geany-plugins/ + + +Development Code +================ + +svn co http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-… + + License ======= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1671] trunk/geany-plugins/treebrowser/src/ treebrowser.c
by dimitrov-adrian＠users.sourceforge.net 17 Oct '10

17 Oct '10

Revision: 1671 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1671&view=rev Author: dimitrov-adrian Date: 2010-10-17 16:25:12 +0000 (Sun, 17 Oct 2010) Log Message: ----------- Treebrowser: ... Modified Paths: -------------- trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-17 16:10:50 UTC (rev 1670) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-17 16:25:12 UTC (rev 1671) @@ -34,7 +34,7 @@ static GtkTreeIter bookmarks_iter; static gboolean bookmarks_expanded = FALSE; -static GtkTreeViewColumn *treeview_column_icon, *treeview_column_text; +static GtkTreeViewColumn *treeview_column_text; static GtkCellRenderer *render_icon, *render_text; /* ------------------ @@ -473,7 +473,6 @@ TREEBROWSER_COLUMN_NAME, _("(Empty)"), TREEBROWSER_COLUMN_URI, NULL, -1); - g_free(fname); } if (has_parent) @@ -637,7 +636,6 @@ if (g_file_test(root, G_FILE_TEST_IS_DIR)) { - dir = g_dir_open (root, 0, NULL); if (!dir) @@ -1408,7 +1406,6 @@ GtkWidget *view; view = gtk_tree_view_new(); - treeview_column_icon = gtk_tree_view_column_new(); treeview_column_text = gtk_tree_view_column_new(); render_icon = gtk_cell_renderer_pixbuf_new(); render_text = gtk_cell_renderer_text_new(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1670] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 17 Oct '10

17 Oct '10

Revision: 1670 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1670&view=rev Author: dimitrov-adrian Date: 2010-10-17 16:10:50 +0000 (Sun, 17 Oct 2010) Log Message: ----------- Treebrowser: Fixed translation string _("Empty") to be _("(Empty)") Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-10-17 15:31:31 UTC (rev 1669) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-17 16:10:50 UTC (rev 1670) @@ -44,6 +44,8 @@ Fixed memory leaks (Patch by Colomban Wendling) Fixed missing GIcon compilation error in gtk versions before 2.14 + Fixed some compilation warnings on unused variables + Fixed translation string _("Empty") to be _("(Empty)") 17-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-17 15:31:31 UTC (rev 1669) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-17 16:10:50 UTC (rev 1670) @@ -433,12 +433,9 @@ TREEBROWSER_COLUMN_URI, uri, -1); gtk_tree_store_prepend(treestore, &iter_empty, &iter); - /* FIXME: why not simply _("(Empty)")? is this really better for translators? - * this would also avoid the need to duplicate the string */ - setptr(fname, g_strdup_printf("(%s)", _("Empty"))); gtk_tree_store_set(treestore, &iter_empty, TREEBROWSER_COLUMN_ICON, NULL, - TREEBROWSER_COLUMN_NAME, fname, + TREEBROWSER_COLUMN_NAME, _("(Empty)"), TREEBROWSER_COLUMN_URI, NULL, -1); } @@ -464,19 +461,16 @@ g_object_unref(icon); } g_free(utf8_name); - g_free(fname); g_free(uri); + g_free(fname); } - } else { gtk_tree_store_prepend(treestore, &iter_empty, parent); - /* see FIXME above */ - fname = g_strdup_printf("(%s)", _("Empty")); gtk_tree_store_set(treestore, &iter_empty, TREEBROWSER_COLUMN_ICON, NULL, - TREEBROWSER_COLUMN_NAME, fname, + TREEBROWSER_COLUMN_NAME, _("(Empty)"), TREEBROWSER_COLUMN_URI, NULL, -1); g_free(fname); @@ -574,11 +568,9 @@ if (icon) g_object_unref(icon); gtk_tree_store_append(treestore, &iter, &iter); - /* see above for same strange thing */ - setptr(path_full, g_strdup_printf("(%s)", _("Empty"))); gtk_tree_store_set(treestore, &iter, TREEBROWSER_COLUMN_ICON, NULL, - TREEBROWSER_COLUMN_NAME, path_full, + TREEBROWSER_COLUMN_NAME, _("(Empty)"), TREEBROWSER_COLUMN_URI, NULL, -1); } @@ -649,9 +641,13 @@ dir = g_dir_open (root, 0, NULL); if (!dir) + { if (delete_root) + { g_remove(root); + } else return; + } name = g_dir_read_name (dir); while (name != NULL) @@ -711,9 +707,8 @@ { GeanyDocument *doc = document_get_current(); - gchar *path_current, *path_search = G_DIR_SEPARATOR_S; + gchar *path_current; gchar **path_segments; - gint i; if (doc != NULL && doc->file_name != NULL && g_path_is_absolute(doc->file_name)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1669] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 17 Oct '10

17 Oct '10

Revision: 1669 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1669&view=rev Author: dimitrov-adrian Date: 2010-10-17 15:31:31 +0000 (Sun, 17 Oct 2010) Log Message: ----------- Treebrowser: Fixed missing GIcon compilation error in gtk versions before 2.14; Fixed memory leaks (Patch by Colomban Wendling) Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-10-17 13:41:38 UTC (rev 1668) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-17 15:31:31 UTC (rev 1669) @@ -41,6 +41,13 @@ 17-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c + Fixed memory leaks + (Patch by Colomban Wendling) + Fixed missing GIcon compilation error in gtk versions before 2.14 + +17-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c Refactor a bit check_hidden() not to leak memory (Patch by Colomban Wendling) Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-17 13:41:38 UTC (rev 1668) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-17 15:31:31 UTC (rev 1669) @@ -155,10 +155,23 @@ * ------------------ */ +static gboolean +tree_view_row_expanded_iter(GtkTreeView *tree_view, GtkTreeIter *iter) +{ + GtkTreePath *tree_path; + gboolean expanded; + + tree_path = gtk_tree_model_get_path(gtk_tree_view_get_model(tree_view), &bookmarks_iter); + expanded = gtk_tree_view_row_expanded(tree_view, tree_path); + gtk_tree_path_free(tree_path); + + return expanded; +} + static GdkPixbuf * utils_pixbuf_from_stock(const gchar *stock_id) { - GtkIconSet *icon_set; + GtkIconSet *icon_set; icon_set = gtk_icon_factory_lookup_default(stock_id); @@ -172,7 +185,7 @@ static GdkPixbuf * utils_pixbuf_from_path(gchar *path) { -#ifdef HAVE_GIO +#if defined(HAVE_GIO) && GLIB_CHECK_VERSION(2, 14, 0) GIcon *icon; GdkPixbuf *ret = NULL; GtkIconInfo *info; @@ -210,6 +223,7 @@ const gchar *exts[] = {".o", ".obj", ".so", ".dll", ".a", ".lib"}; guint exts_len; const gchar *ext; + gboolean filtered; if (CONFIG_HIDE_OBJECT_FILES) { @@ -235,11 +249,18 @@ else i = 0; + filtered = CONFIG_REVERSE_FILTER || temporary_reverse ? TRUE : FALSE; for (; filters[i]; i++) + { if (utils_str_equal(base_name, "*") || g_pattern_match_simple(filters[i], base_name)) - return CONFIG_REVERSE_FILTER || temporary_reverse ? FALSE : TRUE; + { + filtered = CONFIG_REVERSE_FILTER || temporary_reverse ? FALSE : TRUE; + break; + } + } + g_strfreev(filters); - return CONFIG_REVERSE_FILTER || temporary_reverse ? TRUE : FALSE; + return filtered; } static gboolean @@ -287,8 +308,17 @@ GeanyDocument *doc = document_get_current(); if (doc != NULL && doc->file_name != NULL && g_path_is_absolute(doc->file_name)) - return utils_get_locale_from_utf8(g_path_get_dirname(doc->file_name)); + { + gchar *dir_name; + gchar *ret; + dir_name = g_path_get_dirname(doc->file_name); + ret = utils_get_locale_from_utf8(dir_name); + g_free (dir_name); + + return ret; + } + if (project) dir = project->base_path; else @@ -335,9 +365,9 @@ treebrowser_bookmarks_set_state(); gtk_tree_store_clear(treestore); - addressbar_last_address = directory; + setptr(addressbar_last_address, g_strdup(directory)); - treebrowser_browse(directory, NULL); + treebrowser_browse(addressbar_last_address, NULL); treebrowser_load_bookmarks(); } @@ -364,7 +394,7 @@ else parent = NULL; - if (has_parent && gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent))) + if (has_parent && tree_view_row_expanded_iter(GTK_TREE_VIEW(treeview), parent)) { expanded = TRUE; treebrowser_bookmarks_set_state(); @@ -384,6 +414,8 @@ if (check_hidden(uri)) { + GdkPixbuf *icon = NULL; + if (is_dir) { if (last_dir_iter == NULL) @@ -394,15 +426,19 @@ gtk_tree_iter_free(last_dir_iter); } last_dir_iter = gtk_tree_iter_copy(&iter); + icon = CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY) : NULL; gtk_tree_store_set(treestore, &iter, - TREEBROWSER_COLUMN_ICON, CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY) : NULL, + TREEBROWSER_COLUMN_ICON, icon, TREEBROWSER_COLUMN_NAME, fname, TREEBROWSER_COLUMN_URI, uri, -1); gtk_tree_store_prepend(treestore, &iter_empty, &iter); + /* FIXME: why not simply _("(Empty)")? is this really better for translators? + * this would also avoid the need to duplicate the string */ + setptr(fname, g_strdup_printf("(%s)", _("Empty"))); gtk_tree_store_set(treestore, &iter_empty, TREEBROWSER_COLUMN_ICON, NULL, - TREEBROWSER_COLUMN_NAME, g_strdup_printf("(%s)", _("Empty")), + TREEBROWSER_COLUMN_NAME, fname, TREEBROWSER_COLUMN_URI, NULL, -1); } @@ -410,19 +446,24 @@ { if (check_filtered(utf8_name)) { + icon = CONFIG_SHOW_ICONS == 2 + ? utils_pixbuf_from_path(uri) + : CONFIG_SHOW_ICONS + ? utils_pixbuf_from_stock(GTK_STOCK_FILE) + : NULL; gtk_tree_store_append(treestore, &iter, parent); gtk_tree_store_set(treestore, &iter, - TREEBROWSER_COLUMN_ICON, CONFIG_SHOW_ICONS == 2 - ? utils_pixbuf_from_path(uri) - : CONFIG_SHOW_ICONS - ? utils_pixbuf_from_stock(GTK_STOCK_FILE) - : NULL, + TREEBROWSER_COLUMN_ICON, icon, TREEBROWSER_COLUMN_NAME, fname, TREEBROWSER_COLUMN_URI, uri, -1); } } + + if (icon) + g_object_unref(icon); } + g_free(utf8_name); g_free(fname); g_free(uri); } @@ -431,11 +472,14 @@ else { gtk_tree_store_prepend(treestore, &iter_empty, parent); + /* see FIXME above */ + fname = g_strdup_printf("(%s)", _("Empty")); gtk_tree_store_set(treestore, &iter_empty, TREEBROWSER_COLUMN_ICON, NULL, - TREEBROWSER_COLUMN_NAME, g_strdup_printf("(%s)", _("Empty")), + TREEBROWSER_COLUMN_NAME, fname, TREEBROWSER_COLUMN_URI, NULL, -1); + g_free(fname); } if (has_parent) @@ -446,13 +490,15 @@ else treebrowser_load_bookmarks(); + g_free(directory); + } static void treebrowser_bookmarks_set_state() { if (gtk_tree_store_iter_is_valid(treestore, &bookmarks_iter)) - bookmarks_expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter)); + bookmarks_expanded = tree_view_row_expanded_iter(GTK_TREE_VIEW(treeview), &bookmarks_iter); else bookmarks_expanded = FALSE; } @@ -461,7 +507,6 @@ treebrowser_load_bookmarks() { gchar *bookmarks; - GError *error = NULL; gchar *contents, *path_full; gchar **lines, **line; GtkTreeIter iter; @@ -473,21 +518,24 @@ return; bookmarks = g_build_filename(g_get_home_dir(), ".gtk-bookmarks", NULL); - if (g_file_get_contents(bookmarks, &contents, NULL, &error)) + if (g_file_get_contents(bookmarks, &contents, NULL, NULL)) { if (gtk_tree_store_iter_is_valid(treestore, &bookmarks_iter)) { - bookmarks_expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter)); + bookmarks_expanded = tree_view_row_expanded_iter(GTK_TREE_VIEW(treeview), &bookmarks_iter); gtk_tree_store_iter_clear_nodes(&bookmarks_iter, FALSE); } else { gtk_tree_store_prepend(treestore, &bookmarks_iter, NULL); + icon = CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_HOME) : NULL; gtk_tree_store_set(treestore, &bookmarks_iter, - TREEBROWSER_COLUMN_ICON, CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_HOME) : NULL, + TREEBROWSER_COLUMN_ICON, icon, TREEBROWSER_COLUMN_NAME, _("Bookmarks"), TREEBROWSER_COLUMN_URI, NULL, -1); + if (icon) + g_object_unref(icon); gtk_tree_store_insert_after(treestore, &iter, NULL, &bookmarks_iter); gtk_tree_store_set(treestore, &iter, @@ -517,27 +565,37 @@ if (g_file_test(path_full, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) { gtk_tree_store_append(treestore, &iter, &bookmarks_iter); + icon = CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY) : NULL; gtk_tree_store_set(treestore, &iter, - TREEBROWSER_COLUMN_ICON, CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY) : NULL, + TREEBROWSER_COLUMN_ICON, icon, TREEBROWSER_COLUMN_NAME, g_basename(path_full), TREEBROWSER_COLUMN_URI, path_full, -1); + if (icon) + g_object_unref(icon); gtk_tree_store_append(treestore, &iter, &iter); + /* see above for same strange thing */ + setptr(path_full, g_strdup_printf("(%s)", _("Empty"))); gtk_tree_store_set(treestore, &iter, TREEBROWSER_COLUMN_ICON, NULL, - TREEBROWSER_COLUMN_NAME, g_strdup_printf("(%s)", _("Empty")), + TREEBROWSER_COLUMN_NAME, path_full, TREEBROWSER_COLUMN_URI, NULL, -1); } + g_free(path_full); } } g_strfreev(lines); g_free(contents); if (bookmarks_expanded) - gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter), FALSE); + { + GtkTreePath *tree_path; + + tree_path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter); + gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), tree_path, FALSE); + gtk_tree_path_free(tree_path); + } } - else - g_error_free(error); } static gboolean @@ -551,20 +609,24 @@ do { - gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, TREEBROWSER_COLUMN_URI, &uri_current, -1); - if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(treestore), &iter)) if (treebrowser_search(uri, &iter)) return TRUE; + gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, TREEBROWSER_COLUMN_URI, &uri_current, -1); + if (utils_str_equal(uri, uri_current) == TRUE) { path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); gtk_tree_view_expand_to_path(GTK_TREE_VIEW(treeview), path); gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(treeview), path, TREEBROWSER_COLUMN_ICON, FALSE, 0, 0); gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, treeview_column_text, FALSE); + gtk_tree_path_free(path); + g_free(uri_current); return TRUE; } + else + g_free(uri_current); } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(treestore), &iter)); @@ -598,6 +660,7 @@ if (g_file_test(path, G_FILE_TEST_IS_DIR)) fs_remove(path, delete_root); g_remove(path); + g_free(path); name = g_dir_read_name(dir); } } @@ -607,7 +670,6 @@ if (delete_root) g_remove(root); - g_free(path); return; } @@ -664,6 +726,9 @@ * NEED TO REWORK THE CONCEPT */ + g_strfreev(path_segments); + g_free(path_current); + return FALSE; } return FALSE; @@ -717,13 +782,21 @@ static void on_menu_go_up(GtkMenuItem *menuitem, gpointer *user_data) { - treebrowser_chroot(g_path_get_dirname(addressbar_last_address)); + gchar *uri; + + uri = g_path_get_dirname(addressbar_last_address); + treebrowser_chroot(uri); + g_free(uri); } static void on_menu_current_path(GtkMenuItem *menuitem, gpointer *user_data) { - treebrowser_chroot(get_default_dir()); + gchar *uri; + + uri = get_default_dir(); + treebrowser_chroot(uri); + g_free(uri); } static void @@ -764,9 +837,11 @@ if (g_file_test(uri, G_FILE_TEST_EXISTS)) uri = g_file_test(uri, G_FILE_TEST_IS_DIR) ? g_strdup(uri) : g_path_get_dirname(uri); else - uri = addressbar_last_address; + uri = g_strdup(addressbar_last_address); g_spawn_async(uri, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); + g_free(uri); + g_free(argv[0]); } static void @@ -782,7 +857,7 @@ GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); GtkTreeIter iter; GtkTreeModel *model; - gchar *uri, *uri_new; + gchar *uri, *uri_new = NULL; GtkTreePath *path_parent; gboolean refresh_root = FALSE; @@ -791,7 +866,7 @@ gtk_tree_model_get(model, &iter, TREEBROWSER_COLUMN_URI, &uri, -1); if (! g_file_test(uri, G_FILE_TEST_IS_DIR)) { - uri = g_path_get_dirname(uri); + setptr(uri, g_path_get_dirname(uri)); path_parent = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); if (gtk_tree_path_up(path_parent) && gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path_parent)); @@ -802,37 +877,35 @@ else { refresh_root = TRUE; - uri = addressbar_last_address; + uri = g_strdup(addressbar_last_address); } if (utils_str_equal(type, "directory")) uri_new = g_strconcat(uri, G_DIR_SEPARATOR_S, _("NewDirectory"), NULL); - else - if (utils_str_equal(type, "file")) - uri_new = g_strconcat(uri, G_DIR_SEPARATOR_S, _("NewFile"), NULL); - else - return; + else if (utils_str_equal(type, "file")) + uri_new = g_strconcat(uri, G_DIR_SEPARATOR_S, _("NewFile"), NULL); - while(g_file_test(uri_new, G_FILE_TEST_EXISTS)) - uri_new = g_strconcat(uri_new, "_", NULL); + if (uri_new) + { + gboolean creation_success = FALSE; - if (utils_str_equal(type, "directory")) - { - if (g_mkdir(uri_new, 0755) == 0) - treebrowser_browse(uri, refresh_root ? NULL : &iter); + while(g_file_test(uri_new, G_FILE_TEST_EXISTS)) + setptr(uri_new, g_strconcat(uri_new, "_", NULL)); + + if (utils_str_equal(type, "directory")) + creation_success = (g_mkdir(uri_new, 0755) == 0); else - return; - } - else - { - if (g_creat(uri_new, 0755) != -1) + creation_success = (g_creat(uri_new, 0755) != -1); + + if (creation_success) + { treebrowser_browse(uri, refresh_root ? NULL : &iter); - else - return; + if (treebrowser_search(uri_new, NULL)) + treebrowser_rename_current(); + } + g_free(uri_new); } - - if (treebrowser_search(uri_new, NULL)) - treebrowser_rename_current(); + g_free(uri); } static void @@ -856,24 +929,27 @@ gtk_tree_model_get(model, &iter, TREEBROWSER_COLUMN_URI, &uri, -1); - if (! dialogs_show_question(_("Do you really want to delete '%s' ?"), uri)) - return; + if (dialogs_show_question(_("Do you really want to delete '%s' ?"), uri)) + { + if (CONFIG_ON_DELETE_CLOSE_FILE && !g_file_test(uri, G_FILE_TEST_IS_DIR)) + document_close(document_find_by_filename(uri)); - if (CONFIG_ON_DELETE_CLOSE_FILE && !g_file_test(uri, G_FILE_TEST_IS_DIR)) - document_close(document_find_by_filename(uri)); - - uri_parent = g_path_get_dirname(uri); - fs_remove(uri, TRUE); - path_parent = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); - if (gtk_tree_path_up(path_parent)) - { - if (gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path_parent)) - treebrowser_browse(uri_parent, &iter); + uri_parent = g_path_get_dirname(uri); + fs_remove(uri, TRUE); + path_parent = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); + if (gtk_tree_path_up(path_parent)) + { + if (gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path_parent)) + treebrowser_browse(uri_parent, &iter); + else + treebrowser_browse(uri_parent, NULL); + } else treebrowser_browse(uri_parent, NULL); + gtk_tree_path_free(path_parent); + g_free(uri_parent); } - else - treebrowser_browse(uri_parent, NULL); + g_free(uri); } static void @@ -889,6 +965,7 @@ gtk_tree_model_get(model, &iter, TREEBROWSER_COLUMN_URI, &uri, -1); if (g_file_test(uri, G_FILE_TEST_IS_DIR)) treebrowser_browse(uri, &iter); + g_free(uri); } else treebrowser_browse(addressbar_last_address, NULL); @@ -1057,7 +1134,11 @@ static void on_button_go_up() { - treebrowser_chroot(g_path_get_dirname(addressbar_last_address)); + gchar *uri; + + uri = g_path_get_dirname(addressbar_last_address); + treebrowser_chroot(uri); + g_free(uri); } static void @@ -1069,13 +1150,21 @@ static void on_button_go_home() { - treebrowser_chroot(g_strdup(g_get_home_dir())); + gchar *uri; + + uri = g_strdup(g_get_home_dir()); + treebrowser_chroot(uri); + g_free(uri); } static void on_button_current_path() { - treebrowser_chroot(get_default_dir()); + gchar *uri; + + uri = get_default_dir(); + treebrowser_chroot(uri); + g_free(uri); } static void @@ -1131,6 +1220,9 @@ gchar *name = "", *uri = ""; if (gtk_tree_selection_get_selected(selection, &model, &iter)) + /* FIXME: name and uri should be freed, but they are passed to create_popup_menu() + * that pass them directly to some callbacks, so we can't free them here for now. + * Gotta find a way out... */ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, TREEBROWSER_COLUMN_NAME, &name, TREEBROWSER_COLUMN_URI, &uri, @@ -1157,7 +1249,7 @@ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, TREEBROWSER_COLUMN_URI, &uri, -1); - if (uri == FALSE) + if (uri == NULL) return; if (g_file_test(uri, G_FILE_TEST_EXISTS)) @@ -1170,6 +1262,8 @@ } else gtk_tree_store_iter_clear_nodes(&iter, TRUE); + + g_free(uri); } } @@ -1182,7 +1276,7 @@ gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path); gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, TREEBROWSER_COLUMN_URI, &uri, -1); - if (uri == FALSE) + if (uri == NULL) return; if (g_file_test (uri, G_FILE_TEST_IS_DIR)) @@ -1195,6 +1289,8 @@ gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path, FALSE); else document_open_file(uri, FALSE, NULL, NULL); + + g_free(uri); } static void @@ -1203,7 +1299,7 @@ gchar *uri; gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter, TREEBROWSER_COLUMN_URI, &uri, -1); - if (uri == FALSE) + if (uri == NULL) return; if (flag_on_expand_refresh == FALSE) @@ -1214,7 +1310,14 @@ flag_on_expand_refresh = FALSE; } if (CONFIG_SHOW_ICONS) - gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, utils_pixbuf_from_stock(GTK_STOCK_OPEN), -1); + { + GdkPixbuf *icon = utils_pixbuf_from_stock(GTK_STOCK_OPEN); + + gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, icon, -1); + g_object_unref(icon); + } + + g_free(uri); } static void @@ -1222,10 +1325,16 @@ { gchar *uri; gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter, TREEBROWSER_COLUMN_URI, &uri, -1); - if (uri == FALSE) + if (uri == NULL) return; if (CONFIG_SHOW_ICONS) - gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY), -1); + { + GdkPixbuf *icon = utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY); + + gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, icon, -1); + g_object_unref(icon); + } + g_free(uri); } static void @@ -1271,6 +1380,8 @@ if (document_close(document_find_by_filename(uri))) document_open_file(uri_new, FALSE, NULL, NULL); } + g_free(uri_new); + g_free(uri); } } } @@ -1489,7 +1600,11 @@ g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) + { + g_free(config_dir); + g_key_file_free(config); return FALSE; + } g_key_file_set_string(config, "treebrowser", "open_external_cmd", CONFIG_OPEN_EXTERNAL_CMD); g_key_file_set_boolean(config, "treebrowser", "reverse_filter", CONFIG_REVERSE_FILTER); @@ -1508,6 +1623,9 @@ utils_write_file(CONFIG_FILE, data); g_free(data); + g_free(config_dir); + g_key_file_free(config); + return TRUE; } @@ -1657,7 +1775,11 @@ static void project_change_cb(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *config, G_GNUC_UNUSED gpointer data) { - treebrowser_chroot(get_default_dir()); + gchar *uri; + + uri = get_default_dir(); + treebrowser_chroot(uri); + g_free(uri); } static void kb_activate(guint key_id) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1668] www/staging/TODO
by dmaphy＠users.sourceforge.net 17 Oct '10

17 Oct '10

Revision: 1668 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1668&view=rev Author: dmaphy Date: 2010-10-17 13:41:38 +0000 (Sun, 17 Oct 2010) Log Message: ----------- add TODO notes Added Paths: ----------- www/staging/TODO Added: www/staging/TODO =================================================================== --- www/staging/TODO (rev 0) +++ www/staging/TODO 2010-10-17 13:41:38 UTC (rev 1668) @@ -0,0 +1 @@ +* hilight current document in navigation sidebar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1667] www/staging/index.php
by dmaphy＠users.sourceforge.net 17 Oct '10

17 Oct '10

Revision: 1667 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1667&view=rev Author: dmaphy Date: 2010-10-17 13:36:29 +0000 (Sun, 17 Oct 2010) Log Message: ----------- website: use the rewrite rules also in static non-generated links in navigation sidebar Modified Paths: -------------- www/staging/index.php Modified: www/staging/index.php =================================================================== --- www/staging/index.php 2010-10-17 13:35:44 UTC (rev 1666) +++ www/staging/index.php 2010-10-17 13:36:29 UTC (rev 1667) @@ -60,16 +60,16 @@ <h1>Other Third-Party plugins</h1> <ul> - <li><a href="index.php?site=externdbg">externdbg</a></li> - <li><a href="index.php?site=geanyembrace">geanyembrace</a></li> - <li><a href="index.php?site=geany-mini-script">Geany Mini Script</a></li> + <li><a href="externdbg.html">externdbg</a></li> + <li><a href="geanyembrace.html">geanyembrace</a></li> + <li><a href="geany-mini-script.html">Geany Mini Script</a></li> </ul> <hr /> <ul> - <li><a href="index.php?site=downloads&hash=md5">Downloads</a></li> - <li><a href="index.php?site=install">Installation</a></li> + <li><a href="downloads.html">Downloads</a></li> + <li><a href="install.html">Installation</a></li> </ul> @@ -84,8 +84,8 @@ <hr /> <ul> - <li><a href="index.php?site=licensing">Licensing</a></li> - <li><a href="index.php?site=about">About</a></li> + <li><a href="licensing.html">Licensing</a></li> + <li><a href="about.html">About</a></li> </ul> <hr /> @@ -97,7 +97,7 @@ <hr /> <ul> - <li><a href="index.php?site=README">List or update a plugin</a></li> + <li><a href="README.html">List or update a plugin</a></li> </ul> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits October 2010