aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-08-14 04:20:44 +0800
committerChristian Persch <chpe@src.gnome.org>2006-08-14 04:20:44 +0800
commitf96e67bf1f8ee16555ddfa2b30f9231a38751cb4 (patch)
treea0db2c357c4418fc2ea7abbc5fbfd3872240a69f
parent04e578c716a00a2553cdef54a9c2cf3a7885b3ef (diff)
downloadgsoc2013-epiphany-f96e67bf1f8ee16555ddfa2b30f9231a38751cb4.tar
gsoc2013-epiphany-f96e67bf1f8ee16555ddfa2b30f9231a38751cb4.tar.gz
gsoc2013-epiphany-f96e67bf1f8ee16555ddfa2b30f9231a38751cb4.tar.bz2
gsoc2013-epiphany-f96e67bf1f8ee16555ddfa2b30f9231a38751cb4.tar.lz
gsoc2013-epiphany-f96e67bf1f8ee16555ddfa2b30f9231a38751cb4.tar.xz
gsoc2013-epiphany-f96e67bf1f8ee16555ddfa2b30f9231a38751cb4.tar.zst
gsoc2013-epiphany-f96e67bf1f8ee16555ddfa2b30f9231a38751cb4.zip
Don't crash on error. Bug #351187.
2006-08-13 Christian Persch <chpe@cvs.gnome.org> * lib/ephy-print-utils.c: (ephy_print_utils_page_setup_new_from_key_file): Don't crash on error. Bug #351187.
-rw-r--r--ChangeLog7
-rw-r--r--lib/ephy-print-utils.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c3780f847..3e6f1fca5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-13 Christian Persch <chpe@cvs.gnome.org>
+
+ * lib/ephy-print-utils.c:
+ (ephy_print_utils_page_setup_new_from_key_file):
+
+ Don't crash on error. Bug #351187.
+
2006-08-12 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/mozilla-embed-single.cpp:
diff --git a/lib/ephy-print-utils.c b/lib/ephy-print-utils.c
index 2d306206a..8e6ba5feb 100644
--- a/lib/ephy-print-utils.c
+++ b/lib/ephy-print-utils.c
@@ -96,7 +96,7 @@ ephy_print_utils_settings_new_from_key_file (GKeyFile *key_file,
PRINT_SETTINGS_GROUP,
&n_keys,
error);
- if (error)
+ if (*error != NULL)
return NULL;
settings = gtk_print_settings_new ();
@@ -257,7 +257,7 @@ ephy_print_utils_page_setup_new_from_key_file (GKeyFile *key_file,
GtkPageSetup *page_setup = NULL;
GtkPaperSize *paper_size;
gdouble width, height, top, bottom, left, right;
- char *name, *ppd_name, *display_name, *orientation;
+ char *name = NULL, *ppd_name = NULL, *display_name = NULL, *orientation = NULL;
gboolean retval = TRUE;
g_return_val_if_fail (key_file != NULL, NULL);