From d780283920166f23fb7fdbe1d7f0385b692f0d4c Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Wed, 2 Sep 2009 01:01:38 +0000 Subject: [PATCH] 2009-09-01 Jim Evins * 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 --- glabels2/ChangeLog | 28 ++++++++++++ glabels2/data/builder/object-editor.builder | 1 - glabels2/src/bc-gnubarcode.c | 48 ++++++++++----------- glabels2/src/bc-postnet.c | 10 ++--- glabels2/src/bc.c | 4 +- glabels2/src/label-barcode.c | 2 +- glabels2/src/label-text.c | 3 +- glabels2/src/merge-properties-dialog.c | 4 +- glabels2/src/merge.c | 6 ++- glabels2/src/new-label-dialog.c | 1 + glabels2/src/object-editor-edit-page.c | 3 +- glabels2/src/object-editor-image-page.c | 3 +- glabels2/src/object-editor-lsize-page.c | 1 + glabels2/src/object-editor-position-page.c | 1 + glabels2/src/object-editor-size-page.c | 1 + glabels2/src/object-editor.c | 2 - glabels2/src/prefs-dialog.c | 4 +- glabels2/src/prefs-model.c | 8 ++-- glabels2/src/print-op.c | 3 +- glabels2/src/template-designer.c | 5 +-- glabels2/src/ui-commands.c | 21 +++++---- glabels2/src/xml-label.c | 2 +- 22 files changed, 96 insertions(+), 65 deletions(-) diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 0c95edc1..bffc82fd 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,31 @@ +2009-09-01 Jim Evins + + * 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 * po/fr.po: diff --git a/glabels2/data/builder/object-editor.builder b/glabels2/data/builder/object-editor.builder index 73b26594..8991acd5 100644 --- a/glabels2/data/builder/object-editor.builder +++ b/glabels2/data/builder/object-editor.builder @@ -1333,7 +1333,6 @@ 6 - True diff --git a/glabels2/src/bc-gnubarcode.c b/glabels2/src/bc-gnubarcode.c index 2c84114b..8a56fd38 100644 --- 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 5b710c09..e7d350f0 100644 --- 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 70d72c5b..97c470e0 100644 --- 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 1f008ed5..7c450648 100644 --- 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 9335ab9d..df5a6c67 100644 --- a/glabels2/src/label-text.c +++ b/glabels2/src/label-text.c @@ -27,6 +27,7 @@ #include #include #include +#include #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 27c25dc9..de19db0d 100644 --- 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 8af027fc..8963ca22 100644 --- a/glabels2/src/merge.c +++ b/glabels2/src/merge.c @@ -29,6 +29,8 @@ #include #include +#include + #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 1cf6096f..8734e198 100644 --- 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 631ec109..2d91cb03 100644 --- 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 -#include -#include +#include #include #include "prefs.h" diff --git a/glabels2/src/object-editor-image-page.c b/glabels2/src/object-editor-image-page.c index 9f4bccb4..cfa4e741 100644 --- 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 7266ada4..8c1771a3 100644 --- a/glabels2/src/object-editor-lsize-page.c +++ b/glabels2/src/object-editor-lsize-page.c @@ -28,6 +28,7 @@ #include #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 46bfffeb..216f017e 100644 --- a/glabels2/src/object-editor-position-page.c +++ b/glabels2/src/object-editor-position-page.c @@ -28,6 +28,7 @@ #include #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 58dcbf2c..97710556 100644 --- 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 808e72c1..54f6797a 100644 --- 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 4b685467..c87d03d9 100644 --- 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 fdd429cb..72a043b6 100644 --- a/glabels2/src/prefs-model.c +++ b/glabels2/src/prefs-model.c @@ -28,6 +28,8 @@ #include #include #include +#include +#include #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 3e98490c..e7771759 100644 --- a/glabels2/src/print-op.c +++ b/glabels2/src/print-op.c @@ -32,6 +32,7 @@ #include #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 5c6b3bbb..5777de52 100644 --- 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 c4cc1d19..bc01a65b 100644 --- a/glabels2/src/ui-commands.c +++ b/glabels2/src/ui-commands.c @@ -27,8 +27,7 @@ #include "ui-commands.h" #include -#include -#include +#include #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 25707101..01c3b454 100644 --- 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; -- 2.39.5