Mailinglist Archive: opensuse-commit (1262 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package glabels
checked in at Sun Sep 10 23:46:23 CEST 2006.

--------
--- GNOME/glabels/glabels.changes	2006-09-05 09:21:48.000000000 +0200
+++ glabels/glabels.changes	2006-09-09 17:37:22.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Sep  9 17:37:12 CEST 2006 - meissner@xxxxxxx
+
+- fixed warnings caused by new return; checks.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ glabels.spec ++++++
--- /var/tmp/diff_new_pack.B7UkwF/_old	2006-09-10 23:46:03.000000000 +0200
+++ /var/tmp/diff_new_pack.B7UkwF/_new	2006-09-10 23:46:03.000000000 +0200
@@ -18,7 +18,7 @@
 Group:          Productivity/Office/Other
 Autoreqprov:    on
 Version:        2.0.4
-Release:        3
+Release:        4
 Summary:        A Label Editing and Printing Tool
 Source:         glabels-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -89,6 +89,8 @@
 %{prefix}/share/mime/subclasses
 
 %changelog -n glabels
+* Sat Sep 09 2006 - meissner@xxxxxxx
+- fixed warnings caused by new return; checks.
 * Tue Sep 05 2006 - meissner@xxxxxxx
 - use rpm_opt_flags. fixed resulting warnings.
 * Fri Sep 01 2006 - jhargadon@xxxxxxx

++++++ glabels-2.0.4.patch ++++++
--- /var/tmp/diff_new_pack.B7UkwF/_old	2006-09-10 23:46:03.000000000 +0200
+++ /var/tmp/diff_new_pack.B7UkwF/_new	2006-09-10 23:46:03.000000000 +0200
@@ -61,3 +61,210 @@
 +	return 0; /* right? */
  }
  
