GNOME.org
 

Re: More patches

Hi Michael,

I just committed your changes (see the attached patches).

Thanks,

Jeroen


On Thu, 2003-01-16 at 18:15, Michael Karcher wrote:
> 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
-- 
Jeroen Zwartepoorte <jeroen xs4all nl>

? gbf.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-build/ChangeLog,v
retrieving revision 1.123
diff -u -r1.123 ChangeLog
--- ChangeLog	21 Jan 2003 00:19:23 -0000	1.123
+++ ChangeLog	25 Jan 2003 10:40:51 -0000
@@ -1,3 +1,9 @@
+2003-01-25  Michael Karcher <karcher physik fu-berlin de>
+
+	* src/controls/gbf-build-info.c: (build_callback),
+	(create_tag_table), (error_link_cb): Separators (U+FEFF) between
+	errors/warnings; fixed copy and paste errors.
+
 2003-01-21  Kjartan Maraas  <kmaraas gnome org>
 
 	* configure.in (ALL_LINGUAS): Added "no".
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	25 Jan 2003 10:40:53 -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);
 	}

? changes.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/anjuta2/ChangeLog,v
retrieving revision 1.248
diff -u -r1.248 ChangeLog
--- ChangeLog	24 Jan 2003 14:22:21 -0000	1.248
+++ ChangeLog	25 Jan 2003 10:36:04 -0000
@@ -1,3 +1,11 @@
+2003-01-25  Michael Karcher  <karcher physik fu-berlin de>
+
+	* plugins/document-manager/anjuta-document.c: (activate_component):
+	Handle Bonobo controls without property bag correctly.
+	* src/anjuta.c: (main): Added bind_textdomain_charset to UTF-8.
+	* src/layout.xml: Exchanged ProjectFileTree and ProjectTargetTree for
+	ProjectView in default layout.
+
 2003-01-24  Jeroen Zwartepoorte  <jeroen xs4all nl>
 
 	* Anjuta2.desktop.in:
Index: plugins/document-manager/anjuta-document.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/document-manager/anjuta-document.c,v
retrieving revision 1.51
diff -u -r1.51 anjuta-document.c
--- plugins/document-manager/anjuta-document.c	7 Jan 2003 05:07:04 -0000	1.51
+++ plugins/document-manager/anjuta-document.c	25 Jan 2003 10:36:05 -0000
@@ -577,32 +577,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;
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 Jan 2003 10:36:06 -0000
@@ -120,6 +120,7 @@
 
 	/* Internationalization */
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
+	bind_textdomain_codeset (PACKAGE, "UTF-8");
 	textdomain (PACKAGE);
 	
 	program = gnome_program_init (PACKAGE, VERSION, 
Index: src/layout.xml
===================================================================
RCS file: /cvs/gnome/anjuta2/src/layout.xml,v
retrieving revision 1.7
diff -u -r1.7 layout.xml
--- src/layout.xml	9 Jun 2002 00:52:38 -0000	1.7
+++ src/layout.xml	25 Jan 2003 10:36:06 -0000
@@ -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>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]