2009-09-01 Jim Evins <evins@snaught.com>

	* data/builder/object-editor.builder:
		Fixed errant expansion of tab.
	* src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new):
	* src/bc-postnet.c: (gl_barcode_postnet_new):
	* src/bc.c: (id_to_index), (name_to_index):
	* src/label-barcode.c: (gl_label_barcode_set_props):
	* src/label-text.c: (set_font_family):
	* src/merge-properties-dialog.c:
	(gl_merge_properties_dialog_construct):
	* src/merge.c: (gl_merge_description_to_name):
	* src/new-label-dialog.c:
	* src/object-editor-edit-page.c:
	* src/object-editor-image-page.c: (update_preview_cb):
	* src/object-editor-lsize-page.c:
	* src/object-editor-position-page.c:
	* src/object-editor-size-page.c:
	* src/object-editor.c: (gl_object_editor_new):
	* src/prefs-dialog.c: (update_locale_page_from_prefs):
	* src/prefs-model.c: (string_to_units):
	* src/print-op.c: (create_custom_widget_cb):
	* src/template-designer.c: (gl_template_designer_init),
	(pg_size_page_changed_cb), (build_template):
	* src/ui-commands.c: (gl_ui_cmd_help_about):
	* src/xml-label.c: (xml_parse_pixdata):
		Fixed various deprecations as of Gtk-2.16.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@867 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 0c95edc19d8c0b35d681fd4fc92686fb69952472..bffc82fd3220fa6aeb8deadf5f6f955f1ca3088f 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,31 @@
+2009-09-01  Jim Evins  <evins@snaught.com>
+
+       * data/builder/object-editor.builder:
+               Fixed errant expansion of tab.
+       * src/bc-gnubarcode.c: (gl_barcode_gnubarcode_new):
+       * src/bc-postnet.c: (gl_barcode_postnet_new):
+       * src/bc.c: (id_to_index), (name_to_index):
+       * src/label-barcode.c: (gl_label_barcode_set_props):
+       * src/label-text.c: (set_font_family):
+       * src/merge-properties-dialog.c:
+       (gl_merge_properties_dialog_construct):
+       * src/merge.c: (gl_merge_description_to_name):
+       * src/new-label-dialog.c:
+       * src/object-editor-edit-page.c:
+       * src/object-editor-image-page.c: (update_preview_cb):
+       * src/object-editor-lsize-page.c:
+       * src/object-editor-position-page.c:
+       * src/object-editor-size-page.c:
+       * src/object-editor.c: (gl_object_editor_new):
+       * src/prefs-dialog.c: (update_locale_page_from_prefs):
+       * src/prefs-model.c: (string_to_units):
+       * src/print-op.c: (create_custom_widget_cb):
+       * src/template-designer.c: (gl_template_designer_init),
+       (pg_size_page_changed_cb), (build_template):
+       * src/ui-commands.c: (gl_ui_cmd_help_about):
+       * src/xml-label.c: (xml_parse_pixdata):
+               Fixed various deprecations as of Gtk-2.16.
+
 2009-08-31  Jim Evins  <evins@snaught.com>
 
        * po/fr.po:

diff --git a/glabels2/data/builder/object-editor.builder b/glabels2/data/builder/object-editor.builder
index 73b26594635128e1a2680610ef92fdf4a7dd4e5a..8991acd557fb03bbc0927ed1d20272050eff939a 100644 (file)
--- a/glabels2/data/builder/object-editor.builder
+++ b/glabels2/data/builder/object-editor.builder
@@ -1333,7 +1333,6 @@
                   </object>
                   <packing>
                     <property name="position">6</property>
-                    <property name="tab_expand">True</property>
                   </packing>
                 </child>
                 <child type="tab">

