diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-01-23 21:50:39 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-01-23 21:51:38 -0500 |
| commit | d9fcc4c630f3668dd014c258c2deb22d61e438d0 (patch) | |
| tree | 8b08e3e470f98aaa23173d19a6ab99fc4d12691d /gtk/gtkpapersize.c | |
| parent | 94c4a312c1eceb352dea1895f868f9943735e1aa (diff) | |
| download | gtk+-d9fcc4c630f3668dd014c258c2deb22d61e438d0.tar.gz | |
Silence new gcc warnings
gcc 4.6.0 has started to warn about set-but-unused variables.
So don't do that, then.
Diffstat (limited to 'gtk/gtkpapersize.c')
| -rw-r--r-- | gtk/gtkpapersize.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c index 8fbcddb373..23017eaf73 100644 --- a/gtk/gtkpapersize.c +++ b/gtk/gtkpapersize.c @@ -820,19 +820,21 @@ gtk_paper_size_get_default_right_margin (GtkPaperSize *size, * @key_file. * * Returns: a new #GtkPaperSize object with the restored - * paper size, or %NULL if an error occurred. + * paper size, or %NULL if an error occurred * * Since: 2.12 */ GtkPaperSize * -gtk_paper_size_new_from_key_file (GKeyFile *key_file, - const gchar *group_name, - GError **error) +gtk_paper_size_new_from_key_file (GKeyFile *key_file, + const gchar *group_name, + GError **error) { GtkPaperSize *paper_size = NULL; - char *name = NULL, *ppd_name = NULL, *display_name = NULL, *freeme = NULL; + gchar *name = NULL; + gchar *ppd_name = NULL; + gchar *display_name = NULL; + gchar *freeme = NULL; gdouble width, height; - gboolean retval = TRUE; GError *err = NULL; g_return_val_if_fail (key_file != NULL, NULL); @@ -845,7 +847,6 @@ gtk_paper_size_new_from_key_file (GKeyFile *key_file, GTK_PRINT_ERROR, GTK_PRINT_ERROR_INVALID_FILE, _("Not a valid page setup file")); - retval = FALSE; goto out; } @@ -854,7 +855,6 @@ gtk_paper_size_new_from_key_file (GKeyFile *key_file, if (err != NULL) \ {\ g_propagate_error (error, err);\ - retval = FALSE;\ goto out;\ } @@ -887,9 +887,9 @@ gtk_paper_size_new_from_key_file (GKeyFile *key_file, GTK_PRINT_ERROR, GTK_PRINT_ERROR_INVALID_FILE, _("Not a valid page setup file")); - retval = FALSE; goto out; } + g_assert (paper_size != NULL); out: |