Re: More patches

[Michael Karcher <karcher physik fu-berlin de>]

OK, patches as attachments including Changelog entries. This are the three
patches from the "more patches" mail as well as the patch from "Anjuta
document manager using not existing bags". Filenames start with the
CVS project the patch is for (3*anjuta, 1*gbf).

Michael Karcher

Changelog: Added bind_textdomain_charset to UTF-8.

Index: src/anjuta.c
===================================================================
RCS file: /cvs/gnome/anjuta2/src/anjuta.c,v
retrieving revision 1.43
diff -u -r1.43 anjuta.c
--- src/anjuta.c	15 Nov 2002 09:25:20 -0000	1.43
+++ src/anjuta.c	25 Dec 2002 22:49:23 -0000
@@ -120,6 +120,7 @@
 
 	/* Internationalization */
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
+	bind_textdomain_codeset (PACKAGE, "UTF-8");
 	textdomain (PACKAGE);
 	
 	program = gnome_program_init (PACKAGE, VERSION, 

Changelog:
Seperators (U+FEFF) between errors/warnings; fixed copy and paste errors.

Index: src/controls/gbf-build-info.c
===================================================================
RCS file: /cvs/gnome/gnome-build/src/controls/gbf-build-info.c,v
retrieving revision 1.19
diff -u -r1.19 gbf-build-info.c
--- src/controls/gbf-build-info.c	29 Dec 2002 19:45:08 -0000	1.19
+++ src/controls/gbf-build-info.c	12 Jan 2003 18:50:37 -0000
@@ -317,6 +317,10 @@
 							  &start,
 							  warn->output, strlen (warn->output),
 							  "warning", NULL);
+		gtk_text_buffer_get_end_iter (priv->buffer, &start);
+		/* Non-breaking zero-width space (aka byte order mark) to
+		   separate warnings */
+		gtk_text_buffer_insert(priv->buffer, &start, "\xEF\xBB\xBF",3);
 		break;
 	case GBF_BUILD_ERROR:
 		err = data;
@@ -327,6 +331,10 @@
 							  &start,
 							  err->output, strlen (err->output),
 							  "error", NULL);
+		gtk_text_buffer_get_end_iter (priv->buffer, &start);
+		/* Non-breaking zero-width space (aka byte order mark) to
+		   separate errors */
+		gtk_text_buffer_insert(priv->buffer, &start, "\xEF\xBB\xBF",3);
 		break;
 	}
 
@@ -365,7 +373,7 @@
 	g_object_set (G_OBJECT (tag), "underline", PANGO_UNDERLINE_SINGLE, NULL);
 	g_signal_connect (G_OBJECT (tag), "event", G_CALLBACK (error_link_cb), info);
 
-	/* Build warning. */
+	/* Build status. */
 	tag = gtk_text_tag_new ("status");
 	gtk_text_tag_table_add (table, tag);
 	g_object_set (G_OBJECT (tag), "foreground", "blue", NULL);
@@ -477,14 +485,14 @@
 
 		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (obj));
 		table = gtk_text_buffer_get_tag_table (buffer);
-		tag = gtk_text_tag_table_lookup (table, "warning");
+		tag = gtk_text_tag_table_lookup (table, "error");
 
 		gtk_text_iter_backward_to_tag_toggle (start_iter, tag);
 
 		offset = gtk_text_iter_get_offset (start_iter);
-		err = g_hash_table_lookup (info->priv->warnings, GINT_TO_POINTER (offset));
+		err = g_hash_table_lookup (info->priv->errors, GINT_TO_POINTER (offset));
 		g_assert (err != NULL);
-		g_signal_emit (G_OBJECT (info), info_signals [WARNING_SELECTED],
+		g_signal_emit (G_OBJECT (info), info_signals [ERROR_SELECTED],
 			       0, err->filename, err->line, NULL);
 		gtk_text_iter_free (start_iter);
 	}

Changelog:
Exchanged ProjectFileTree and ProjectTargetTree to ProjectView in default
layout.

--- anjuta2-cvs/src/layout.xml	Sun Jun  9 02:52:38 2002
+++ anjuta2/src/layout.xml	Mon Jan 13 00:15:35 2003
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <dock-layout>
   
