SF.net SVN: geany:[5149] branches/Geany-0_19_1

[ntrel at users.sourceforge.net]

Revision: 5149
          http://geany.svn.sourceforge.net/geany/?rev=5149&view=rev
Author:   ntrel
Date:     2010-08-12 12:51:51 +0000 (Thu, 12 Aug 2010)

Log Message:
-----------
r5116 | eht16 | 2010-08-05 22:13:47 +0100 (Thu, 05 Aug 2010) | 3 lines

Make ui_label_new_bold() a function.
Escape the name of the current document for markup when using
document name for menu items (closes #3038844).

Modified Paths:
--------------
    branches/Geany-0_19_1/ChangeLog
    branches/Geany-0_19_1/src/ui_utils.c
    branches/Geany-0_19_1/src/ui_utils.h

Modified: branches/Geany-0_19_1/ChangeLog
===================================================================
--- branches/Geany-0_19_1/ChangeLog	2010-08-12 12:40:20 UTC (rev 5148)
+++ branches/Geany-0_19_1/ChangeLog	2010-08-12 12:51:51 UTC (rev 5149)
@@ -1,3 +1,11 @@
+2010-08-05  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/ui_utils.c, src/ui_utils.h:
+   Make ui_label_new_bold() a function.
+   Escape the name of the current document for markup when using
+   document name for menu items (closes #3038844).
+
+
 2010-07-12  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/keybindings.c:

Modified: branches/Geany-0_19_1/src/ui_utils.c
===================================================================
--- branches/Geany-0_19_1/src/ui_utils.c	2010-08-12 12:40:20 UTC (rev 5148)
+++ branches/Geany-0_19_1/src/ui_utils.c	2010-08-12 12:51:51 UTC (rev 5149)
@@ -2198,6 +2198,18 @@
 }
 
 
+GtkWidget *ui_label_new_bold(const gchar *text)
+{
+	GtkWidget *label;
+	gchar *label_text;
+
+	label_text = g_markup_escape_text(text, -1);
+	label = ui_label_set_markup(GTK_LABEL(gtk_label_new(NULL)), "<b>%s</b>", label_text);
+	g_free(label_text);
+	return label;
+}
+
+
 /** Adds a list of document items to @a menu.
  * @param menu Menu.
  * @param active Which document to highlight, or @c NULL.
@@ -2211,7 +2223,7 @@
 	const GdkColor *color;
 	GeanyDocument *doc;
 	guint i, len;
-	gchar *base_name;
+	gchar *base_name, *label;
 
 	len = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
 	for (i = 0; i < len; i++)
@@ -2232,7 +2244,11 @@
 		gtk_widget_modify_fg(menu_item_label, GTK_STATE_ACTIVE, color);
 
 		if (doc == active)
-			ui_label_set_markup(GTK_LABEL(menu_item_label), "<b>%s</b>", base_name);
+		{
+			label = g_markup_escape_text(base_name, -1);
+			ui_label_set_markup(GTK_LABEL(menu_item_label), "<b>%s</b>", label);
+			g_free(label);
+		}
 
 		g_free(base_name);
 	}

Modified: branches/Geany-0_19_1/src/ui_utils.h
===================================================================
--- branches/Geany-0_19_1/src/ui_utils.h	2010-08-12 12:40:20 UTC (rev 5148)
+++ branches/Geany-0_19_1/src/ui_utils.h	2010-08-12 12:51:51 UTC (rev 5149)
@@ -208,8 +208,7 @@
 void ui_editable_insert_text_callback(GtkEditable *editable, gchar *new_text,
 									  gint new_text_len, gint *position, gpointer data);
 
-#define ui_label_new_bold(text)\
-	ui_label_set_markup(GTK_LABEL(gtk_label_new(NULL)), "<b>%s</b>", text);
+GtkWidget *ui_label_new_bold(const gchar *text);
 
 GtkWidget *ui_label_set_markup(GtkLabel *label, const gchar *format, ...) G_GNUC_PRINTF(2, 3);
 


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