SF.net SVN: geany-plugins:[1670] trunk/geany-plugins/treebrowser

[dimitrov-adrian at users.sourceforge.net]

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 at 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.