1.1 --- a/plover-gtk/transactionhelper.c	Fri Jun 08 14:48:00 2018 +0100
     1.2 +++ b/plover-gtk/transactionhelper.c	Fri Jun 08 17:05:27 2018 +0100
     1.3 @@ -668,8 +668,8 @@
     1.4        (prefix[strlen(alt)]=='\0' || prefix[strlen(alt)]=='/');
     1.5  }
     1.6  
     1.7 -static gboolean
     1.8 -  plover_transaction_helper_check_vendor(PloverTransactionHelper *helper,
     1.9 +static void
    1.10 +  plover_transaction_helper_update_summary_page(PloverTransactionHelper *helper,
    1.11    GError **error)
    1.12  {
    1.13      int i,remove_count=0;
    1.14 @@ -682,11 +682,12 @@
    1.15      GtkWidget *container,*summary,*page;
    1.16      GtkButton *button;
    1.17      GtkLabel *label;
    1.18 -    g_return_val_if_fail(PLOVER_IS_TRANSACTION_HELPER(helper),FALSE);
    1.19 +    g_return_if_fail(PLOVER_IS_TRANSACTION_HELPER(helper));
    1.20      comps=plover_transaction_helper_get_comps(helper,error);
    1.21 -    if (!comps)
    1.22 -	return FALSE;
    1.23 -    prefix=plover_comps_get_default_prefix(comps);
    1.24 +    if (comps)
    1.25 +	prefix=plover_comps_get_default_prefix(comps);
    1.26 +    else
    1.27 +	prefix=NULL;
    1.28      button=GTK_BUTTON(gtk_builder_get_object(helper->ui,"SIRemoveExisting"));
    1.29      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),FALSE);
    1.30      container=GTK_WIDGET(gtk_builder_get_object(helper->ui,
    1.31 @@ -721,6 +722,7 @@
    1.32      }
    1.33      if (alternate_database_clashes || active_database_is_incompatible)
    1.34      {
    1.35 +	g_assert(comps!=NULL);
    1.36  	label=GTK_LABEL(gtk_builder_get_object(helper->ui,
    1.37  	  "SIIncompatibleInstallationLabel"));
    1.38  	if (alternate_database_clashes)
    1.39 @@ -753,7 +755,6 @@
    1.40  	    gtk_assistant_set_page_complete(helper->assistant,page,TRUE);
    1.41      }
    1.42      g_free(prefix);
    1.43 -    return TRUE;
    1.44  }
    1.45  
    1.46  void plover_transaction_helper_set_check_vendor(PloverTransactionHelper *helper,
    1.47 @@ -764,7 +765,7 @@
    1.48      {
    1.49  	helper->check_vendor=check_vendor;
    1.50  	if (helper->transactions)
    1.51 -	    plover_transaction_helper_check_vendor(helper,NULL);
    1.52 +	    plover_transaction_helper_update_summary_page(helper,NULL);
    1.53      }
    1.54  }
    1.55  
    1.56 @@ -868,7 +869,7 @@
    1.57  	return FALSE;
    1.58      }
    1.59      if (!helper->transactions)
    1.60 -	plover_transaction_helper_check_vendor(helper,error);
    1.61 +	plover_transaction_helper_update_summary_page(helper,error);
    1.62      g_object_ref(transaction);
    1.63      helper->transactions=g_slist_append(helper->transactions,transaction);
    1.64      if (report_action==PLOVER_TRANSACTION_HELPER_REPORT_REMOVE)