[gnome-software/wip/attente/gapplication: 1/2] Fix crash

[William Hua <williamhua src gnome org>]

commit d0edaf05accc0638b4f90acf335712ab8648b227
Author: William Hua <william hua canonical com>
Date:   Tue Mar 22 18:03:57 2016 -0400

    Fix crash

 src/gs-shell-search.c |    2 ++
 src/gs-shell.c        |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/src/gs-shell-search.c b/src/gs-shell-search.c
index 45017a1..c96794b 100644
--- a/src/gs-shell-search.c
+++ b/src/gs-shell-search.c
@@ -406,6 +406,8 @@ gs_shell_search_dispose (GObject *object)
 {
        GsShellSearch *self = GS_SHELL_SEARCH (object);
 
+       g_signal_handlers_disconnect_by_data (self->cancellable, self);
+
        g_clear_object (&self->sizegroup_image);
        g_clear_object (&self->sizegroup_name);
 
diff --git a/src/gs-shell.c b/src/gs-shell.c
index a675846..6f77fdd 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -215,6 +215,8 @@ gs_shell_set_header_end_widget (GsShell *shell, GtkWidget *widget)
        }
 }
 
+static void setup_builder (GsShell *shell);
+
 void
 gs_shell_change_mode (GsShell *shell,
                      GsShellMode mode,
@@ -231,6 +233,8 @@ gs_shell_change_mode (GsShell *shell,
        if (priv->ignore_primary_buttons)
                return;
 
+       setup_builder (shell);
+
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "header"));
        gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (widget), TRUE);