+--- glabels-2.0.4/src/view-line.c.xx	2006-09-09 16:35:30.000000000 +0200
++++ glabels-2.0.4/src/view-line.c	2006-09-09 16:36:46.000000000 +0200
+@@ -168,8 +168,8 @@
+ 	GnomeCanvasPoints *points;
+ 
+ 	gl_debug (DEBUG_VIEW, "START");
+-	g_return_if_fail (object && GL_IS_LABEL_LINE (object));
+-	g_return_if_fail (view && GL_IS_VIEW (view));
++	g_return_val_if_fail (object && GL_IS_LABEL_LINE (object), NULL);
++	g_return_val_if_fail (view && GL_IS_VIEW (view), NULL);
+ 	
+ 	view_line = g_object_new (gl_view_line_get_type(), NULL);
+ 
+--- glabels-2.0.4/src/label-object.c.xx	2006-09-09 16:36:58.000000000 +0200
++++ glabels-2.0.4/src/label-object.c	2006-09-09 16:37:49.000000000 +0200
+@@ -242,7 +242,7 @@
+ 
+ 	gl_debug (DEBUG_LABEL, "START");
+ 
+-	g_return_if_fail (src_object && GL_IS_LABEL_OBJECT (src_object));
++	g_return_val_if_fail (src_object && GL_IS_LABEL_OBJECT (src_object), NULL);
+ 
+ 	dst_object = g_object_new (G_OBJECT_TYPE(src_object), NULL);
+ 
+@@ -322,7 +322,7 @@
+ {
+ 	gl_debug (DEBUG_LABEL, "START");
+ 
+-	g_return_if_fail (object && GL_IS_LABEL_OBJECT (object));
++	g_return_val_if_fail (object && GL_IS_LABEL_OBJECT (object), NULL);
+ 
+ 	gl_debug (DEBUG_LABEL, "END");
+ 
+@@ -356,7 +356,7 @@
+ {
+ 	gl_debug (DEBUG_LABEL, "START");
+ 
+-	g_return_if_fail (object && GL_IS_LABEL_OBJECT (object));
++	g_return_val_if_fail (object && GL_IS_LABEL_OBJECT (object), NULL);
+ 
+ 	gl_debug (DEBUG_LABEL, "END");
+ 
+--- glabels-2.0.4/src/view.c.xx	2006-09-09 16:50:33.000000000 +0200
++++ glabels-2.0.4/src/view.c	2006-09-09 16:50:44.000000000 +0200
+@@ -2062,7 +2062,7 @@
+ 
+ 	gl_debug (DEBUG_VIEW, "START");
+ 
+-	g_return_if_fail (view && GL_IS_VIEW (view));
++	g_return_val_if_fail (view && GL_IS_VIEW (view), NULL);
+ 
+ 	if (!gl_view_is_selection_empty (view)) {
+ 
+@@ -3162,7 +3162,7 @@
+ }
+ 
+ /*---------------------------------------------------------------------------*/
+-/* PRIVATE.  Set canvas scale.                                               *
++/* PRIVATE.  Set canvas scale.                                               */
+ /*---------------------------------------------------------------------------*/
+ static void
+ set_zoom_real (glView          *view,
+--- glabels-2.0.4/src/view-highlight.c.xx	2006-09-09 17:07:38.000000000 +0200
++++ glabels-2.0.4/src/view-highlight.c	2006-09-09 17:07:47.000000000 +0200
+@@ -239,7 +239,7 @@
+ 
+ 	gl_debug (DEBUG_VIEW, "START");
+ 
+-	g_return_if_fail (view_object && GL_IS_VIEW_OBJECT(view_object));
++	g_return_val_if_fail (view_object && GL_IS_VIEW_OBJECT(view_object), NULL);
+ 
+ 	view   = gl_view_object_get_view (view_object);
+ 	object = gl_view_object_get_object (view_object);
+--- glabels-2.0.4/src/view-object.c.xx	2006-09-09 16:51:22.000000000 +0200
++++ glabels-2.0.4/src/view-object.c	2006-09-09 16:51:43.000000000 +0200
+@@ -267,7 +267,7 @@
+ {
+ 	gl_debug (DEBUG_VIEW, "START");
+ 
+-	g_return_if_fail (view_object && GL_IS_VIEW_OBJECT (view_object));
++	g_return_val_if_fail (view_object && GL_IS_VIEW_OBJECT (view_object), NULL);
+ 
+ 	gl_debug (DEBUG_VIEW, "END");
+ 
+@@ -282,7 +282,7 @@
+ {
+ 	gl_debug (DEBUG_VIEW, "START");
+ 
+-	g_return_if_fail (view_object && GL_IS_VIEW_OBJECT (view_object));
++	g_return_val_if_fail (view_object && GL_IS_VIEW_OBJECT (view_object), NULL);
+ 	
+ 	gl_debug (DEBUG_VIEW, "END");
+ 
+@@ -297,7 +297,7 @@
+ {
+ 	gl_debug (DEBUG_VIEW, "START");
+ 
+-	g_return_if_fail (view_object && GL_IS_VIEW_OBJECT (view_object));
++	g_return_val_if_fail (view_object && GL_IS_VIEW_OBJECT (view_object), NULL);
+ 	
+ 	gl_debug (DEBUG_VIEW, "END");
+ 
+--- glabels-2.0.4/src/view-ellipse.c.xx	2006-09-09 16:51:58.000000000 +0200
++++ glabels-2.0.4/src/view-ellipse.c	2006-09-09 16:53:32.000000000 +0200
+@@ -169,8 +169,8 @@
+ 	gdouble            w, h;
+ 
+ 	gl_debug (DEBUG_VIEW, "START");
+-	g_return_if_fail (object && GL_IS_LABEL_ELLIPSE (object));
+-	g_return_if_fail (view && GL_IS_VIEW (view));
++	g_return_val_if_fail (object && GL_IS_LABEL_ELLIPSE (object), NULL);
++	g_return_val_if_fail (view && GL_IS_VIEW (view), NULL);
+ 	
+ 	view_ellipse = g_object_new (gl_view_ellipse_get_type(), NULL);
+ 
+--- glabels-2.0.4/src/view-image.c.xx	2006-09-09 16:53:48.000000000 +0200
++++ glabels-2.0.4/src/view-image.c	2006-09-09 16:54:04.000000000 +0200
+@@ -170,8 +170,8 @@
+ 	gdouble            w, h;
+ 
+ 	gl_debug (DEBUG_VIEW, "START");
+-	g_return_if_fail (object && GL_IS_LABEL_IMAGE (object));
+-	g_return_if_fail (view && GL_IS_VIEW (view));
++	g_return_val_if_fail (object && GL_IS_LABEL_IMAGE (object), NULL);
++	g_return_val_if_fail (view && GL_IS_VIEW (view), NULL);
+ 	
+ 	view_image = g_object_new (gl_view_image_get_type(), NULL);
+ 
+--- glabels-2.0.4/src/view-text.c.xx	2006-09-09 17:06:52.000000000 +0200
++++ glabels-2.0.4/src/view-text.c	2006-09-09 17:07:05.000000000 +0200
+@@ -201,8 +201,8 @@
+ 	GnomeCanvasItem    *group;
+ 
+ 	gl_debug (DEBUG_VIEW, "START");
+-	g_return_if_fail (object && GL_IS_LABEL_TEXT (object));
+-	g_return_if_fail (view && GL_IS_VIEW (view));
++	g_return_val_if_fail (object && GL_IS_LABEL_TEXT (object), NULL);
++	g_return_val_if_fail (view && GL_IS_VIEW (view), NULL);
+ 	
+ 	view_text = g_object_new (gl_view_text_get_type(), NULL);
+ 
+--- glabels-2.0.4/src/view-barcode.c.xx	2006-09-09 17:07:15.000000000 +0200
++++ glabels-2.0.4/src/view-barcode.c	2006-09-09 17:07:23.000000000 +0200
+@@ -172,8 +172,8 @@
+ 	GtkMenu            *menu;
+ 
+ 	gl_debug (DEBUG_VIEW, "START");
+-	g_return_if_fail (object && GL_IS_LABEL_BARCODE (object));
+-	g_return_if_fail (view && GL_IS_VIEW (view));
++	g_return_val_if_fail (object && GL_IS_LABEL_BARCODE (object), NULL);
++	g_return_val_if_fail (view && GL_IS_VIEW (view), NULL);
+ 	
+ 	view_bc = g_object_new (gl_view_barcode_get_type(), NULL);
+ 
+--- glabels-2.0.4/src/label.c.xx	2006-09-09 17:08:52.000000000 +0200
++++ glabels-2.0.4/src/label.c	2006-09-09 17:09:10.000000000 +0200
+@@ -447,7 +447,7 @@
+ {
+ 	gl_debug (DEBUG_LABEL, "START");
+ 
+-	g_return_if_fail (label && GL_IS_LABEL (label));
++	g_return_val_if_fail (label && GL_IS_LABEL (label), NULL);
+ 
+ 	gl_debug (DEBUG_LABEL, "END");
+ 
+@@ -462,7 +462,7 @@
+ {
+ 	gl_debug (DEBUG_LABEL, "START");
+ 
+-	g_return_if_fail (label && GL_IS_LABEL (label));
++	g_return_val_if_fail (label && GL_IS_LABEL (label), FALSE);
+ 
+ 	gl_debug (DEBUG_LABEL, "END");
+ 
+@@ -534,7 +534,7 @@
+ {
+ 	gl_debug (DEBUG_LABEL, "START");
+ 
+-	g_return_if_fail (label && GL_IS_LABEL (label));
++	g_return_val_if_fail (label && GL_IS_LABEL (label), NULL);
+ 
+ 	gl_debug (DEBUG_LABEL, "END");
+ 
+--- glabels-2.0.4/src/label-barcode.c.xx	2006-09-09 17:09:28.000000000 +0200
++++ glabels-2.0.4/src/label-barcode.c	2006-09-09 17:09:33.000000000 +0200
+@@ -351,7 +351,7 @@
+ {
+ 	glLabelBarcode *lbarcode = (glLabelBarcode *)object;
+ 
+-	g_return_if_fail (lbarcode && GL_IS_LABEL_BARCODE (lbarcode));
++	g_return_val_if_fail (lbarcode && GL_IS_LABEL_BARCODE (lbarcode), 0);
+ 
+ 	return lbarcode->private->color;
+ }
+--- glabels-2.0.4/src/view-box.c.xx	2006-09-09 17:26:14.000000000 +0200
++++ glabels-2.0.4/src/view-box.c	2006-09-09 17:26:28.000000000 +0200
+@@ -169,8 +169,8 @@
+ 	gdouble            w, h;
+ 
+ 	gl_debug (DEBUG_VIEW, "START");
+-	g_return_if_fail (object && GL_IS_LABEL_BOX (object));
+-	g_return_if_fail (view && GL_IS_VIEW (view));
++	g_return_val_if_fail (object && GL_IS_LABEL_BOX (object), NULL);
++	g_return_val_if_fail (view && GL_IS_VIEW (view), NULL);
+ 	
+ 	view_box = g_object_new (gl_view_box_get_type(), NULL);
+ 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx