From a6bfb5ca46e7ba80f95307e13cc14062ced4ccc2 Mon Sep 17 00:00:00 2001 From: Diego Gonzalez Date: Tue, 12 Jul 2005 18:06:41 +0000 Subject: [PATCH] remove gdk_pixbuf_unref calls which are deprecated and use g_object_unref 2005-07-11 Diego Gonzalez * e-image-chooser.c: remove gdk_pixbuf_unref calls which are deprecated and use g_object_unref instead 2005-07-11 Diego Gonzalez * gnome-about-me-password.c: fix some string errors Fixes bug 309951 and bug 309950 2005-07-10 Dennis Cranston * gnome-about-me.glade: HIG fixes; fix widget padding, use sentence capitalization for text field labels, fix mnemonic conflics, and remove mnemonics from tab labels. Also fixes bug 309952 --- capplets/about-me/ChangeLog | 18 ++++++++++++++++++ capplets/about-me/e-image-chooser.c | 6 +++--- capplets/about-me/gnome-about-me-password.c | 7 ++++--- capplets/about-me/gnome-about-me.c | 3 --- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/capplets/about-me/ChangeLog b/capplets/about-me/ChangeLog index 55eeef3a0..307cd5bb9 100644 --- a/capplets/about-me/ChangeLog +++ b/capplets/about-me/ChangeLog @@ -1,3 +1,21 @@ +2005-07-11 Diego Gonzalez + + * e-image-chooser.c: remove gdk_pixbuf_unref calls which are + deprecated and use g_object_unref instead + +2005-07-11 Diego Gonzalez + + * gnome-about-me-password.c: fix some string errors + + Fixes bug 309951 and bug 309950 +2005-07-10 Dennis Cranston + + * gnome-about-me.glade: HIG fixes; fix widget padding, + use sentence capitalization for text field labels, fix + mnemonic conflics, and remove mnemonics from tab labels. + + Also fixes bug 309952 + 2005-07-08 Sebastien Bacher * gnome-about-me.desktop.in: this file is not useful on the CVS. diff --git a/capplets/about-me/e-image-chooser.c b/capplets/about-me/e-image-chooser.c index 575650c97..ea1ee549e 100644 --- a/capplets/about-me/e-image-chooser.c +++ b/capplets/about-me/e-image-chooser.c @@ -296,11 +296,11 @@ set_image_from_data (EImageChooser *chooser, chooser->priv->image_height / 2 - new_height / 2); gtk_image_set_from_pixbuf (GTK_IMAGE (chooser->priv->image), composite); - gdk_pixbuf_unref (scaled); - gdk_pixbuf_unref (composite); + g_object_unref (scaled); + g_object_unref (composite); } - gdk_pixbuf_unref (pixbuf); + g_object_unref (pixbuf); g_free (chooser->priv->image_buf); chooser->priv->image_buf = data; diff --git a/capplets/about-me/gnome-about-me-password.c b/capplets/about-me/gnome-about-me-password.c index 9eebded09..5eaeb754f 100644 --- a/capplets/about-me/gnome-about-me-password.c +++ b/capplets/about-me/gnome-about-me-password.c @@ -97,7 +97,8 @@ wait_child (PasswordDialog *pdialog) return FALSE; } else if ((WIFEXITED (status)) && (WEXITSTATUS (status)) && (WEXITSTATUS(status) < 255)) { - msg = g_strdup (_("Old password is incorret, please retype it")); + + msg = g_strdup_printf ("%s", _("Old password is incorrect, please retype it")); gtk_label_set_markup (GTK_LABEL (wmessage), msg); g_free (msg); @@ -108,7 +109,7 @@ wait_child (PasswordDialog *pdialog) return FALSE; } else if ((WIFEXITED (status)) && (WEXITSTATUS (status)) && (WEXITSTATUS (status) == 255)) { - msg = g_strdup (_("Symtem error has occurred")); + msg = g_strdup (_("System error has occurred")); details = g_strdup (_("Could not run /usr/bin/passwd")); title = g_strdup (_("Unable to launch backend")); } else { @@ -376,7 +377,7 @@ passdlg_button_clicked_cb (GtkDialog *widget, gint response_id, PasswordDialog * g_source_remove (pdialog->timeout_id); if (ret == -1) { - msg = g_strdup (_("Old password is incorret, please retype it")); + msg = g_strdup_printf ("%s", _("Old password is incorrect, please retype it")); gtk_label_set_markup (GTK_LABEL (wmessage), msg); g_free (msg); diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c index 536c1fb43..3b0ebf49d 100644 --- a/capplets/about-me/gnome-about-me.c +++ b/capplets/about-me/gnome-about-me.c @@ -664,9 +664,6 @@ about_me_setup_dialog (void) me->theme = gtk_icon_theme_get_for_screen (me->screen); icon = gtk_icon_theme_lookup_icon (me->theme, "stock_person", 80, 0); - if (icon == NULL) { - g_print ("Icon not found\n"); - } me->person = g_strdup (gtk_icon_info_get_filename (icon));