talons

commit e00bcd42492ba0c7eaa909e8830832af3380ec5e
parent cd5ee29a8178584ad47a5b4ef7048d98237b410e
Author: Ricardo Mones <ricardo@mones.org>
Date:   Tue, 11 Jul 2017 10:06:20 +0200

Check for NULL buttons also here

Thanks Andrej for the suggestion!

Diffstat:
M
src/compose.c
 | 
20
++++++++++++++++----

1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/compose.c b/src/compose.c
@@ -8472,10 +8472,22 @@ static void compose_set_privacy_system_cb(GtkWidget *widget, gpointer data)
 
 	cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/Sign", can_sign);
 	cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/Encrypt", can_encrypt);
-	gtk_widget_set_sensitive(compose->toolbar->privacy_sign_btn, can_sign);
-	gtk_widget_set_sensitive(compose->toolbar->privacy_encrypt_btn, can_encrypt);
-	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(compose->toolbar->privacy_sign_btn), can_sign ? compose->use_signing : FALSE);
-	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(compose->toolbar->privacy_encrypt_btn), can_encrypt ? compose->use_encryption : FALSE);
+	if (compose->toolbar->privacy_sign_btn != NULL) {
+		gtk_widget_set_sensitive(
+			GTK_WIDGET(compose->toolbar->privacy_sign_btn),
+			can_sign);
+		gtk_toggle_tool_button_set_active(
+			GTK_TOGGLE_TOOL_BUTTON(compose->toolbar->privacy_sign_btn),
+			can_sign ? compose->use_signing : FALSE);
+	}
+	if (compose->toolbar->privacy_encrypt_btn != NULL) {
+		gtk_widget_set_sensitive(
+			GTK_WIDGET(compose->toolbar->privacy_encrypt_btn),
+			can_encrypt);
+		gtk_toggle_tool_button_set_active(
+			GTK_TOGGLE_TOOL_BUTTON(compose->toolbar->privacy_encrypt_btn),
+			can_encrypt ? compose->use_encryption : FALSE);
+	}
 }
 
 static void compose_update_privacy_system_menu_item(Compose * compose, gboolean warn)