-<layout name="__default__"><dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0"><paned orientation="horizontal" locked="no" position="200"><paned orientation="vertical" locked="no" position="244"><notebook orientation="horizontal" locked="no" page="0"><item name="ProjectFileTree" orientation="horizontal" locked="no"><placeholder name="ph_left" next-placement="center"/></item><item name="ProjectTargetTree" orientation="horizontal" locked="no"><placeholder name="ph_right" next-placement="center"/></item><item name="SymbolBrowser" orientation="horizontal" locked="no"/></notebook><notebook orientation="horizontal" locked="no" page="0"><item name="HelpIndex" orientation="horizontal" locked="no"/><item name="HelpSearch" orientation="horizontal" locked="no"/></notebook></paned><paned orientation="vertical" locked="no" position="325"><notebook orientation="horizontal" locked="no" page="0"><item name="DocumentManager" orientation="horizontal" locked="no"/><item name="HelpBrowser" orientation="horizontal" locked="no"/></notebook><item name="ProjectBuildInfo" orientation="horizontal" locked="no"><placeholder name="ph_bottom" next-placement="center"/><placeholder name="ph_top" next-placement="center"/></item></paned></paned></dock></layout></dock-layout>
+<layout name="__default__"><dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0"><paned orientation="horizontal" locked="no" position="200"><paned orientation="vertical" locked="no" position="244"><notebook orientation="horizontal" locked="no" page="0"><item name="ProjectView" orientation="horizontal" locked="no"><placeholder name="ph_left" next-placement="center"/></item><item name="SymbolBrowser" orientation="horizontal" locked="no"/></notebook><notebook orientation="horizontal" locked="no" page="0"><item name="HelpIndex" orientation="horizontal" locked="no"/><item name="HelpSearch" orientation="horizontal" locked="no"/></notebook></paned><paned orientation="vertical" locked="no" position="325"><notebook orientation="horizontal" locked="no" page="0"><item name="DocumentManager" orientation="horizontal" locked="no"/><item name="HelpBrowser" orientation="horizontal" locked="no"/></notebook><item name="ProjectBuildInfo" orientation="horizontal" locked="no"><placeholder name="ph_bottom" next-placement="center"/><placeholder name="ph_top" next-placement="center"/></item></paned></paned></dock></layout></dock-layout>

Changelog:
Handle Bonobo controls without property bag correctly.

--- plugins/document-manager/anjuta-document.c.orig	Mon Dec 16 13:58:55 2002
+++ plugins/document-manager/anjuta-document.c	Mon Dec 16 14:01:49 2002
@@ -576,32 +576,36 @@
 			(document->control_frame, &ev);
 		g_assert (!BONOBO_EX (&ev));
 
-		any = Bonobo_PropertyBag_getValue (bag, "dirty", &ev);
-		if (BONOBO_USER_EX (&ev, "IDL:Bonobo/PropertyBag/NotFound:1.0")) {
+		if (bag == CORBA_OBJECT_NIL) {
 			document->priv->supports_modified = FALSE;
 		} else {
-			Bonobo_EventSource source;
-			BonoboListener *listener;
+			any = Bonobo_PropertyBag_getValue (bag, "dirty", &ev);
+			if (BONOBO_USER_EX (&ev, "IDL:Bonobo/PropertyBag/NotFound:1.0")) {
+				document->priv->supports_modified = FALSE;
+			} else {
+				Bonobo_EventSource source;
+				BonoboListener *listener;
 
-			CORBA_free (any);
+				CORBA_free (any);
 
-			source = Bonobo_Unknown_queryInterface (bag,
-								"IDL:Bonobo/EventSource:1.0",
-								&ev);
+				source = Bonobo_Unknown_queryInterface (bag,
+									"IDL:Bonobo/EventSource:1.0",
+									&ev);
 
-			listener = bonobo_listener_new (anjuta_bonobo_document_dirty, document);
-			g_object_set_data (G_OBJECT (document), "DirtyListener", listener);
+				listener = bonobo_listener_new (anjuta_bonobo_document_dirty, document);
+				g_object_set_data (G_OBJECT (document), "DirtyListener", listener);
 
-			/* Register listener for "dirty" event. */
-			if (!CORBA_Object_is_nil (source, &ev) && ev._major == CORBA_NO_EXCEPTION) {
-				Bonobo_EventSource_addListenerWithMask (source,
-									BONOBO_OBJREF (listener),
-									"Bonobo/Property:change:dirty",
-									&ev);
-				g_assert (!BONOBO_EX (&ev));
-			}
+				/* Register listener for "dirty" event. */
+				if (!CORBA_Object_is_nil (source, &ev) && ev._major == CORBA_NO_EXCEPTION) {
+					Bonobo_EventSource_addListenerWithMask (source,
+										BONOBO_OBJREF (listener),
+										"Bonobo/Property:change:dirty",
+										&ev);
+					g_assert (!BONOBO_EX (&ev));
+				}
 
-			document->priv->supports_modified = TRUE;
+				document->priv->supports_modified = TRUE;
+			}
 		}
 
 		document->priv->current_component = component;