SF.net SVN: geany:[5046] branches/sm/src/ui_utils.c

statc at users.sourceforge.net statc at xxxxx
Thu Jun 17 21:38:44 UTC 2010


Revision: 5046
          http://geany.svn.sourceforge.net/geany/?rev=5046&view=rev
Author:   statc
Date:     2010-06-17 21:38:44 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
Incorrectly resolved a conflict in src/ui_utils.c at the last merge.  Fix that.

Modified Paths:
--------------
    branches/sm/src/ui_utils.c

Modified: branches/sm/src/ui_utils.c
===================================================================
--- branches/sm/src/ui_utils.c	2010-06-17 19:50:28 UTC (rev 5045)
+++ branches/sm/src/ui_utils.c	2010-06-17 21:38:44 UTC (rev 5046)
@@ -54,6 +54,7 @@
 #include "keyfile.h"
 #include "main.h"
 
+
 GeanyInterfacePrefs	interface_prefs;
 GeanyMainWidgets	main_widgets;
 
@@ -291,6 +292,10 @@
 		g_string_append(str, "] - ");
 	}
 	g_string_append(str, "Geany");
+	if (cl_options.new_instance)
+	{
+		g_string_append(str, _(" (new instance)"));
+	}
 	gtk_window_set_title(GTK_WINDOW(main_widgets.window), str->str);
 	g_string_free(str, TRUE);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the Commits mailing list