talons

commit 6c2c5640b5b1981835689626d1db5bd334e619af
parent e1616992e7840d0498b098e49eaacbd76385304b
Author: wwp <subscript@free.fr>
Date:   Thu,  6 Sep 2018 16:21:15 +0200

Rename activate_privacy_system() to compose_activate_privacy_system().

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

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/compose.c b/src/compose.c
@@ -496,7 +496,7 @@ static void compose_toggle_encrypt_cb	(GtkToggleAction *action,
 					 gpointer	 data);
 static void compose_set_privacy_system_cb(GtkWidget *widget, gpointer data);
 static void compose_update_privacy_system_menu_item(Compose * compose, gboolean warn);
-static void activate_privacy_system     (Compose *compose, 
+static void compose_activate_privacy_system     (Compose *compose, 
                                          PrefsAccount *account,
 					 gboolean warn);
 static void compose_toggle_return_receipt_cb(GtkToggleAction *action,
@@ -2379,7 +2379,7 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
 		compose_use_encryption(compose, use_encryption);
 		compose_update_privacy_system_menu_item(compose, FALSE);
 	} else {
-		activate_privacy_system(compose, account, FALSE);
+		compose_activate_privacy_system(compose, account, FALSE);
 	}
 
 	compose->targetinfo = procmsg_msginfo_copy(msginfo);
@@ -4971,7 +4971,7 @@ static void compose_select_account(Compose *compose, PrefsAccount *account,
 	else
 		cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/Encrypt", FALSE);
 				       
-	activate_privacy_system(compose, account, FALSE);
+	compose_activate_privacy_system(compose, account, FALSE);
 
 	if (!init && compose->mode != COMPOSE_REDIRECT) {
 		undo_block(compose->undostruct);
@@ -8333,7 +8333,7 @@ static Compose *compose_create(PrefsAccount *account,
 	/* Privacy Systems menu */
 	compose_update_privacy_systems_menu(compose);
 
-	activate_privacy_system(compose, account, TRUE);
+	compose_activate_privacy_system(compose, account, TRUE);
 	toolbar_set_style(compose->toolbar->toolbar, compose->handlebox, prefs_common.toolbar_style);
 	if (batch) {
 		gtk_widget_realize(window);
@@ -11534,7 +11534,7 @@ static void compose_toggle_encrypt_cb(GtkToggleAction *action, gpointer data)
 	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(compose->toolbar->privacy_encrypt_btn), compose->use_encryption);
 }
 
-static void activate_privacy_system(Compose *compose, PrefsAccount *account, gboolean warn) 
+static void compose_activate_privacy_system(Compose *compose, PrefsAccount *account, gboolean warn) 
 {
 	g_free(compose->privacy_system);
 	g_free(compose->encdata);