[Goodies-commits] r5697 - xfce4-dict/trunk/lib

Enrico Troeger enrico at xfce.org
Sun Oct 19 11:30:01 CEST 2008


Author: enrico
Date: 2008-10-19 09:30:01 +0000 (Sun, 19 Oct 2008)
New Revision: 5697

Modified:
   xfce4-dict/trunk/lib/aspell.c
   xfce4-dict/trunk/lib/common.h
   xfce4-dict/trunk/lib/dictd.c
   xfce4-dict/trunk/lib/gui.c
Log:
Do not store tag pointers, instead reference them by name.

Modified: xfce4-dict/trunk/lib/aspell.c
===================================================================
--- xfce4-dict/trunk/lib/aspell.c	2008-10-19 09:29:58 UTC (rev 5696)
+++ xfce4-dict/trunk/lib/aspell.c	2008-10-19 09:30:01 UTC (rev 5697)
@@ -86,8 +86,8 @@
 
 				gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
 				tmp = g_strdup_printf(_("Suggestions for \"%s\":"), iod->word);
-				gtk_text_buffer_insert_with_tags(
-					dd->main_textbuffer, &dd->textiter, tmp, -1, dd->main_tag_bold, NULL);
+				gtk_text_buffer_insert_with_tags_by_name(
+					dd->main_textbuffer, &dd->textiter, tmp, -1, "bold", NULL);
 				g_free(tmp);
 				gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
 

Modified: xfce4-dict/trunk/lib/common.h
===================================================================
--- xfce4-dict/trunk/lib/common.h	2008-10-19 09:29:58 UTC (rev 5696)
+++ xfce4-dict/trunk/lib/common.h	2008-10-19 09:30:01 UTC (rev 5697)
@@ -93,8 +93,6 @@
 	GtkWidget *panel_entry;
 	GtkWidget *main_textview;
 	GtkTextBuffer *main_textbuffer;
-	GtkTextTag *main_tag_bold;
-	GtkTextTag *main_tag_indent;
 	GtkTextIter textiter;
 	GdkPixbuf *icon;
 } DictData;

Modified: xfce4-dict/trunk/lib/dictd.c
===================================================================
--- xfce4-dict/trunk/lib/dictd.c	2008-10-19 09:29:58 UTC (rev 5696)
+++ xfce4-dict/trunk/lib/dictd.c	2008-10-19 09:30:01 UTC (rev 5697)
@@ -207,8 +207,8 @@
 		dict_parts = g_strsplit(lines[i], "\"", -1);
 
 		if (g_strv_length(dict_parts) > 3)
-		{	gtk_text_buffer_insert_with_tags(dd->main_textbuffer, &dd->textiter,
-				g_strstrip(dict_parts[3]), -1, dd->main_tag_bold, NULL);
+		{	gtk_text_buffer_insert_with_tags_by_name(dd->main_textbuffer, &dd->textiter,
+				g_strstrip(dict_parts[3]), -1, "bold", NULL);
 
 			gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, " (", 2);
 			gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter,
@@ -246,8 +246,8 @@
 				}
 				else
 				{
-					gtk_text_buffer_insert_with_tags(dd->main_textbuffer, &dd->textiter,
-						stripped, -1, dd->main_tag_indent, NULL);
+					gtk_text_buffer_insert_with_tags_by_name(dd->main_textbuffer, &dd->textiter,
+						stripped, -1, "indent", NULL);
 				}
 				if (i < (max_lines - 1) && lines[i + 1][0] != '.')
 					gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);

Modified: xfce4-dict/trunk/lib/gui.c
===================================================================
--- xfce4-dict/trunk/lib/gui.c	2008-10-19 09:29:58 UTC (rev 5696)
+++ xfce4-dict/trunk/lib/gui.c	2008-10-19 09:30:01 UTC (rev 5697)
@@ -294,12 +294,12 @@
 	gtk_text_view_set_right_margin(GTK_TEXT_VIEW(dd->main_textview), 5);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(dd->main_textview), GTK_WRAP_WORD);
 	dd->main_textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(dd->main_textview));
-	dd->main_tag_bold = gtk_text_buffer_create_tag(dd->main_textbuffer,
+	gtk_text_buffer_create_tag(dd->main_textbuffer,
 			"bold",
 			"weight", PANGO_WEIGHT_BOLD,
 			"style", PANGO_STYLE_ITALIC,
 			"pixels-below-lines", 3, NULL);
-	dd->main_tag_indent = gtk_text_buffer_create_tag(dd->main_textbuffer,
+	gtk_text_buffer_create_tag(dd->main_textbuffer,
 			"indent", "indent", 10, NULL);
 
 	gtk_widget_show(dd->main_textview);




More information about the Goodies-commits mailing list