[gq] Try to avoid some more crash bugs.

[terjeros]

commit a9a2400a01114759525681d29661b0aa83ae47f4
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Thu Nov 21 20:44:45 2013 +0100

    Try to avoid some more crash bugs.

 gq-1.3.4-sanity-check.patch     |   19 +++++++++++++++++++
 gq-1.3.4-strcmp-null-safe.patch |   13 +++++++++++++
 gq.spec                         |    9 ++++++++-
 3 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/gq-1.3.4-sanity-check.patch b/gq-1.3.4-sanity-check.patch
new file mode 100644
index 0000000..3259660
--- /dev/null
+++ b/gq-1.3.4-sanity-check.patch
@@ -0,0 +1,19 @@
+commit 06582f488aab4b01670aba709485e021766659a1
+Author: Terje Røsten <terje.rosten at ntnu.no>
+Date:   Thu Nov 21 20:17:04 2013 +0100
+
+    Sanity check
+
+diff --git a/src/gq-browser-model.c b/src/gq-browser-model.c
+index ee66a45..ee5fa09 100644
+--- a/src/gq-browser-model.c
++++ b/src/gq-browser-model.c
+@@ -183,7 +183,7 @@ gq_browser_model_validate(gconstpointer     * model,
+ 	g_print("browser_model_validate_iter(%p, %p): ", model, iter);
+ #endif
+ #warning "FIXME: check stamp"
+-	if(!iter->user_data) {
++	if(!iter || !iter->user_data) {
+ #ifdef DEBUG_MODEL
+ 		g_print("false (iter->user_data == NULL)\n");
+ #endif
diff --git a/gq-1.3.4-strcmp-null-safe.patch b/gq-1.3.4-strcmp-null-safe.patch
new file mode 100644
index 0000000..60b010d
--- /dev/null
+++ b/gq-1.3.4-strcmp-null-safe.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gq-input-form.c b/src/gq-input-form.c
+index a73dc9b..0e15a0c 100644
+--- a/src/gq-input-form.c
++++ b/src/gq-input-form.c
+@@ -952,7 +952,7 @@ dn_changed(GtkEditable *editable,
+ 	if(P(iform)->button_add_new) {
+ 		gchar      * val = gtk_editable_get_chars(editable, 0, -1);
+ 		gchar const* dn  = gq_input_form_get_dn(iform);
+-		gtk_widget_set_sensitive(P(iform)->button_add_new, strcmp(dn, val) != 0);
++		gtk_widget_set_sensitive(P(iform)->button_add_new, g_strcmp0(dn, val) != 0);
+ 		g_free(val);
+ 	}
+ }
diff --git a/gq.spec b/gq.spec
index 16c0dfc..8ab96e0 100644
--- a/gq.spec
+++ b/gq.spec
@@ -1,7 +1,7 @@
 Summary:       Graphical LDAP directory browser and editor
 Name:          gq
 Version:       1.3.4
-Release:       18%{?dist}
+Release:       19%{?dist}
 License:       GPLv2+
 Group:         Applications/Internet
 URL:           http://sourceforge.net/projects/gqclient/
@@ -12,6 +12,8 @@ Patch2:        gq-1.3.4-configure.patch
 Patch3:        gq-1.3.4-dso.patch
 Patch4:        gq-1.3.4-glibfix.patch
 Patch5:        gq-1.3.4-errorchain.patch
+Patch6:        gq-1.3.4-strcmp-null-safe.patch
+Patch7:        gq-1.3.4-sanity-check.patch
 BuildRequires: gtk2-devel 
 BuildRequires: libglade2-devel 
 Buildrequires: libgcrypt-devel
@@ -45,6 +47,8 @@ done
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %configure --with-included-gettext      \
@@ -99,6 +103,9 @@ fi
 %dir %{_datadir}/%{name}
 
 %changelog
+* Thu Nov 21 2013 Terje Røsten <terje.rosten at ntnu.no> - 1.34-19
+- Try to avoid some more crash bugs.
+
 * Mon Nov 11 2013 Terje Røsten <terje.rosten at ntnu.no> - 1.34-18
 - Add errorchain patch