Attachment #41742 for bug #65233

View | Details | Raw Unified | Return to bug 65233
Collapse All | Expand All

Lines 6-13 Link Here

(-)mlview/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= mlview	8	PORTNAME= mlview
9	PORTVERSION= 0.6.1	9	PORTVERSION= 0.6.2
10	PORTREVISION= 1
11	CATEGORIES= editors gnome	10	CATEGORIES= editors gnome
12	MASTER_SITES= ${MASTER_SITE_GNOME}	11	MASTER_SITES= ${MASTER_SITE_GNOME}
13	MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6	12	MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6

Lines 1-2 Link Here

(-)mlview/distinfo (-2 / +2 lines)
1	MD5 (gnome2/mlview-0.6.1.tar.bz2) = a2f3b78faafc9dc8644c6c7e632de716	1	MD5 (gnome2/mlview-0.6.2.tar.bz2) = 0cbdd1b55f8ad7aa1769ddac38ffea9d
2	SIZE (gnome2/mlview-0.6.1.tar.bz2) = 437705	2	SIZE (gnome2/mlview-0.6.2.tar.bz2) = 451900




--- src/mlview-icon-tree.c.orig	Thu Nov 20 21:07:14 2003
+++ src/mlview-icon-tree.c	Sat Dec  6 20:52:53 2003
@@ -388,9 +388,11 @@
         guchar *result = NULL,
                 *content = NULL;
   
+        const gchar *colour_str;
+
         g_return_val_if_fail (a_node != NULL, NULL);
   