diff --git a/glabels2/src/bc-gnubarcode.c b/glabels2/src/bc-gnubarcode.c
index 2c84114b384925634e644f3e69d9b565f5d7a00d..8a56fd386dbee805279421f35e26006e321e7736 100644 (file)
--- a/glabels2/src/bc-gnubarcode.c
+++ b/glabels2/src/bc-gnubarcode.c
@@ -83,95 +83,95 @@ gl_barcode_gnubarcode_new (const gchar    *id,
        gint                 flags;
 
        /* Assign type flag.  Pre-filter by length for subtypes. */
-       if (g_strcasecmp (id, "EAN") == 0) {
+       if (g_ascii_strcasecmp (id, "EAN") == 0) {
                flags = BARCODE_EAN;
-       } else if (g_strcasecmp (id, "EAN-8") == 0) {
+       } else if (g_ascii_strcasecmp (id, "EAN-8") == 0) {
                if (!is_length_valid (digits, 7, 8)) {
                        return NULL;
                }
                flags = BARCODE_EAN;
-       } else if (g_strcasecmp (id, "EAN-8+2") == 0) {
+       } else if (g_ascii_strcasecmp (id, "EAN-8+2") == 0) {
                if (!is_length1_valid (digits, 7, 8) || !is_length2_valid (digits, 2, 2)) {
                        return NULL;
                }
                flags = BARCODE_EAN;
-       } else if (g_strcasecmp (id, "EAN-8+5") == 0) {
+       } else if (g_ascii_strcasecmp (id, "EAN-8+5") == 0) {
                if (!is_length1_valid (digits, 7, 8) || !is_length2_valid (digits, 5, 5)) {
                        return NULL;
                }
                flags = BARCODE_EAN;
-       } else if (g_strcasecmp (id, "EAN-13") == 0) {
+       } else if (g_ascii_strcasecmp (id, "EAN-13") == 0) {
                if (!is_length_valid (digits, 12, 13)) {
                        return NULL;
                }
                flags = BARCODE_EAN;
-       } else if (g_strcasecmp (id, "EAN-13+2") == 0) {
+       } else if (g_ascii_strcasecmp (id, "EAN-13+2") == 0) {
                if (!is_length1_valid (digits, 12,13) || !is_length2_valid (digits, 2,2)) {
                        return NULL;
                }
                flags = BARCODE_EAN;
-       } else if (g_strcasecmp (id, "EAN-13+5") == 0) {
+       } else if (g_ascii_strcasecmp (id, "EAN-13+5") == 0) {
                if (!is_length1_valid (digits, 12,13) || !is_length2_valid (digits, 5,5)) {
                        return NULL;
                }
                flags = BARCODE_EAN;
-       } else if (g_strcasecmp (id, "UPC") == 0) {
+       } else if (g_ascii_strcasecmp (id, "UPC") == 0) {
                flags = BARCODE_UPC;
-       } else if (g_strcasecmp (id, "UPC-A") == 0) {
+       } else if (g_ascii_strcasecmp (id, "UPC-A") == 0) {
                if (!is_length_valid (digits, 11, 12)) {
                        return NULL;
                }
                flags = BARCODE_UPC;
-       } else if (g_strcasecmp (id, "UPC-A+2") == 0) {
+       } else if (g_ascii_strcasecmp (id, "UPC-A+2") == 0) {
                if (!is_length1_valid (digits, 11,12) || !is_length2_valid (digits, 2,2)) {
                        return NULL;
                }
                flags = BARCODE_UPC;
-       } else if (g_strcasecmp (id, "UPC-A+5") == 0) {
+       } else if (g_ascii_strcasecmp (id, "UPC-A+5") == 0) {
                if (!is_length1_valid (digits, 11,12) || !is_length2_valid (digits, 5,5)) {
                        return NULL;
                }
                flags = BARCODE_UPC;
-       } else if (g_strcasecmp (id, "UPC-E") == 0) {
+       } else if (g_ascii_strcasecmp (id, "UPC-E") == 0) {
                if (!is_length_valid (digits, 6, 8)) {
                        return NULL;
                }
                flags = BARCODE_UPC;
-       } else if (g_strcasecmp (id, "UPC-E+2") == 0) {
+       } else if (g_ascii_strcasecmp (id, "UPC-E+2") == 0) {
                if (!is_length1_valid (digits, 6, 8) || !is_length2_valid (digits, 2,2)) {
                        return NULL;
                }
                flags = BARCODE_UPC;
-       } else if (g_strcasecmp (id, "UPC-E+5") == 0) {
+       } else if (g_ascii_strcasecmp (id, "UPC-E+5") == 0) {
                if (!is_length1_valid (digits, 6, 8) || !is_length2_valid (digits, 5,5)) {
                        return NULL;
                }
                flags = BARCODE_UPC;
-       } else if (g_strcasecmp (id, "ISBN") == 0) {
+       } else if (g_ascii_strcasecmp (id, "ISBN") == 0) {
                if (!is_length_valid (digits, 9, 10)) {
                        return NULL;
                }
                flags = BARCODE_ISBN;
-       } else if (g_strcasecmp (id, "ISBN+5") == 0) {
+       } else if (g_ascii_strcasecmp (id, "ISBN+5") == 0) {
                if (!is_length1_valid (digits, 9, 10) || !is_length2_valid (digits, 5,5)) {
                        return NULL;
                }
                flags = BARCODE_ISBN;
-       } else if (g_strcasecmp (id, "Code39") == 0) {
+       } else if (g_ascii_strcasecmp (id, "Code39") == 0) {
                flags = BARCODE_39;
-       } else if (g_strcasecmp (id, "Code128") == 0) {
+       } else if (g_ascii_strcasecmp (id, "Code128") == 0) {
                flags = BARCODE_128;
-       } else if (g_strcasecmp (id, "Code128C") == 0) {
+       } else if (g_ascii_strcasecmp (id, "Code128C") == 0) {
                flags = BARCODE_128C;
-       } else if (g_strcasecmp (id, "Code128B") == 0) {
+       } else if (g_ascii_strcasecmp (id, "Code128B") == 0) {
                flags = BARCODE_128B;
-       } else if (g_strcasecmp (id, "I25") == 0) {
+       } else if (g_ascii_strcasecmp (id, "I25") == 0) {
                flags = BARCODE_I25;
-       } else if (g_strcasecmp (id, "CBR") == 0) {
+       } else if (g_ascii_strcasecmp (id, "CBR") == 0) {
                flags = BARCODE_CBR;
-       } else if (g_strcasecmp (id, "MSI") == 0) {
+       } else if (g_ascii_strcasecmp (id, "MSI") == 0) {
                flags = BARCODE_MSI;
-       } else if (g_strcasecmp (id, "PLS") == 0) {
+       } else if (g_ascii_strcasecmp (id, "PLS") == 0) {
                flags = BARCODE_PLS;
        } else {
                g_message( "Illegal barcode id %s", id );

diff --git a/glabels2/src/bc-postnet.c b/glabels2/src/bc-postnet.c
index 5b710c09fb2204a95a45f7a1a6d5112f17d8c88f..e7d350f085d2f41829016d8d21204616025ad128 100644 (file)
--- a/glabels2/src/bc-postnet.c
+++ b/glabels2/src/bc-postnet.c
@@ -92,29 +92,29 @@ gl_barcode_postnet_new (const gchar    *id,
        gdouble        x;
 
        /* Validate code length for all subtypes. */
-       if ( (g_strcasecmp (id, "POSTNET") == 0) ) {
+       if ( (g_ascii_strcasecmp (id, "POSTNET") == 0) ) {
                if (!is_length_valid (digits, 5) &&
                    !is_length_valid (digits, 9) &&
                    !is_length_valid (digits, 11)) {
                        return NULL;
                }
        }
-       if ( (g_strcasecmp (id, "POSTNET-5") == 0) ) {
+       if ( (g_ascii_strcasecmp (id, "POSTNET-5") == 0) ) {
                if (!is_length_valid (digits, 5)) {
                        return NULL;
                }
        }
-       if ( (g_strcasecmp (id, "POSTNET-9") == 0) ) {
+       if ( (g_ascii_strcasecmp (id, "POSTNET-9") == 0) ) {
                if (!is_length_valid (digits, 9)) {
                        return NULL;
                }
        }
-       if ( (g_strcasecmp (id, "POSTNET-11") == 0) ) {
+       if ( (g_ascii_strcasecmp (id, "POSTNET-11") == 0) ) {
                if (!is_length_valid (digits, 11)) {
                        return NULL;
                }
        }
-       if ( (g_strcasecmp (id, "CEPNET") == 0) ) {
+       if ( (g_ascii_strcasecmp (id, "CEPNET") == 0) ) {
                if (!is_length_valid (digits, 8)) {
                        return NULL;
                }

diff --git a/glabels2/src/bc.c b/glabels2/src/bc.c
index 70d72c5b4d5cc4e26ec24e80363f87bc5b93fc50..97c470e04964214f9bc4349585dc6163dd682ffe 100644 (file)
--- a/glabels2/src/bc.c
+++ b/glabels2/src/bc.c
@@ -180,7 +180,7 @@ id_to_index (const gchar *id)
        }
 
        for (i=0; backends[i].id != NULL; i++) {
-               if (g_strcasecmp (id, backends[i].id) == 0) {
+               if (g_ascii_strcasecmp (id, backends[i].id) == 0) {
                        return i;
                }
        }
@@ -200,7 +200,7 @@ name_to_index (const gchar *name)
        g_return_val_if_fail (name!=NULL, 0);
 
        for (i=0; backends[i].id != NULL; i++) {
-               if (g_strcasecmp (name, backends[i].name) == 0) {
+               if (strcmp (name, backends[i].name) == 0) {
                        return i;
                }
        }

diff --git a/glabels2/src/label-barcode.c b/glabels2/src/label-barcode.c
index 1f008ed59aa74ff421de2c21e042c93ed2866574..7c4506483238e681b6fbdcff9311073749e2f2b2 100644 (file)
--- a/glabels2/src/label-barcode.c
+++ b/glabels2/src/label-barcode.c
@@ -214,7 +214,7 @@ gl_label_barcode_set_props (glLabelBarcode *lbc,
        g_return_if_fail (lbc && GL_IS_LABEL_BARCODE (lbc));
 
        if ( ((lbc->priv->id == NULL) && (id != NULL))
-            || (g_strcasecmp (lbc->priv->id, id) != 0)
+            || (g_ascii_strcasecmp (lbc->priv->id, id) != 0)
             || (lbc->priv->text_flag != text_flag)
             || (lbc->priv->checksum_flag != checksum_flag)
             || (lbc->priv->format_digits != format_digits)) {

diff --git a/glabels2/src/label-text.c b/glabels2/src/label-text.c
index 9335ab9d752299ea9f30b4a9abe87c9b3ddd0df3..df5a6c67e4b8fcb57b11309e5ba1f1bfe04dd9b0 100644 (file)
--- a/glabels2/src/label-text.c
+++ b/glabels2/src/label-text.c
@@ -27,6 +27,7 @@
 #include <glib/gmessages.h>
 #include <pango/pango.h>
 #include <math.h>
+#include <string.h>
 
 #include "util.h"
 
@@ -478,7 +479,7 @@ set_font_family (glLabelObject *object,
        }
 
        if (ltext->priv->font_family) {
-               if (g_strcasecmp (ltext->priv->font_family, good_font_family) == 0) {
+               if (strcmp (ltext->priv->font_family, good_font_family) == 0) {
                        g_free (good_font_family);
                        gl_debug (DEBUG_LABEL, "END (no change)");
                        return;

diff --git a/glabels2/src/merge-properties-dialog.c b/glabels2/src/merge-properties-dialog.c
index 27c25dc95f223a80b15fb557b315517119ccbdbe..de19db0d3a2f315919a3c3754787898ca0776418 100644 (file)
--- a/glabels2/src/merge-properties-dialog.c
+++ b/glabels2/src/merge-properties-dialog.c
@@ -342,7 +342,7 @@ gl_merge_properties_dialog_construct (glMergePropertiesDialog *dialog,
        gtk_tree_view_column_set_clickable (column, TRUE);
        gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->priv->treeview), column);
        renderer = gtk_cell_renderer_text_new ();
-       gtk_object_set (GTK_OBJECT (renderer), "yalign", 0.0, NULL);
+       g_object_set (G_OBJECT (renderer), "yalign", 0.0, NULL);
        column = gtk_tree_view_column_new_with_attributes (_("Record/Field"), renderer,
                                                           "text", RECORD_FIELD_COLUMN,
                                                           NULL);
@@ -350,7 +350,7 @@ gl_merge_properties_dialog_construct (glMergePropertiesDialog *dialog,
        gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->priv->treeview), column);
        gtk_tree_view_set_expander_column (GTK_TREE_VIEW (dialog->priv->treeview), column);
        renderer = gtk_cell_renderer_text_new ();
-       gtk_object_set (GTK_OBJECT (renderer), "yalign", 0.0, NULL);
+       g_object_set (G_OBJECT (renderer), "yalign", 0.0, NULL);
        column = gtk_tree_view_column_new_with_attributes (_("Data"), renderer,
                                                           "text", VALUE_COLUMN,
                                                           NULL);

diff --git a/glabels2/src/merge.c b/glabels2/src/merge.c
index 8af027fc0cdf6ad1d9165769a85306707a8d664b..8963ca2238a6a9068630ce90c25e0fd361431481 100644 (file)
--- a/glabels2/src/merge.c
+++ b/glabels2/src/merge.c
@@ -29,6 +29,8 @@
 #include <gobject/gvaluecollector.h>
 #include <string.h>
 
+#include <libglabels/str.h>
+
 #include "debug.h"
 
 /*========================================================*/
@@ -208,13 +210,13 @@ gl_merge_description_to_name (gchar *description)
        GList   *p;
        Backend *backend;
 
-       if (g_strcasecmp(description, _("None")) == 0) {
+       if (lgl_str_utf8_casecmp(description, _("None")) == 0) {
                return g_strdup("None");
        }
 
        for ( p=backends; p!=NULL; p=p->next) {
                backend = (Backend *)p->data;
-               if (g_strcasecmp(description, backend->description) == 0) {
+               if (lgl_str_utf8_casecmp(description, backend->description) == 0) {
                        return g_strdup(backend->name);
                }
        }

diff --git a/glabels2/src/new-label-dialog.c b/glabels2/src/new-label-dialog.c
index 1cf6096fc67401b45a1c05ca0d8e45868b14278d..8734e1985a82675dc53959342682c804081ee4af 100644 (file)
--- a/glabels2/src/new-label-dialog.c
+++ b/glabels2/src/new-label-dialog.c
@@ -30,6 +30,7 @@
 #include "hig.h"
 #include "wdgt-media-select.h"
 #include "wdgt-rotate-label.h"
+#include "util.h"
 
 #include "debug.h"
 

diff --git a/glabels2/src/object-editor-edit-page.c b/glabels2/src/object-editor-edit-page.c
index 631ec109fc65d264f65d2bbc6552543ad5b830bd..2d91cb03e18a10e9b36287fce97fc1915c8c7c0f 100644 (file)
--- a/glabels2/src/object-editor-edit-page.c
+++ b/glabels2/src/object-editor-edit-page.c
@@ -23,8 +23,7 @@
 #include "object-editor.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 #include <math.h>
 
 #include "prefs.h"

diff --git a/glabels2/src/object-editor-image-page.c b/glabels2/src/object-editor-image-page.c
index 9f4bccb4b955bdf283cdf3dd55c4cb94e4adb7f6..cfa4e741f2901cca9b81e9a7240bf923a2ec4df6 100644 (file)
--- a/glabels2/src/object-editor-image-page.c
+++ b/glabels2/src/object-editor-image-page.c
@@ -241,8 +241,7 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data)
                 g_free (filename);
 
                 gtk_image_set_from_pixbuf (GTK_IMAGE (preview), pixbuf);
-                if (pixbuf)
-                        gdk_pixbuf_unref (pixbuf);
+                g_object_unref (G_OBJECT (pixbuf));
 
                 gtk_file_chooser_set_preview_widget_active (file_chooser,
                                                             have_preview);

diff --git a/glabels2/src/object-editor-lsize-page.c b/glabels2/src/object-editor-lsize-page.c
index 7266ada46ce298a5e2f6e962ae490071ca5f203c..8c1771a3880d2d1d73289bdc763b1eada2b1d185 100644 (file)
--- a/glabels2/src/object-editor-lsize-page.c
+++ b/glabels2/src/object-editor-lsize-page.c
@@ -28,6 +28,7 @@
 #include <math.h>
 
 #include "prefs.h"
+#include "util.h"
 
 #include "object-editor-private.h"
 

diff --git a/glabels2/src/object-editor-position-page.c b/glabels2/src/object-editor-position-page.c
index 46bfffebc10662c66a49a251d0d42e8de763c714..216f017e15a72bc159af2b650e94a52ff6f45d6b 100644 (file)
--- a/glabels2/src/object-editor-position-page.c
+++ b/glabels2/src/object-editor-position-page.c
@@ -28,6 +28,7 @@
 #include <math.h>
 
 #include "prefs.h"
+#include "util.h"
 
 #include "object-editor-private.h"
 

diff --git a/glabels2/src/object-editor-size-page.c b/glabels2/src/object-editor-size-page.c
index 58dcbf2c7dde09292b1b6b4505c6397ce3b5bcec..97710556e66a871678b625ed4693a406569b3dd8 100644 (file)
--- a/glabels2/src/object-editor-size-page.c
+++ b/glabels2/src/object-editor-size-page.c
@@ -29,6 +29,7 @@
 
 #include "prefs.h"
 #include "wdgt-chain-button.h"
+#include "util.h"
 
 #include "object-editor-private.h"
 

diff --git a/glabels2/src/object-editor.c b/glabels2/src/object-editor.c
index 808e72c11a6d081d078234a431ca7b29aecc9a2c..54f6797a771454dab77fdf0a0ae2d16bf2e5e540 100644 (file)
--- a/glabels2/src/object-editor.c
+++ b/glabels2/src/object-editor.c
@@ -226,8 +226,6 @@ gl_object_editor_new (gchar                *image,
                                          
        }
 
-       gtk_notebook_set_homogeneous_tabs (GTK_NOTEBOOK(editor->priv->notebook), TRUE);
-
        va_start (args, first_option);
        gl_object_notebook_construct_valist (editor, label, first_option, args);
        va_end (args);

diff --git a/glabels2/src/prefs-dialog.c b/glabels2/src/prefs-dialog.c
index 4b6854675c6ac4edd9eeb3ba53c20d6c352a5bdb..c87d03d98be65a3121fd9cb6fe6121d73771213b 100644 (file)
--- a/glabels2/src/prefs-dialog.c
+++ b/glabels2/src/prefs-dialog.c
@@ -488,12 +488,12 @@ update_locale_page_from_prefs (glPrefsDialog *dialog)
                break;
        }
 
-       if ( g_strcasecmp(gl_prefs->default_page_size, US_LETTER_ID) == 0)
+       if ( g_ascii_strcasecmp(gl_prefs->default_page_size, US_LETTER_ID) == 0)
         {
                gtk_toggle_button_set_active (
                        GTK_TOGGLE_BUTTON(dialog->priv->page_size_us_letter_radio), TRUE);
        }
-        else if ( g_strcasecmp(gl_prefs->default_page_size, A4_ID) == 0)
+        else if ( g_ascii_strcasecmp(gl_prefs->default_page_size, A4_ID) == 0)
         {
                gtk_toggle_button_set_active (
                        GTK_TOGGLE_BUTTON(dialog->priv->page_size_a4_radio), TRUE);

diff --git a/glabels2/src/prefs-model.c b/glabels2/src/prefs-model.c
index fdd429cb88207ae0707428320ebf30413e24e8e6..72a043b6e3ce4f6457e778c7bfd7729bd0b9055c 100644 (file)
--- a/glabels2/src/prefs-model.c
+++ b/glabels2/src/prefs-model.c
@@ -28,6 +28,8 @@
 #include <libglabels/db.h>
 #include <libglabels/xml.h>
 #include <gtk/gtkpapersize.h>
+#include <string.h>
+#include <glib/gstrfuncs.h>
 
 #include "marshal.h"
 #include "util.h"
@@ -685,11 +687,11 @@ string_to_units (const gchar *string)
 {
        lglUnitsType units;
 
-       if (g_strcasecmp (string, "Points") == 0) {
+       if (g_ascii_strcasecmp (string, "Points") == 0) {
                units = LGL_UNITS_POINT;
-       } else if (g_strcasecmp (string, "Inches") == 0) {
+       } else if (g_ascii_strcasecmp (string, "Inches") == 0) {
                units = LGL_UNITS_INCH;
-       } else if (g_strcasecmp (string, "Millimeters") == 0) {
+       } else if (g_ascii_strcasecmp (string, "Millimeters") == 0) {
                units = LGL_UNITS_MM;
        } else {
                units = LGL_UNITS_INCH;

diff --git a/glabels2/src/print-op.c b/glabels2/src/print-op.c
index 3e98490c58565baeebd9778a9f92755f8a9b7d6d..e77717592824c06fbc511c823fb99b460b19375b 100644 (file)
--- a/glabels2/src/print-op.c
+++ b/glabels2/src/print-op.c
@@ -32,6 +32,7 @@
 #include <libglabels/db.h>
 #include "print.h"
 #include "label.h"
+#include "util.h"
 
 #include "wdgt-print-copies.h"
 #include "wdgt-print-merge.h"
@@ -506,7 +507,7 @@ create_custom_widget_cb (GtkPrintOperation *operation,
        if (error) {
                g_critical ("%s\n\ngLabels may not be installed correctly!", error->message);
                 g_error_free (error);
-               return;
+               return NULL;
        }
 
         gl_util_get_builder_widgets (builder,

diff --git a/glabels2/src/template-designer.c b/glabels2/src/template-designer.c
index 5c6b3bbb4e525d50c76c278e9c9e3ce80631d4af..5777de527e329012dba2a12ae1d257c579cc3b60 100644 (file)
--- a/glabels2/src/template-designer.c
+++ b/glabels2/src/template-designer.c
@@ -291,7 +291,6 @@ gl_template_designer_class_init (glTemplateDesignerClass *class)
 static void
 gl_template_designer_init (glTemplateDesigner *dialog)
 {
-       GtkBuilder        *gui;
         static gchar      *object_ids[] = { "start_page",
                                             "name_page",
                                             "pg_size_page",
@@ -1308,7 +1307,7 @@ pg_size_page_changed_cb (glTemplateDesigner *dialog)
                paper = lgl_db_lookup_paper_from_name (page_size_name);
        
 
-               if ( g_strcasecmp (paper->id, "Other") == 0 ) {
+               if ( g_ascii_strcasecmp (paper->id, "Other") == 0 ) {
                        gtk_widget_set_sensitive (GTK_WIDGET(dialog->priv->pg_w_spin), TRUE);
                        gtk_widget_set_sensitive (GTK_WIDGET(dialog->priv->pg_h_spin), TRUE);
                        gtk_widget_set_sensitive (GTK_WIDGET(dialog->priv->pg_w_units_label),
@@ -1659,7 +1658,7 @@ build_template (glTemplateDesigner      *dialog)
        page_size_name =
                gtk_combo_box_get_active_text (GTK_COMBO_BOX (dialog->priv->pg_size_combo));
        paper = lgl_db_lookup_paper_from_name (page_size_name);
-       if ( g_strcasecmp (paper->id, "Other") == 0 ) {
+       if ( g_ascii_strcasecmp (paper->id, "Other") == 0 ) {
                paper->width =
                        gtk_spin_button_get_value (GTK_SPIN_BUTTON(dialog->priv->pg_w_spin))
                        / upp;

diff --git a/glabels2/src/ui-commands.c b/glabels2/src/ui-commands.c
index c4cc1d19f6e1cb24903003b4060dd6ff4c2ff9be..bc01a65b0b9c4ece145599a0c20424cf173f256a 100644 (file)
--- a/glabels2/src/ui-commands.c
+++ b/glabels2/src/ui-commands.c
@@ -27,8 +27,7 @@
 #include "ui-commands.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkaboutdialog.h>
+#include <gtk/gtk.h>
 
 #include "view.h"
 #include "file.h"
@@ -1113,15 +1112,15 @@ gl_ui_cmd_help_about (GtkAction *action,
                 pixbuf = gdk_pixbuf_new_from_file (GLABELS_PIXMAP_DIR "glabels-splash.png", NULL);
 
                 about = gtk_about_dialog_new ();
-                gtk_about_dialog_set_name      (GTK_ABOUT_DIALOG(about), _("glabels"));
-                gtk_about_dialog_set_version   (GTK_ABOUT_DIALOG(about), VERSION);
-                gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(about), copy_text);
-                gtk_about_dialog_set_comments  (GTK_ABOUT_DIALOG(about), about_text);
-                gtk_about_dialog_set_website   (GTK_ABOUT_DIALOG(about), url);
-                gtk_about_dialog_set_logo      (GTK_ABOUT_DIALOG(about), pixbuf);
-
-                gtk_about_dialog_set_authors   (GTK_ABOUT_DIALOG(about), authors);
-                gtk_about_dialog_set_artists   (GTK_ABOUT_DIALOG(about), artists);
+                gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG(about), _("glabels"));
+                gtk_about_dialog_set_version      (GTK_ABOUT_DIALOG(about), VERSION);
+                gtk_about_dialog_set_copyright    (GTK_ABOUT_DIALOG(about), copy_text);
+                gtk_about_dialog_set_comments     (GTK_ABOUT_DIALOG(about), about_text);
+                gtk_about_dialog_set_website      (GTK_ABOUT_DIALOG(about), url);
+                gtk_about_dialog_set_logo         (GTK_ABOUT_DIALOG(about), pixbuf);
+
+                gtk_about_dialog_set_authors      (GTK_ABOUT_DIALOG(about), authors);
+                gtk_about_dialog_set_artists      (GTK_ABOUT_DIALOG(about), artists);
                 gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG(about),
                                                          translator_credits);
                 gtk_about_dialog_set_license   (GTK_ABOUT_DIALOG(about), license);

diff --git a/glabels2/src/xml-label.c b/glabels2/src/xml-label.c
index 2570710178250f22e88d84681093f2eca197f9df..01c3b4544b08c072a18f1c5c1a4dacab62dbfe14 100644 (file)
--- a/glabels2/src/xml-label.c
+++ b/glabels2/src/xml-label.c
@@ -855,7 +855,7 @@ xml_parse_pixdata (xmlNodePtr  node,
 {
        gchar      *name, *base64;
        guchar     *stream;
-       guint       stream_length;
+       gsize       stream_length;
        gboolean    ret;
        GdkPixdata *pixdata;
        GdkPixbuf  *pixbuf;