File glabels-2.0.4.patch of Package glabels
--- glabels-2.0.4/src/canvas-hacktext.c.xx 2006-09-05 09:11:07.000000000 +0200
+++ glabels-2.0.4/src/canvas-hacktext.c 2006-09-05 09:11:14.000000000 +0200
@@ -281,7 +281,6 @@
{
GnomeCanvasItem *item;
glCanvasHacktext *bp;
- char *text;
GnomeGlyphList * gl;
GdkColor color;
GnomeFont * font;
@@ -301,7 +300,7 @@
bp->priv->glyphlist = NULL;
}
- if (text) bp->text = g_value_dup_string (value);
+ if (value) bp->text = g_value_dup_string (value);
gnome_canvas_item_request_update (item);
break;
--- glabels-2.0.4/src/stock.c.xx 2006-09-05 09:15:29.000000000 +0200
+++ glabels-2.0.4/src/stock.c 2006-09-05 09:15:32.000000000 +0200
@@ -43,12 +43,12 @@
/* Local function prototypes */
/*===========================================*/
-static add_icons (GtkIconFactory *factory,
+static void add_icons (GtkIconFactory *factory,
const gchar *stock_id,
const guchar *inline_24,
const guchar *inline_16);
-static add_button_icon (GtkIconFactory *factory,
+static void add_button_icon (GtkIconFactory *factory,
const gchar *stock_id,
const guchar *inline_24);
@@ -140,7 +140,7 @@
/*--------------------------------------------------------------------------*/
/* PRIVATE. Unpack and associate given icons with stock_id. */
/*--------------------------------------------------------------------------*/
-static add_icons (GtkIconFactory *factory,
+static void add_icons (GtkIconFactory *factory,
const gchar *stock_id,
const guchar *inline_24,
const guchar *inline_16)
@@ -180,7 +180,7 @@
/*--------------------------------------------------------------------------*/
/* PRIVATE. Unpack and associate given button icon with stock_id. */
/*--------------------------------------------------------------------------*/
-static add_button_icon (GtkIconFactory *factory,
+static void add_button_icon (GtkIconFactory *factory,
const gchar *stock_id,
const guchar *inline_24)
{
--- glabels-2.0.4/src/view-text.c.xx 2006-09-05 09:15:39.000000000 +0200
+++ glabels-2.0.4/src/view-text.c 2006-09-05 09:15:59.000000000 +0200
@@ -959,5 +959,6 @@
glViewObject *view_object)
{
gl_debug (DEBUG_VIEW, "");
+ 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);