-        const gchar *colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
+        colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
   
         if (a_node->type == XML_ELEMENT_NODE) {
                 guchar *ns_prefix = NULL,




--- src/mlview-ns-editor.c.orig	Thu Nov 13 01:06:36 2003
+++ src/mlview-ns-editor.c	Sat Dec  6 20:51:10 2003
@@ -1063,12 +1063,6 @@
                             xmlNode *a_node,
                             xmlNs *a_ns)
 {
-        g_return_val_if_fail (a_this 
-                              && MLVIEW_IS_NS_EDITOR (a_this)
-                              && a_node
-                              && a_ns,
-                              MLVIEW_BAD_PARAM_ERROR) ;
-
         GtkTreeRowReference *row_ref = NULL ;
         GtkTreePath *tree_path = NULL ;
         GtkTreeIter iter = {0} ;
@@ -1076,6 +1070,12 @@
         gboolean is_ok = FALSE ;
         xmlNs *ns = NULL ;
         enum MlViewStatus status = MLVIEW_OK ;
+
+        g_return_val_if_fail (a_this 
+                              && MLVIEW_IS_NS_EDITOR (a_this)
+                              && a_node
+                              && a_ns,
+                              MLVIEW_BAD_PARAM_ERROR) ;
 
         if (PRIVATE (a_this)->cur_xml_node != a_node) {
                 return MLVIEW_OK ;                




--- src/mlview-tree-editor2.c.orig	Thu Nov 20 09:11:34 2003
+++ src/mlview-tree-editor2.c	Sat Dec  6 20:48:30 2003
@@ -760,9 +760,11 @@
         guchar *result = NULL,
                 *content = NULL;
 
+        const gchar *colour_str;
+	
         g_return_val_if_fail (a_node != NULL, NULL);
 
-        const gchar *colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
+        colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
 
         if (a_node->type == XML_ELEMENT_NODE) {
                 guchar *ns_prefix = NULL,

Lines 1-10 Link Here

(-)mlview/pkg-plist (-1 / +9 lines)
1	bin/mlv	1	bin/mlv
		2	etc/gconf/gconf.xml.defaults/apps/mlview/colours/%gconf.xml
2	etc/gconf/gconf.xml.defaults/apps/mlview/%gconf.xml	3	etc/gconf/gconf.xml.defaults/apps/mlview/%gconf.xml
		4	etc/gconf/gconf.xml.defaults/apps/%gconf.xml
		5	etc/gconf/gconf.xml.defaults/schemas/apps/mlview/colours/%gconf.xml
3	etc/gconf/gconf.xml.defaults/schemas/apps/mlview/%gconf.xml	6	etc/gconf/gconf.xml.defaults/schemas/apps/mlview/%gconf.xml
		7	etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml
		8	etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
4	etc/gconf/schemas/mlview.schemas	9	etc/gconf/schemas/mlview.schemas
5	lib/libmlview.a	10	lib/libmlview.a
6	lib/libmlview.so	11	lib/libmlview.so
7	lib/libmlview.so.3	12	lib/libmlview.so.4
8	share/gnome/applications/mlview.desktop	13	share/gnome/applications/mlview.desktop
9	share/gnome/mlview/mlview-dtd-choice.glade	14	share/gnome/mlview/mlview-dtd-choice.glade
10	share/gnome/mlview/mlview-dtd-choice-dtd-not-resolved.glade	15	share/gnome/mlview/mlview-dtd-choice-dtd-not-resolved.glade
Lines 22-27 Link Here
22	share/locale/az/LC_MESSAGES/mlview.mo	27	share/locale/az/LC_MESSAGES/mlview.mo
23	share/locale/ca/LC_MESSAGES/mlview.mo	28	share/locale/ca/LC_MESSAGES/mlview.mo
24	share/locale/cs/LC_MESSAGES/mlview.mo	29	share/locale/cs/LC_MESSAGES/mlview.mo
		30	share/locale/de/LC_MESSAGES/mlview.mo
25	share/locale/es/LC_MESSAGES/mlview.mo	31	share/locale/es/LC_MESSAGES/mlview.mo
26	share/locale/fr/LC_MESSAGES/mlview.mo	32	share/locale/fr/LC_MESSAGES/mlview.mo
27	share/locale/ja/LC_MESSAGES/mlview.mo	33	share/locale/ja/LC_MESSAGES/mlview.mo
Lines 36-40 Link Here
36	share/locale/sr@Latn/LC_MESSAGES/mlview.mo	42	share/locale/sr@Latn/LC_MESSAGES/mlview.mo
37	share/locale/sv/LC_MESSAGES/mlview.mo	43	share/locale/sv/LC_MESSAGES/mlview.mo
38	@dirrm share/gnome/mlview	44	@dirrm share/gnome/mlview
		45	@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mlview/colours
39	@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mlview	46	@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mlview
		47	@dirrm etc/gconf/gconf.xml.defaults/apps/mlview/colours
40	@dirrm etc/gconf/gconf.xml.defaults/apps/mlview	48	@dirrm etc/gconf/gconf.xml.defaults/apps/mlview

Return to bug 65233

Lines 1-15 Link Here

(-)mlview/files/patch-src-mlview-icon-tree.c (-15 lines)
1	--- src/mlview-icon-tree.c.orig Thu Nov 20 21:07:14 2003
2	+++ src/mlview-icon-tree.c Sat Dec 6 20:52:53 2003
3	@@ -388,9 +388,11 @@
4	guchar *result = NULL,
5	*content = NULL;
6
7	+ const gchar *colour_str;
8	+
9	g_return_val_if_fail (a_node != NULL, NULL);
10
11	- const gchar *colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
12	+ colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
13
14	if (a_node->type == XML_ELEMENT_NODE) {
15	guchar *ns_prefix = NULL,

Lines 1-28 Link Here

(-)mlview/files/patch-src-mlview-ns-editor.c (-28 lines)
1	--- src/mlview-ns-editor.c.orig Thu Nov 13 01:06:36 2003
2	+++ src/mlview-ns-editor.c Sat Dec 6 20:51:10 2003
3	@@ -1063,12 +1063,6 @@
4	xmlNode *a_node,
5	xmlNs *a_ns)
6	{
7	- g_return_val_if_fail (a_this
8	- && MLVIEW_IS_NS_EDITOR (a_this)
9	- && a_node
10	- && a_ns,
11	- MLVIEW_BAD_PARAM_ERROR) ;
12	-
13	GtkTreeRowReference *row_ref = NULL ;
14	GtkTreePath *tree_path = NULL ;
15	GtkTreeIter iter = {0} ;
16	@@ -1076,6 +1070,12 @@
17	gboolean is_ok = FALSE ;
18	xmlNs *ns = NULL ;
19	enum MlViewStatus status = MLVIEW_OK ;
20	+
21	+ g_return_val_if_fail (a_this
22	+ && MLVIEW_IS_NS_EDITOR (a_this)
23	+ && a_node
24	+ && a_ns,
25	+ MLVIEW_BAD_PARAM_ERROR) ;
26
27	if (PRIVATE (a_this)->cur_xml_node != a_node) {
28	return MLVIEW_OK ;

Lines 1-15 Link Here

(-)mlview/files/patch-src-mlview-tree-editor2.c (-15 lines)
1	--- src/mlview-tree-editor2.c.orig Thu Nov 20 09:11:34 2003
2	+++ src/mlview-tree-editor2.c Sat Dec 6 20:48:30 2003
3	@@ -760,9 +760,11 @@
4	guchar *result = NULL,
5	*content = NULL;
6
7	+ const gchar *colour_str;
8	+
9	g_return_val_if_fail (a_node != NULL, NULL);
10
11	- const gchar *colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
12	+ colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
13
14	if (a_node->type == XML_ELEMENT_NODE) {
15	guchar *ns_prefix = NULL,