commit 25d3744cadfb9652fd4156c72531688ccde1ad22
parent 6a4b0c1a8e690013ebbc6f91d60407d72a7c2a96
Author: Oliver Lowe <o@olowe.co>
Date: Fri, 8 Aug 2025 16:07:17 +1000
Trim more trailing whitespace in source
Diffstat:
68 files changed, 2202 insertions(+), 2202 deletions(-)
diff --git a/src/account.c b/src/account.c
@@ -115,8 +115,8 @@ static void account_size_allocate_cb(GtkWidget *widget,
static gboolean account_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-static gboolean account_search_func_cb (GtkTreeModel *model, gint column,
- const gchar *key, GtkTreeIter *iter,
+static gboolean account_search_func_cb (GtkTreeModel *model, gint column,
+ const gchar *key, GtkTreeIter *iter,
gpointer search_data);
static void account_list_view_set (void);
@@ -139,7 +139,7 @@ static void account_create_list_view_columns (GtkWidget *list_view);
static gint account_list_view_get_selected_account_id (GtkWidget *list_view);
static GtkTreePath *account_list_view_get_selected_account_path (GtkWidget *list_view);
static PrefsAccount *account_list_view_get_selected_account (GtkWidget *list_view);
-static gboolean account_list_view_select_account (GtkWidget *list_view,
+static gboolean account_list_view_select_account (GtkWidget *list_view,
gint account_id);
static void account_list_view_set_default_by_id(GtkWidget *list_view,
@@ -155,15 +155,15 @@ static gboolean find_account_in_store (GtkTreeModel *model,
GtkTreeIter *iter,
FindAccountInStore *data);
-static void account_get_all_toggled (GtkCellRendererToggle *widget,
- gchar *path,
+static void account_get_all_toggled (GtkCellRendererToggle *widget,
+ gchar *path,
GtkWidget *list_view);
static void account_double_clicked (GtkTreeView *list_view,
GtkTreePath *path,
GtkTreeViewColumn *column,
gpointer data);
-
+
static void drag_begin (GtkTreeView *list_view,
GdkDragContext *context,
gpointer data);
@@ -171,8 +171,8 @@ static void drag_begin (GtkTreeView *list_view,
static void drag_end (GtkTreeView *list_view,
GdkDragContext *context,
gpointer data);
-
-static void account_row_changed_while_drag_drop (GtkTreeModel *model,
+
+static void account_row_changed_while_drag_drop (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer arg3,
@@ -357,7 +357,7 @@ PrefsAccount *account_find_from_item(FolderItem *item)
if (cur_item->account && cur_item->apply_sub) {
ac = cur_item->account;
break;
- }
+ }
cur_item = folder_item_parent(cur_item);
}
}
@@ -498,7 +498,7 @@ void account_open(PrefsAccount *ac_prefs, gboolean called_from_acc_list)
account_rename_path(old_prefix, new_prefix);
prefs_filtering_rename_path(old_prefix, new_prefix);
prefs_actions_rename_path(old_prefix, new_prefix);
-
+
g_free(old_prefix);
g_free(new_prefix);
}
@@ -881,11 +881,11 @@ static void account_edit_prefs(GtkWidget *widget, gpointer data)
PrefsAccount *ac_prefs;
ac_prefs = account_list_view_get_selected_account(edit_account.list_view);
-
+
if (ac_prefs) {
account_open(ac_prefs, TRUE);
account_list_view_set();
- }
+ }
}
static gboolean account_delete_references_func(GNode *node, gpointer data)
@@ -902,7 +902,7 @@ static gboolean account_delete_references_func(GNode *node, gpointer data)
return FALSE;
if(item->prefs->default_account != account)
return FALSE;
-
+
item->prefs->enable_default_account = FALSE;
item->prefs->default_account = 0;
folder_item_prefs_save_config(item);
@@ -910,7 +910,7 @@ static gboolean account_delete_references_func(GNode *node, gpointer data)
return FALSE;
}
-
+
#define ACP_FDUP(fld) ac_clon->fld = ((ac_prefs->fld) != NULL)?\
g_strdup(ac_prefs->fld): NULL
#define ACP_FASSIGN(fld) ac_clon->fld = ac_prefs->fld
@@ -919,7 +919,7 @@ static void account_clone(GtkWidget *widget, gpointer data)
PrefsAccount *ac_prefs, *ac_clon;
GSList *hdrs = NULL;
CustomHeader *cch = NULL, *ch = NULL;
-
+
ac_prefs = account_list_view_get_selected_account(edit_account.list_view);
if (ac_prefs == NULL)
return;
@@ -929,7 +929,7 @@ static void account_clone(GtkWidget *widget, gpointer data)
return;
}
account_list_dirty = TRUE;
-
+
ac_clon = prefs_account_new();
/* copy fields */
ac_clon->account_name = g_strdup_printf(_("Copy of %s"),
@@ -952,7 +952,7 @@ static void account_clone(GtkWidget *widget, gpointer data)
ACP_FDUP(local_mbox);
ACP_FASSIGN(use_mail_command);
ACP_FDUP(mail_command);
-
+
ACP_FASSIGN(ssl_pop);
ACP_FASSIGN(ssl_imap);
ACP_FASSIGN(ssl_nntp);
@@ -964,7 +964,7 @@ static void account_clone(GtkWidget *widget, gpointer data)
ACP_FASSIGN(in_ssl_client_cert_pass);
ACP_FASSIGN(out_ssl_client_cert_file);
ACP_FASSIGN(out_ssl_client_cert_pass);
-
+
/* receive */
ACP_FASSIGN(use_pop_auth);
ACP_FASSIGN(pop_auth_type);
@@ -1007,12 +1007,12 @@ static void account_clone(GtkWidget *widget, gpointer data)
ch = (CustomHeader *)hdrs->data;
cch = g_new0(CustomHeader, 1);
- cch->account_id = ac_clon->account_id;
+ cch->account_id = ac_clon->account_id;
cch->name = (ch->name != NULL) ? g_strdup(ch->name) : NULL;
cch->value = (ch->value != NULL) ? g_strdup(ch->value) : NULL;
-
+
ac_clon->customhdr_list = g_slist_append(ac_clon->customhdr_list, cch);
-
+
hdrs = g_slist_next(hdrs);
}
@@ -1049,7 +1049,7 @@ static void account_clone(GtkWidget *widget, gpointer data)
ACP_FASSIGN(default_sign_reply);
ACP_FASSIGN(save_encrypted_as_clear_text);
ACP_FASSIGN(encrypt_to_self);
-
+
/* advanced */
ACP_FASSIGN(set_smtpport);
ACP_FASSIGN(smtpport);
@@ -1207,8 +1207,8 @@ static void account_up(GtkWidget *widget, gpointer data)
GtkTreeIter isel, iup;
GtkTreeModel *model = gtk_tree_view_get_model
(GTK_TREE_VIEW(edit_account.list_view));
-
- if (!sel)
+
+ if (!sel)
return;
account_list_dirty = TRUE;
@@ -1234,7 +1234,7 @@ static void account_up(GtkWidget *widget, gpointer data)
gtk_list_store_swap(GTK_LIST_STORE(model), &isel, &iup);
account_list_set();
-
+
gtk_tree_path_free(up);
gtk_tree_path_free(sel);
}
@@ -1247,8 +1247,8 @@ static void account_down(GtkWidget *widget, gpointer data)
GtkTreeIter isel, idn;
GtkTreeModel *model = gtk_tree_view_get_model
(GTK_TREE_VIEW(edit_account.list_view));
-
- if (!sel)
+
+ if (!sel)
return;
account_list_dirty = TRUE;
@@ -1258,8 +1258,8 @@ static void account_down(GtkWidget *widget, gpointer data)
return;
}
- /* XXX no check possible??? however, if down but at bottom, then
- * nothing seems to happen much anyway, so the following seems to
+ /* XXX no check possible??? however, if down but at bottom, then
+ * nothing seems to happen much anyway, so the following seems to
* be okay */
gtk_tree_path_next(dn);
@@ -1273,7 +1273,7 @@ static void account_down(GtkWidget *widget, gpointer data)
gtk_list_store_swap(GTK_LIST_STORE(model), &isel, &idn);
account_list_set();
-
+
gtk_tree_path_free(dn);
gtk_tree_path_free(sel);
}
@@ -1283,17 +1283,17 @@ static void account_set_default(GtkWidget *widget, gpointer data)
PrefsAccount *ac_prefs;
if (NULL == (ac_prefs = account_list_view_get_selected_account
- (edit_account.list_view)))
- return;
+ (edit_account.list_view)))
+ return;
/* we need to change the store variables by resetting everything
* and setting the new default one */
account_list_view_set_default_by_id(edit_account.list_view,
- ac_prefs->account_id);
-
+ ac_prefs->account_id);
+
account_set_as_default(ac_prefs);
account_list_view_set();
-
+
cur_account = ac_prefs;
account_flush_state();
}
@@ -1332,8 +1332,8 @@ static gboolean account_key_pressed(GtkWidget *widget, GdkEventKey *event,
return FALSE;
}
-static gboolean account_search_func_cb (GtkTreeModel *model, gint column, const gchar *key,
- GtkTreeIter *iter, gpointer search_data)
+static gboolean account_search_func_cb (GtkTreeModel *model, gint column, const gchar *key,
+ GtkTreeIter *iter, gpointer search_data)
{
gboolean retval;
PrefsAccount *ac;
@@ -1355,26 +1355,26 @@ static void account_list_view_set(void)
GList *cur;
gint prev_sel_account;
GtkListStore *store;
-
+
store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(edit_account.list_view)));
prev_sel_account = account_list_view_get_selected_account_id
- (edit_account.list_view);
+ (edit_account.list_view);
gtk_list_store_clear(store);
-
+
for (cur = account_list; cur != NULL; cur = cur->next) {
account_list_store_insert_account_item(store, (PrefsAccount *)cur->data);
if ((PrefsAccount *)cur->data == cur_account)
account_list_view_select_account
- (edit_account.list_view,
+ (edit_account.list_view,
cur_account->account_id);
}
-
+
if (prev_sel_account >= 0)
- account_list_view_select_account(edit_account.list_view,
- prev_sel_account);
+ account_list_view_select_account(edit_account.list_view,
+ prev_sel_account);
}
/* set account list from CList */
@@ -1386,7 +1386,7 @@ static void account_list_set(void)
PrefsAccount *ac_prefs;
GtkTreeModel *model = gtk_tree_view_get_model
(GTK_TREE_VIEW(edit_account.list_view));
-
+
while (account_list)
account_list = g_list_remove(account_list, account_list->data);
@@ -1399,7 +1399,7 @@ static void account_list_set(void)
g_warning("%s(%d) - no iter found???", __FILE__, __LINE__);
continue;
}
-
+
ac_prefs = NULL;
gtk_tree_model_get(model, &iter,
ACCOUNT_DATA, &ac_prefs,
@@ -1475,15 +1475,15 @@ PrefsAccount *account_get_reply_account(MsgInfo *msginfo, gboolean reply_autosel
}
/* select the account for the whole folder (IMAP / NNTP) */
- if (!account)
+ if (!account)
/* FIXME: this is not right, because folder may be nested. we should
- * ascend the tree until we find a parent with proper account
+ * ascend the tree until we find a parent with proper account
* information */
account = msginfo->folder->folder->account;
/* select current account */
if (!account) account = cur_account;
-
+
return account;
}
@@ -1503,9 +1503,9 @@ static GtkListStore* account_create_data_store(void)
}
/*!
- *\brief Insert an account item in the list.
+ *\brief Insert an account item in the list.
*
- *\return GtkTreeRowReference * A tree row reference, which is guaranteed to
+ *\return GtkTreeRowReference * A tree row reference, which is guaranteed to
* stable whatever operations are performed on the list.
*/
static void account_list_store_insert_account_item(GtkListStore *list_store,
@@ -1518,7 +1518,7 @@ static void account_list_store_insert_account_item(GtkListStore *list_store,
ac_prefs->protocol == A_LOCAL) &&
ac_prefs->recv_at_getall;
gchar *protocol, *server;
-
+
#ifdef USE_GNUTLS
protocol = ac_prefs->protocol == A_POP3 ?
(ac_prefs->ssl_pop == SSL_TUNNEL ?
@@ -1549,7 +1549,7 @@ static void account_list_store_insert_account_item(GtkListStore *list_store,
ac_prefs->recv_server;
gtk_list_store_append(list_store, &iter);
- gtk_list_store_set(list_store, &iter,
+ gtk_list_store_set(list_store, &iter,
ACCOUNT_IS_DEFAULT, ac_prefs->is_default ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL,
ACCOUNT_ENABLE_GET_ALL, is_get_all,
ACCOUNT_NAME, ac_prefs->account_name,
@@ -1562,7 +1562,7 @@ static void account_list_store_insert_account_item(GtkListStore *list_store,
/*!
*\brief Create and set up account list view, including tasks like
* creating the data store (\ref account_create_data_store()),
- * and setting up the account list's individual columns (\ref
+ * and setting up the account list's individual columns (\ref
* account_create_list_view_columns()).
*
*\return GtkWidget * The created list view widget.
@@ -1606,19 +1606,19 @@ static void account_create_list_view_columns(GtkWidget *list_view)
GtkCellRenderer *renderer;
renderer = gtk_cell_renderer_toggle_new();
- g_object_set(renderer,
- "radio", FALSE,
+ g_object_set(renderer,
+ "radio", FALSE,
"activatable", TRUE,
NULL);
column = gtk_tree_view_column_new_with_attributes
(C_("Accounts List Get Column Name", "G"), renderer,
"active", ACCOUNT_ENABLE_GET_ALL,
NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
gtk_tree_view_column_set_alignment (column, 0.5);
CLAWS_SET_TIP(gtk_tree_view_column_get_widget(column),
_("'Get Mail' retrieves mail from the checked accounts"));
- g_signal_connect(G_OBJECT(renderer), "toggled",
+ g_signal_connect(G_OBJECT(renderer), "toggled",
G_CALLBACK(account_get_all_toggled),
list_view);
@@ -1628,16 +1628,16 @@ static void account_create_list_view_columns(GtkWidget *list_view)
"text", ACCOUNT_NAME,
"weight", ACCOUNT_IS_DEFAULT,
NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
-
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(_("Protocol"), renderer,
"text", ACCOUNT_PROTOCOL,
"weight", ACCOUNT_IS_DEFAULT,
NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
-
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(_("Server"), renderer,
@@ -1646,7 +1646,7 @@ static void account_create_list_view_columns(GtkWidget *list_view)
NULL);
gtk_tree_view_set_search_column(GTK_TREE_VIEW(list_view), ACCOUNT_NAME);
gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(list_view), account_search_func_cb , NULL, NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
}
/*!
@@ -1673,7 +1673,7 @@ static GtkTreePath *account_list_view_get_selected_account_path(GtkWidget *list_
GtkTreeIter iter;
selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
-
+
if (!gtk_tree_selection_get_selected(selector, &model, &iter))
return NULL;
@@ -1703,7 +1703,7 @@ static gboolean account_list_view_select_account(GtkWidget *list_view, gint acco
{
FindAccountInStore fis;
GtkTreeModel *model;
-
+
fis.account_id = account_id;
fis.path = NULL;
@@ -1711,7 +1711,7 @@ static gboolean account_list_view_select_account(GtkWidget *list_view, gint acco
gtk_tree_model_foreach(model, (GtkTreeModelForeachFunc) find_account_in_store,
&fis);
-
+
if (fis.path) {
GtkTreeSelection *selection;
GtkTreePath* path;
@@ -1719,7 +1719,7 @@ static gboolean account_list_view_select_account(GtkWidget *list_view, gint acco
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
gtk_tree_selection_select_iter(selection, &fis.iter);
path = gtk_tree_model_get_path(model, &fis.iter);
- /* XXX returned path may not be valid??? create new one to be sure */
+ /* XXX returned path may not be valid??? create new one to be sure */
gtk_tree_view_set_cursor(GTK_TREE_VIEW(list_view), path, NULL, FALSE);
gtk_tree_path_free(path);
}
@@ -1735,7 +1735,7 @@ static void account_list_view_set_default_by_id(GtkWidget *list_view,
gint account_id)
{
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list_view));
-
+
gtk_tree_model_foreach
(model, (GtkTreeModelForeachFunc) set_new_default_account,
&account_id);
@@ -1748,9 +1748,9 @@ static gboolean set_new_default_account(GtkTreeModel *model,
{
PrefsAccount *account = NULL;
PangoWeight weight;
-
- gtk_tree_model_get(model, iter,
- ACCOUNT_DATA, &account,
+
+ gtk_tree_model_get(model, iter,
+ ACCOUNT_DATA, &account,
-1);
if (*account_id == account->account_id)
@@ -1758,12 +1758,12 @@ static gboolean set_new_default_account(GtkTreeModel *model,
else
weight = PANGO_WEIGHT_BOLD;
- gtk_list_store_set(GTK_LIST_STORE(model), iter,
+ gtk_list_store_set(GTK_LIST_STORE(model), iter,
ACCOUNT_IS_DEFAULT, weight, -1);
return FALSE;
}
-
+
static gboolean find_account_in_store(GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
@@ -1778,35 +1778,35 @@ static gboolean find_account_in_store(GtkTreeModel *model,
return TRUE;
}
- return FALSE;
+ return FALSE;
}
/*!
*\brief Triggered when "get all" column is activated or de-activated
*/
-static void account_get_all_toggled(GtkCellRendererToggle *widget,
- gchar *path,
+static void account_get_all_toggled(GtkCellRendererToggle *widget,
+ gchar *path,
GtkWidget *list_view)
{
GtkTreeIter iter;
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list_view));
PrefsAccount *ac = NULL;
gboolean get_all;
-
+
if (!gtk_tree_model_get_iter_from_string(model, &iter, path))
return;
- gtk_tree_model_get(model, &iter,
+ gtk_tree_model_get(model, &iter,
ACCOUNT_DATA, &ac,
ACCOUNT_ENABLE_GET_ALL, &get_all,
-1);
/* check if the account has a selectable get all checkbox anyway... */
- if (!(ac->protocol == A_POP3 ||
+ if (!(ac->protocol == A_POP3 ||
ac->protocol == A_IMAP4 ||
ac->protocol == A_NNTP ||
ac->protocol == A_LOCAL))
- return;
+ return;
/* set value in store */
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
@@ -1822,14 +1822,14 @@ static void account_double_clicked(GtkTreeView *list_view,
GtkTreeViewColumn *column,
gpointer data)
{
- account_edit_prefs(NULL, NULL);
+ account_edit_prefs(NULL, NULL);
}
static void drag_begin(GtkTreeView *list_view,
GdkDragContext *context,
gpointer data)
{
- /* XXX unfortunately a completed drag & drop does not emit
+ /* XXX unfortunately a completed drag & drop does not emit
* a "rows_reordered" signal, but a "row_changed" signal.
* So during drag and drop, listen to "row_changed", and
* update the account list accordingly */
@@ -1850,13 +1850,13 @@ static void drag_end(GtkTreeView *list_view,
list_view);
}
-static void account_row_changed_while_drag_drop(GtkTreeModel *model,
+static void account_row_changed_while_drag_drop(GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer arg3,
GtkTreeView *list_view)
-{
- account_list_set();
+{
+ account_list_set();
}
gchar *account_get_signature_str(PrefsAccount *account)
diff --git a/src/action.c b/src/action.c
@@ -119,19 +119,19 @@ static void action_update_menu (GtkUIManager *ui_manager,
gchar *branch_path,
gpointer callback,
gpointer data);
-static void compose_actions_execute_cb (GtkWidget *widget,
+static void compose_actions_execute_cb (GtkWidget *widget,
gpointer data);
static void compose_actions_execute (Compose *compose,
guint action_nb,
GtkWidget *widget);
-static void mainwin_actions_execute_cb (GtkWidget *widget,
+static void mainwin_actions_execute_cb (GtkWidget *widget,
gpointer data);
static void mainwin_actions_execute (MainWindow *mainwin,
guint action_nb,
GtkWidget *widget);
-static void msgview_actions_execute_cb (GtkWidget *widget,
+static void msgview_actions_execute_cb (GtkWidget *widget,
gpointer data);
static void msgview_actions_execute (MessageView *msgview,
guint action_nb,
@@ -141,14 +141,14 @@ static void message_actions_execute (MessageView *msgview,
guint action_nb,
GSList *msg_list);
-static gboolean execute_filtering_actions(gchar *action,
+static gboolean execute_filtering_actions(gchar *action,
GSList *msglist);
-static gboolean execute_actions (gchar *action,
- GSList *msg_list,
+static gboolean execute_actions (gchar *action,
+ GSList *msg_list,
GtkWidget *text,
gint body_pos,
- MimeInfo *partinfo,
+ MimeInfo *partinfo,
void (*callback)(void *data),
void *data);
@@ -188,7 +188,7 @@ static gint io_dialog_key_pressed_cb (GtkWidget *widget,
static void catch_output (gpointer data,
gint source,
GIOCondition cond);
-static void catch_input (gpointer data,
+static void catch_input (gpointer data,
gint source,
GIOCondition cond);
static void catch_status (GPid pid, gint status, gpointer data);
@@ -232,8 +232,8 @@ ActionType action_get_type(const gchar *action_str)
* add ACTION_SINGLE | ACTION_MULTIPLE so it will
* only be executed from the main window toolbar */
if (p[2] == 's') /* source messages */
- action_type = ACTION_FILTERING_ACTION
- | ACTION_SINGLE
+ action_type = ACTION_FILTERING_ACTION
+ | ACTION_SINGLE
| ACTION_MULTIPLE;
in_filtering_action = TRUE;
break;
@@ -291,9 +291,9 @@ static gchar *parse_action_cmd(gchar *action, MsgInfo *msginfo,
GString *cmd;
gchar *p;
GSList *cur;
-
+
p = action;
-
+
if (p[0] == '|' || p[0] == '>' || p[0] == '*')
p++;
@@ -445,17 +445,17 @@ static gboolean parse_append_msgpart(GString *cmd, MsgInfo *msginfo,
return TRUE;
}
-void actions_execute(gpointer data,
+void actions_execute(gpointer data,
guint action_nb,
GtkWidget *widget,
gint source)
{
- if (source == TOOLBAR_MAIN)
+ if (source == TOOLBAR_MAIN)
mainwin_actions_execute((MainWindow*)data, action_nb, widget);
else if (source == TOOLBAR_COMPOSE)
compose_actions_execute((Compose*)data, action_nb, widget);
else if (source == TOOLBAR_MSGVIEW)
- msgview_actions_execute((MessageView*)data, action_nb, widget);
+ msgview_actions_execute((MessageView*)data, action_nb, widget);
}
void action_update_mainwin_menu(GtkUIManager *ui_manager,
@@ -474,7 +474,7 @@ void action_update_msgview_menu(GtkUIManager *ui_manager,
msgview_actions_execute_cb, msgview);
}
-void action_update_compose_menu(GtkUIManager *ui_manager,
+void action_update_compose_menu(GtkUIManager *ui_manager,
gchar *branch_path,
Compose *compose)
{
@@ -507,7 +507,7 @@ static GtkWidget *create_submenus(GtkWidget *menu, const gchar *action)
{
gchar *submenu = g_strdup(action);
GtkWidget *new_menu = NULL;
-
+
if (strchr(submenu, '/')) {
const gchar *end = (strchr(submenu, '/')+1);
GtkWidget *menu_item = NULL;
@@ -517,7 +517,7 @@ static GtkWidget *create_submenus(GtkWidget *menu, const gchar *action)
menu_item = gtk_menu_item_new_with_mnemonic(submenu);
g_object_set_data_full(G_OBJECT(menu_item), "s_name", g_strdup(submenu), g_free);
gtk_widget_show(menu_item);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
new_menu = gtk_menu_new();
gtk_widget_show(new_menu);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), new_menu);
@@ -559,7 +559,7 @@ static void action_update_menu(GtkUIManager *ui_manager,
} else {
action_name = action;
}
- gtk_menu_set_accel_group (GTK_MENU (cur_menu),
+ gtk_menu_set_accel_group (GTK_MENU (cur_menu),
gtk_ui_manager_get_accel_group(ui_manager));
item = gtk_menu_item_new_with_label(action_name);
gtk_menu_shell_append(GTK_MENU_SHELL(cur_menu), item);
@@ -610,7 +610,7 @@ static void compose_actions_execute(Compose *compose, guint action_nb, GtkWidget
return;
}
- execute_actions(action, NULL, compose->text, 0, NULL,
+ execute_actions(action, NULL, compose->text, 0, NULL,
compose_action_cb, compose);
}
@@ -668,7 +668,7 @@ static void message_actions_execute(MessageView *msgview, guint action_nb,
GtkWidget *text = NULL;
guint body_pos = 0;
ActionType action_type;
-
+
cm_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
buf = (gchar *)g_slist_nth_data(prefs_common.actions_list, action_nb);
@@ -691,7 +691,7 @@ static void message_actions_execute(MessageView *msgview, guint action_nb,
if (action_type & (ACTION_PIPE_OUT | ACTION_INSERT))
msgview->filtered = TRUE;
- if (action_type & ACTION_FILTERING_ACTION)
+ if (action_type & ACTION_FILTERING_ACTION)
/* CLAWS: most of the above code is not necessary for applying
* filtering */
execute_filtering_actions(action, msg_list);
@@ -719,7 +719,7 @@ static gboolean execute_filtering_actions(gchar *action, GSList *msglist)
if (NULL == (send = strrchr(sbegin, '}')))
return FALSE;
action_string = g_strndup(sbegin, send - sbegin);
-
+
action_list = matcher_parser_get_action_list(action_string);
if (action_list == NULL) {
gchar *tmp = g_strdup(action_string);
@@ -734,32 +734,32 @@ static gboolean execute_filtering_actions(gchar *action, GSList *msglist)
return FALSE;
}
g_free(action_string);
-
+
/* apply actions on each message info */
for (p = msglist; p && p->data; p = g_slist_next(p)) {
filteringaction_apply_action_list(action_list, (MsgInfo *) p->data);
}
if (summaryview) {
- summary_lock(summaryview);
- main_window_cursor_wait(mainwin);
- summary_freeze(summaryview);
- folder_item_update_freeze();
+ summary_lock(summaryview);
+ main_window_cursor_wait(mainwin);
+ summary_freeze(summaryview);
+ folder_item_update_freeze();
}
filtering_move_and_copy_msgs(msglist);
if (summaryview) {
- folder_item_update_thaw();
- summary_thaw(summaryview);
- main_window_cursor_normal(mainwin);
- summary_unlock(summaryview);
+ folder_item_update_thaw();
+ summary_thaw(summaryview);
+ main_window_cursor_normal(mainwin);
+ summary_unlock(summaryview);
summary_show(summaryview, summaryview->folder_item, FALSE);
}
for (p = action_list; p; p = g_slist_next(p))
- if (p->data) filteringaction_free(p->data);
- g_slist_free(action_list);
- return TRUE;
+ if (p->data) filteringaction_free(p->data);
+ g_slist_free(action_list);
+ return TRUE;
}
static gboolean execute_actions(gchar *action, GSList *msg_list,
@@ -889,7 +889,7 @@ static gboolean execute_actions(gchar *action, GSList *msg_list,
if ((child_info = fork_child(cmd, msg_str, children))) {
/* Pass msginfo to catch_status () */
if (!(action_type & (ACTION_PIPE_OUT | ACTION_INSERT)))
- child_info->msginfo_list =
+ child_info->msginfo_list =
g_slist_append (NULL, msginfo);
children_list = g_slist_append(children_list,
child_info);
@@ -903,7 +903,7 @@ static gboolean execute_actions(gchar *action, GSList *msg_list,
if (cmd) {
if ((child_info = fork_child(cmd, msg_str, children))) {
if (!(action_type & (ACTION_PIPE_OUT | ACTION_INSERT)))
- child_info->msginfo_list =
+ child_info->msginfo_list =
g_slist_copy (msg_list);
children_list = g_slist_append(children_list,
child_info);
@@ -932,7 +932,7 @@ static gboolean execute_actions(gchar *action, GSList *msg_list,
child_info = (ChildInfo *) cur->data;
child_info->callback = callback;
child_info->data = data;
- child_info->tag_status =
+ child_info->tag_status =
g_child_watch_add(child_info->pid, catch_status, child_info);
}
@@ -965,7 +965,7 @@ static ChildInfo *fork_child(gchar *cmd, const gchar *msg_str,
g_free(ret_str);
ret_str = g_strdup(cmd);
}
-
+
trim_cmd = ret_str;
while (g_ascii_isspace(trim_cmd[0]))
@@ -988,7 +988,7 @@ static ChildInfo *fork_child(gchar *cmd, const gchar *msg_str,
NULL, NULL, &pid, &chld_in, &chld_out,
&chld_err, &error);
} else {
- result = g_spawn_async(NULL, argv, NULL,
+ result = g_spawn_async(NULL, argv, NULL,
G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL,
&pid, &error);
}
@@ -1198,7 +1198,7 @@ static void free_children(Children *children)
if (callback)
callback(data);
-
+
g_free(children);
}
@@ -1454,13 +1454,13 @@ static void catch_status(GPid pid, gint status, gpointer data)
for (cur = child_info->msginfo_list; cur; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
if (!(msginfo && /* Stuff used valid? */
- msginfo->folder && msginfo->folder->cache))
+ msginfo->folder && msginfo->folder->cache))
continue;
file = procmsg_get_message_file_path (msginfo);
- if (!file)
+ if (!file)
continue;
nmi = procheader_parse_file (file, msginfo->flags, TRUE, FALSE);
- if (!nmi)
+ if (!nmi)
continue; /* Deleted? */
if (msginfo->mtime != nmi->mtime || msginfo->size != nmi->size) {
nmi->folder = msginfo->folder;
@@ -1474,9 +1474,9 @@ static void catch_status(GPid pid, gint status, gpointer data)
summaryview->folder_item == msginfo->folder &&
summary_get_msgnum(summaryview, summaryview->displayed) == msginfo->msgnum)
summary_redisplay_msg(summaryview);
-
+
}
- if (modified_something && last_item &&
+ if (modified_something && last_item &&
summaryview && summaryview->folder_item == last_item) {
summary_show (summaryview, summaryview->folder_item, FALSE);
}
@@ -1489,7 +1489,7 @@ static void catch_status(GPid pid, gint status, gpointer data)
wait_for_children(child_info->children);
}
-
+
static void catch_input(gpointer data, gint source, GIOCondition cond)
{
Children *children = (Children *)data;
@@ -1624,7 +1624,7 @@ static void catch_output(gpointer data, gint source, GIOCondition cond)
child_info->chld_err = -1;
}
}
-
+
wait_for_children(child_info->children);
}
diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c
@@ -90,7 +90,7 @@ void addressbook_custom_attr_edit()
manage_window_set_transient(GTK_WINDOW(custom_attr_window.window));
gtk_widget_grab_focus(custom_attr_window.ok_btn);
-
+
custom_attr_window_load_list(prefs_common.addressbook_custom_attributes);
gtk_widget_show(custom_attr_window.window);
@@ -106,13 +106,13 @@ static gint custom_attr_cmp_func (GtkTreeModel *model, GtkTreeIter *a,
gtk_tree_model_get(model, a, CUSTOM_ATTR_NAME, &name1, -1);
gtk_tree_model_get(model, b, CUSTOM_ATTR_NAME, &name2, -1);
-
+
if (name1 == NULL)
return name2 == NULL ? 0:1;
-
+
if (name2 == NULL)
return 1;
-
+
res = g_utf8_collate(name1, name2);
g_free(name1);
g_free(name2);
@@ -177,11 +177,11 @@ static void custom_attr_popup_delete (void *obj, void *data)
{
GtkTreeIter sel;
GtkTreeModel *model;
-
+
if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
(GTK_TREE_VIEW(custom_attr_window.attr_list)),
&model, &sel))
- return;
+ return;
if (alertpanel(_("Delete attribute name"),
_("Do you really want to delete this attribute name?"),
@@ -255,10 +255,10 @@ static gboolean custom_attr_list_popup_menu(GtkWidget *widget, gpointer data)
{
GtkTreeView *list_view = (GtkTreeView *)data;
GdkEventButton event;
-
+
event.button = 3;
event.time = gtk_get_current_event_time();
-
+
custom_attr_list_btn_pressed(NULL, &event, list_view);
return TRUE;
@@ -289,7 +289,7 @@ static GtkWidget *custom_attr_window_list_view_create (void)
return GTK_WIDGET(list_view);
}
-static void custom_attr_window_close(void)
+static void custom_attr_window_close(void)
{
if (dirty)
custom_attr_window_save_list();
@@ -301,14 +301,14 @@ static void custom_attr_window_close(void)
}
static void custom_attr_window_cancel_cb(GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
dirty = FALSE;
custom_attr_window_close();
}
static void custom_attr_window_ok_cb(GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
custom_attr_window_close();
}
@@ -353,7 +353,7 @@ static gboolean find_attr_in_store(GtkTreeModel *model,
return TRUE;
}
g_free(attr);
- return FALSE;
+ return FALSE;
}
static void custom_attr_window_add_attr(void)
@@ -370,7 +370,7 @@ static void custom_attr_window_add_attr(void)
fis.attr = new_attr;
fis.path = NULL;
gtk_tree_model_foreach(gtk_tree_view_get_model
- (GTK_TREE_VIEW(custom_attr_window.attr_list)),
+ (GTK_TREE_VIEW(custom_attr_window.attr_list)),
(GtkTreeModelForeachFunc) find_attr_in_store,
&fis);
@@ -385,7 +385,7 @@ static void custom_attr_window_add_attr(void)
gtk_tree_selection_select_iter(selection, &fis.iter);
path = gtk_tree_model_get_path(model, &fis.iter);
- /* XXX returned path may not be valid??? create new one to be sure */
+ /* XXX returned path may not be valid??? create new one to be sure */
gtk_tree_view_set_cursor(GTK_TREE_VIEW(custom_attr_window.attr_list),
path, NULL, FALSE);
@@ -411,7 +411,7 @@ static void custom_attr_window_add_attr(void)
}
static void custom_attr_window_add_attr_cb(GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
custom_attr_window_add_attr();
gtk_entry_set_text(GTK_ENTRY(custom_attr_window.add_entry), "");
@@ -419,7 +419,7 @@ static void custom_attr_window_add_attr_cb(GtkWidget *widget,
}
static void custom_attr_window_del_attr_cb(GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
custom_attr_popup_delete(NULL, NULL);
gtk_widget_grab_focus(custom_attr_window.attr_list);
@@ -446,7 +446,7 @@ static gboolean custom_attr_window_add_key_pressed(GtkWidget *widget,
return FALSE;
}
-static void custom_attr_window_create(void)
+static void custom_attr_window_create(void)
{
GtkWidget *window;
GtkWidget *hbox1;
@@ -477,22 +477,22 @@ static void custom_attr_window_create(void)
vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
-
+
new_attr_label = gtk_label_new(_("New attribute name:"));
gtk_label_set_xalign(GTK_LABEL(new_attr_label), 0.0);
gtk_box_pack_start(GTK_BOX(hbox1), new_attr_label, FALSE, FALSE, 0);
-
+
new_attr_entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(hbox1), new_attr_entry, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(new_attr_entry), "key_press_event",
G_CALLBACK(custom_attr_window_add_key_pressed), NULL);
-
+
add_btn = gtkut_stock_button("list-add", _("_Add"));
gtk_box_pack_start(GTK_BOX(hbox1), add_btn, FALSE, FALSE, 0);
-
+
del_btn = gtkut_stock_button("edit-delete", _("D_elete"));
gtk_box_pack_start(GTK_BOX(hbox1), del_btn, FALSE, FALSE, 0);
-
+
gtkut_stock_button_set_create(&hbox2, &cancel_btn, NULL, _("_Cancel"),
&ok_btn, NULL, _("_OK"),
NULL, NULL, NULL);
@@ -514,25 +514,25 @@ static void custom_attr_window_create(void)
G_CALLBACK(custom_attr_window_del_attr_cb), NULL);
attr_list = custom_attr_window_list_view_create();
-
+
label = gtk_label_new(_("Adding or removing attribute names won't "
"affect attributes already set for contacts."));
gtk_widget_set_size_request(GTK_WIDGET(label), 380, -1);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_box_pack_start(GTK_BOX(vbox1), label, FALSE, TRUE, 0);
-
+
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-
+
gtk_widget_set_size_request(scrolledwin, 400, 250);
gtk_container_add(GTK_CONTAINER(scrolledwin), attr_list);
gtk_box_pack_start(GTK_BOX(vbox1), scrolledwin, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox1), hbox2, FALSE, FALSE, 0);
-
+
gtk_widget_show(label);
gtk_widget_show(scrolledwin);
gtk_widget_show(attr_list);
@@ -553,7 +553,7 @@ static void custom_attr_window_create(void)
custom_attr_window.add_entry = new_attr_entry;
}
-static void custom_attr_window_load_list (GList *list)
+static void custom_attr_window_load_list (GList *list)
{
/* copy attribute names list from prefs to store */
GList *cur;
@@ -562,7 +562,7 @@ static void custom_attr_window_load_list (GList *list)
(GTK_TREE_VIEW(custom_attr_window.attr_list)));
custom_attr_window_list_view_clear_list(custom_attr_window.attr_list, FALSE);
-
+
cur = list;
while (cur) {
gtk_list_store_append(list_store, &iter);
@@ -590,7 +590,7 @@ static gboolean custom_attr_store_to_glist (GtkTreeModel *model,
return FALSE;
}
-static void custom_attr_window_save_list (void)
+static void custom_attr_window_save_list (void)
{
GList *cur;
@@ -604,7 +604,7 @@ static void custom_attr_window_save_list (void)
/* copy attribute names list from store to prefs */
gtk_tree_model_foreach(gtk_tree_view_get_model
- (GTK_TREE_VIEW(custom_attr_window.attr_list)),
+ (GTK_TREE_VIEW(custom_attr_window.attr_list)),
(GtkTreeModelForeachFunc) custom_attr_store_to_glist,
NULL);
prefs_common.addressbook_custom_attributes = g_list_reverse(store_to_glist);
diff --git a/src/advsearch.c b/src/advsearch.c
@@ -364,7 +364,7 @@ do { \
static void prepare_matcher_tag(AdvancedSearch *search)
{
- gchar **words = search->request.matchstring
+ gchar **words = search->request.matchstring
? g_strsplit(search->request.matchstring, " ", -1)
: NULL;
gint i = 0;
diff --git a/src/displayheader.c b/src/displayheader.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -30,7 +30,7 @@ gchar *display_header_prop_get_str(DisplayHeaderProp *dp)
{
return g_strconcat(dp->hidden ? "-" : "", dp->name, NULL);
}
-
+
DisplayHeaderProp *display_header_prop_read_str(gchar *buf)
{
DisplayHeaderProp *dp;
@@ -50,7 +50,7 @@ DisplayHeaderProp *display_header_prop_read_str(gchar *buf)
return dp;
}
-
+
void display_header_prop_free(DisplayHeaderProp *dp)
{
if (!dp) return;
diff --git a/src/edittags.c b/src/edittags.c
@@ -61,13 +61,13 @@ static gint tag_cmp_func (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, g
gtk_tree_model_get(model, a, TAG_NAME, &name1, -1);
gtk_tree_model_get(model, b, TAG_NAME, &name2, -1);
-
+
if (name1 == NULL)
return name2 == NULL ? 0:1;
-
+
if (name2 == NULL)
return 1;
-
+
res = g_utf8_collate(name1,name2);
g_free(name1);
g_free(name2);
@@ -115,7 +115,7 @@ void tags_window_open(GSList *msglist)
manage_window_set_transient(GTK_WINDOW(tagswindow.window));
gtk_widget_grab_focus(tagswindow.close_btn);
-
+
tagswindow.msglist = msglist;
tags_window_load_tags();
@@ -127,7 +127,7 @@ void tags_window_open(GSList *msglist)
gtk_tree_view_remove_column(GTK_TREE_VIEW(tagswindow.taglist),
gtk_tree_view_get_column(GTK_TREE_VIEW(tagswindow.taglist), 0));
tagswindow.has_tag_col = FALSE;
- }
+ }
if (msglist == NULL) {
gtk_widget_hide(tagswindow.label);
gtk_widget_show(tagswindow.del_btn);
@@ -185,7 +185,7 @@ static void tags_window_insert_check_column(GtkWidget *list_view)
"inconsistent", TAG_SELECTED_INCONSISTENT,
NULL);
gtk_tree_view_column_set_alignment (column, 0.5);
- gtk_tree_view_insert_column(GTK_TREE_VIEW(list_view), column, 0);
+ gtk_tree_view_insert_column(GTK_TREE_VIEW(list_view), column, 0);
g_signal_connect(G_OBJECT(renderer), "toggled",
G_CALLBACK(tags_selected_toggled),
list_view);
@@ -237,7 +237,7 @@ static void tags_popup_delete (GtkAction *action, gpointer data)
TAGS_WINDOW_LOCK();
- /* XXX: Here's the reason why we need to store the original
+ /* XXX: Here's the reason why we need to store the original
* pointer: we search the slist for it. */
gtk_tree_model_get(model, &sel,
TAG_DATA, &id,
@@ -264,7 +264,7 @@ static void tags_popup_delete_all (GtkAction *action, gpointer data)
GSList *cur, *tags;
GtkTreeModel *model;
SummaryView *summaryview = NULL;
-
+
if (alertpanel(_("Delete all tags"),
_("Do you really want to delete all tags?"),
NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
@@ -341,10 +341,10 @@ static gboolean tags_list_popup_menu(GtkWidget *widget, gpointer data)
{
GtkTreeView *list_view = (GtkTreeView *)data;
GdkEventButton event;
-
+
event.button = 3;
event.time = gtk_get_current_event_time();
-
+
tags_list_btn_pressed(NULL, &event, list_view);
return TRUE;
@@ -377,7 +377,7 @@ static GtkWidget *tags_window_list_view_create (void)
static void tags_window_list_view_clear_tags(GtkWidget *list_view);
-static void tags_window_close(void)
+static void tags_window_close(void)
{
if (tagswindow.busy)
return;
@@ -394,7 +394,7 @@ static void tags_window_close(void)
}
static void tags_window_close_cb(GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
tags_window_close();
}
@@ -423,7 +423,7 @@ static gboolean find_tag_in_store(GtkTreeModel *model,
return TRUE;
}
- return FALSE;
+ return FALSE;
}
static void tags_window_add_tag(void)
@@ -447,15 +447,15 @@ static void tags_window_add_tag(void)
tags_write_tags();
if (mainwindow_get_mainwindow())
summary_set_tag(
- mainwindow_get_mainwindow()->summaryview,
+ mainwindow_get_mainwindow()->summaryview,
id, NULL);
main_window_reflect_tags_changes(mainwindow_get_mainwindow());
tags_window_list_view_insert_tag(tagswindow.taglist, NULL, id);
- }
+ }
fis.tag_id = id;
fis.path = NULL;
gtk_tree_model_foreach(gtk_tree_view_get_model
- (GTK_TREE_VIEW(tagswindow.taglist)),
+ (GTK_TREE_VIEW(tagswindow.taglist)),
(GtkTreeModelForeachFunc) find_tag_in_store,
&fis);
if (fis.path) {
@@ -466,12 +466,12 @@ static void tags_window_add_tag(void)
if (mainwindow_get_mainwindow())
summary_set_tag(
- mainwindow_get_mainwindow()->summaryview,
+ mainwindow_get_mainwindow()->summaryview,
id, NULL);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tagswindow.taglist));
gtk_tree_selection_select_iter(selection, &fis.iter);
path = gtk_tree_model_get_path(model, &fis.iter);
- /* XXX returned path may not be valid??? create new one to be sure */
+ /* XXX returned path may not be valid??? create new one to be sure */
gtk_tree_view_set_cursor(GTK_TREE_VIEW(tagswindow.taglist), path, NULL, FALSE);
tags_window_list_view_insert_tag(tagswindow.taglist, &fis.iter, id);
gtk_tree_path_free(path);
@@ -481,7 +481,7 @@ static void tags_window_add_tag(void)
g_free(new_tag);
}
-static void tags_window_add_tag_cb(GtkWidget *widget, gpointer data)
+static void tags_window_add_tag_cb(GtkWidget *widget, gpointer data)
{
if (tagswindow.busy)
return;
@@ -490,7 +490,7 @@ static void tags_window_add_tag_cb(GtkWidget *widget, gpointer data)
gtk_widget_grab_focus(tagswindow.taglist);
}
-static void tags_window_del_tag_cb(GtkWidget *widget, gpointer data)
+static void tags_window_del_tag_cb(GtkWidget *widget, gpointer data)
{
if (tagswindow.busy)
return;
@@ -519,7 +519,7 @@ static gboolean tags_window_add_key_pressed(GtkWidget *widget, GdkEventKey *even
gtk_entry_set_text(GTK_ENTRY(tagswindow.add_entry), "");
gtk_widget_grab_focus(tagswindow.taglist);
}
-
+
return FALSE;
}
@@ -535,7 +535,7 @@ static void tags_window_size_allocate_cb(GtkWidget *widget,
&prefs_common.tagswin_width, &prefs_common.tagswin_height);
}
-static void tags_window_create(void)
+static void tags_window_create(void)
{
GtkWidget *window;
GtkWidget *hbox1;
@@ -602,16 +602,16 @@ static void tags_window_create(void)
G_CALLBACK(tags_window_del_tag_cb), NULL);
taglist = tags_window_list_view_create();
-
+
label = gtk_label_new(_("Choose the tag(s) for the message(s).\n"
"Changes are immediately applied."));
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_box_pack_start(GTK_BOX(vbox1), label, FALSE, TRUE, 0);
-
+
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
+
gtk_container_add(GTK_CONTAINER(scrolledwin), taglist);
gtk_box_pack_start(GTK_BOX(vbox1), scrolledwin, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, FALSE, 0);
@@ -645,8 +645,8 @@ static void tags_window_create(void)
tagswindow.has_tag_col = FALSE;
tagswindow.watch_cursor = gdk_cursor_new_for_display(
gtk_widget_get_display(window), GDK_WATCH);
-
- g_signal_connect(G_OBJECT(new_tag_entry), "changed",
+
+ g_signal_connect(G_OBJECT(new_tag_entry), "changed",
G_CALLBACK(new_tag_set_add_sensitivity), NULL);
new_tag_set_add_sensitivity();
}
@@ -691,7 +691,7 @@ static void tags_selected_toggled(GtkCellRendererToggle *widget,
TAG_SELECTED, set,
TAG_SELECTED_INCONSISTENT, FALSE,
-1);
-
+
TAGS_WINDOW_LOCK();
if (summaryview)
summary_set_tag(summaryview, set ? tag_id : -tag_id, NULL);
@@ -727,15 +727,15 @@ static void tags_selected_edited(GtkCellRendererText *widget,
-1);
tag_id = GPOINTER_TO_INT(tmp);
-
+
TAGS_WINDOW_LOCK();
if (selected) {
if (summaryview)
summary_set_tag(summaryview, -tag_id, NULL);
}
-
+
tags_update_tag(tag_id, new_text);
-
+
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
TAG_NAME, new_text,
-1);
@@ -745,7 +745,7 @@ static void tags_selected_edited(GtkCellRendererText *widget,
} else {
if (summaryview)
summary_set_tag(summaryview, 0, NULL);
- }
+ }
TAGS_WINDOW_UNLOCK();
}
@@ -770,7 +770,7 @@ static void tags_window_get_selected_state(gint tag, gboolean *selected, gboolea
static void tags_window_list_view_insert_tag(GtkWidget *list_view,
GtkTreeIter *row_iter,
- gint tag)
+ gint tag)
{
GtkTreeIter iter;
GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model
@@ -808,12 +808,12 @@ static void new_tag_set_add_sensitivity()
}
-static void tags_window_load_tags (void)
+static void tags_window_load_tags (void)
{
GSList *cur, *tags;
gint id;
tags_window_list_view_clear_tags(tagswindow.taglist);
-
+
cur = tags = tags_get_list();
for (; cur; cur = cur->next) {
id = GPOINTER_TO_INT(cur->data);
diff --git a/src/file_checker.c b/src/file_checker.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -66,13 +66,13 @@ static gboolean verify_folderlist_xml()
bak = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
FOLDER_LIST, ".bak", NULL);
bakexists = is_file_exist(bak);
-
+
if (bakexists) {
date = get_file_mtime(bak);
ts = localtime(&date);
strftime(buf, sizeof(buf), "%a %d-%b-%Y %H:%M %Z", ts);
}
-
+
if (!fileexists && bakexists) {
AlertValue aval;
gchar *msg;
diff --git a/src/folder.c b/src/folder.c
@@ -254,7 +254,7 @@ void folder_item_change_type(FolderItem *item, SpecialFolderItemType newtype)
/* set new type for current folder and sons */
item->stype = newtype;
folder_func_to_all_folders(reset_parent_type, NULL);
-
+
hookdata.folder = folder;
hookdata.update_flags = FOLDER_TREE_CHANGED;
hookdata.item = NULL;
@@ -421,9 +421,9 @@ void folder_item_remove(FolderItem *item)
cm_return_if_fail(item->folder->node != NULL);
start_node = item->node;
-
+
node = item->folder->node;
-
+
node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
node = node->children;
@@ -668,7 +668,7 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
"draft", "queue", "trash"};
static gchar *sort_key_str[] = {"none", "number", "size", "date",
"from", "subject", "score", "label",
- "mark", "unread", "mime", "to",
+ "mark", "unread", "mime", "to",
"locked", "tags", "thread_date" };
XMLTag *tag;
gchar *value;
@@ -770,7 +770,7 @@ void folder_tree_destroy(Folder *folder)
cm_return_if_fail(folder != NULL);
node = folder->node;
-
+
prefs_filtering_clear_folder(folder);
if (node != NULL) {
@@ -904,7 +904,7 @@ void folder_write_list(void)
if (xml_file_put_xml_decl(pfile->fp) < 0) {
prefs_file_close_revert(pfile);
g_warning("failed to start write folder list");
- return;
+ return;
}
tag = xml_tag_new("folderlist");
xml_tag_add_attr(tag, xml_attr_new_int("config_version",
@@ -967,7 +967,7 @@ void folder_scan_tree(Folder *folder, gboolean rebuild)
if (!folder->klass->scan_tree)
return;
-
+
pptable = folder_persist_prefs_new(folder);
if (rebuild)
@@ -1001,7 +1001,7 @@ void folder_scan_tree(Folder *folder, gboolean rebuild)
FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
{
FolderItem *new_item;
-
+
cm_return_val_if_fail(parent != NULL, NULL);
new_item = parent->folder->klass->create_folder(parent->folder, parent, name);
@@ -1091,7 +1091,7 @@ void folder_func_to_all_folders(FolderItemFunc function, gpointer data)
GList *list;
Folder *folder;
struct FuncToAllFoldersData function_data;
-
+
function_data.function = function;
function_data.data = data;
@@ -1134,9 +1134,9 @@ static gboolean folder_get_status_full_all_func(GNode *node, gpointer data)
FolderItem *item;
struct TotalMsgStatus *status = (struct TotalMsgStatus *)data;
gchar *id;
-
+
cm_return_val_if_fail(node->data != NULL, FALSE);
-
+
item = FOLDER_ITEM(node->data);
if (!item->path) return FALSE;
@@ -1152,22 +1152,22 @@ static gboolean folder_get_status_full_all_func(GNode *node, gpointer data)
item->total_msgs, id);
g_free(id);
}
-
+
return FALSE;
}
-
+
static void folder_get_status_full_all(GString *str, guint *new, guint *unread,
guint *total)
{
GList *list;
Folder *folder;
struct TotalMsgStatus status;
-
+
status.new = status.unread = status.total = 0;
status.str = str;
-
+
debug_print("Counting total number of messages...\n");
-
+
for (list = folder_list; list != NULL; list = list->next) {
folder = FOLDER(list->data);
if (folder->node)
@@ -1176,7 +1176,7 @@ static void folder_get_status_full_all(GString *str, guint *new, guint *unread,
folder_get_status_full_all_func,
&status);
}
-
+
*new = status.new;
*unread = status.unread;
*total = status.total;
@@ -1224,7 +1224,7 @@ gchar *folder_get_status(GPtrArray *folders, gboolean full)
return g_string_free(str, FALSE);
}
-void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs,
+void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs,
guint *unreadmarked_msgs, guint *marked_msgs,
guint *total_msgs, guint *replied_msgs,
guint *forwarded_msgs, guint *locked_msgs,
@@ -1260,7 +1260,7 @@ Folder *folder_find_from_path(const gchar *path)
for (list = folder_list; list != NULL; list = list->next) {
folder = list->data;
- if ((FOLDER_TYPE(folder) == F_MH ||
+ if ((FOLDER_TYPE(folder) == F_MH ||
FOLDER_TYPE(folder) == F_MBOX) &&
!path_cmp(LOCAL_FOLDER(folder)->rootpath, path))
return folder;
@@ -1276,7 +1276,7 @@ Folder *folder_find_from_name(const gchar *name, FolderClass *klass)
for (list = folder_list; list != NULL; list = list->next) {
folder = list->data;
- if (folder->klass == klass &&
+ if (folder->klass == klass &&
g_strcmp0(name, folder->name) == 0)
return folder;
}
@@ -1303,9 +1303,9 @@ FolderItem *folder_find_item_from_path(const gchar *path)
Folder *folder;
gpointer d[2];
GList *list = folder_get_list();
-
+
folder = list ? list->data:NULL;
-
+
cm_return_val_if_fail(folder != NULL, NULL);
d[0] = (gpointer)path;
@@ -1340,9 +1340,9 @@ FolderItem *folder_find_item_from_real_path(const gchar *path)
Folder *folder;
gpointer d[2];
GList *list = folder_get_list();
-
+
folder = list ? list->data:NULL;
-
+
cm_return_val_if_fail(folder != NULL, NULL);
d[0] = (gpointer)path;
@@ -1493,7 +1493,7 @@ FolderItem *folder_find_item_from_identifier(const gchar *identifier)
*
* The FolderItem is created if it doesn't already exist.
* If creation failed, the function returns NULL.
- *
+ *
* Identifiers are of the form #type/Mailbox/FolderA/FolderB/FolderC
*/
FolderItem *folder_get_item_from_identifier(const gchar *identifier)
@@ -1940,7 +1940,7 @@ static gint folder_sort_folder_list(gconstpointer a, gconstpointer b)
{
guint gint_a = GPOINTER_TO_INT(a);
guint gint_b = GPOINTER_TO_INT(b);
-
+
return (gint_a - gint_b);
}
@@ -1968,7 +1968,7 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
folder_item_set_batch(item, TRUE);
for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
msginfo = (MsgInfo *) cur->data;
-
+
if (g_hash_table_lookup_extended(relation, msginfo, &old_key, &data)) {
permflags = GPOINTER_TO_INT(data);
@@ -1982,7 +1982,7 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
folder_item_set_batch(item, FALSE);
folder_item_update_thaw();
}
- g_hash_table_destroy(relation);
+ g_hash_table_destroy(relation);
return ret;
}
@@ -1992,7 +1992,7 @@ static gint folder_item_syncronize_flags(FolderItem *item)
MsgInfoList *msglist = NULL;
GSList *cur;
gint ret = 0;
-
+
cm_return_val_if_fail(item != NULL, -1);
cm_return_val_if_fail(item->folder != NULL, -1);
cm_return_val_if_fail(item->folder->klass != NULL, -1);
@@ -2003,15 +2003,15 @@ static gint folder_item_syncronize_flags(FolderItem *item)
if (item->cache == NULL)
folder_item_read_cache(item);
-
+
msglist = msgcache_get_msg_list(item->cache);
-
+
ret = syncronize_flags(item, msglist);
for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
procmsg_msginfo_free((MsgInfo **)&(cur->data));
}
-
+
g_slist_free(msglist);
item->scanning = ITEM_NOT_SCANNING;
@@ -2033,10 +2033,10 @@ static void folder_item_process_open (FolderItem *item,
} else {
folder_item_syncronize_flags(item);
}
-
+
/* Processing */
if (item->prefs->enable_processing_when_opening) {
- buf = g_strdup_printf(_("Processing (%s)...\n"),
+ buf = g_strdup_printf(_("Processing (%s)...\n"),
item->path ? item->path : item->name);
g_free(buf);
@@ -2049,12 +2049,12 @@ static void folder_item_process_open (FolderItem *item,
after_proc_func(data);
}
item->processing_pending = FALSE;
- return;
+ return;
}
gint folder_item_open(FolderItem *item)
{
- START_TIMING("");
+ START_TIMING("");
if (item->no_select)
return -1;
@@ -2065,7 +2065,7 @@ gint folder_item_open(FolderItem *item)
item->processing_pending = TRUE;
folder_item_process_open (item, NULL, NULL, NULL);
-
+
item->opened = TRUE;
END_TIMING();
return 0;
@@ -2075,7 +2075,7 @@ gint folder_item_close(FolderItem *item)
{
GSList *mlist, *cur;
Folder *folder;
-
+
cm_return_val_if_fail(item != NULL, -1);
if (item->no_select)
@@ -2094,10 +2094,10 @@ gint folder_item_close(FolderItem *item)
}
g_slist_free(mlist);
folder_item_update_thaw();
- }
+ }
folder_item_write_cache(item);
-
+
folder_item_update(item, F_ITEM_UPDATE_MSGCNT);
item->opened = FALSE;
@@ -2115,7 +2115,7 @@ static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist)
Folder *folder = item->folder;
if (item->no_select)
return NULL;
-
+
if (folder->klass->get_msginfos != NULL)
msglist = folder->klass->get_msginfos(folder, item, numlist);
else {
@@ -2129,7 +2129,7 @@ static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist)
msginfo = folder->klass->get_msginfo(folder, item, num);
if (msginfo != NULL)
msglist = g_slist_prepend(msglist, msginfo);
- }
+ }
}
return msglist;
@@ -2166,7 +2166,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
gboolean update_flags = 0, old_uids_valid = FALSE;
GHashTable *subject_table = NULL;
-
+
cm_return_val_if_fail(item != NULL, -1);
if (item->path == NULL) return -1;
@@ -2178,7 +2178,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
item->scanning = ITEM_SCANNING_WITH_FLAGS;
debug_print("Scanning folder %s for cache changes.\n", item->path ? item->path : "(null)");
-
+
/* Get list of messages for folder and cache */
if (folder->klass->get_num_list(item->folder, item, &folder_list, &old_uids_valid) < 0) {
debug_print("Error fetching list of message numbers\n");
@@ -2189,7 +2189,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
if(prefs_common.thread_by_subject) {
subject_table = g_hash_table_new(g_str_hash, g_str_equal);
}
-
+
if (old_uids_valid) {
if (!item->cache)
folder_item_read_cache(item);
@@ -2213,7 +2213,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
if (cache_list_cur != NULL) {
GSList *cache_list_last;
-
+
cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
cache_list_last = g_slist_last(cache_list);
cache_max_num = ((MsgInfo *)cache_list_last->data)->msgnum;
@@ -2224,7 +2224,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
if (folder_list_cur != NULL) {
GSList *folder_list_last;
-
+
folder_cur_num = GPOINTER_TO_UINT(folder_list_cur->data);
folder_list_last = g_slist_last(folder_list);
folder_max_num = GPOINTER_TO_UINT(folder_list_last->data);
@@ -2245,7 +2245,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
case F_NEWS:
if (folder_cur_num < cache_max_num)
break;
-
+
if (folder->account->max_articles == 0) {
add = TRUE;
}
@@ -2260,7 +2260,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
add = TRUE;
break;
}
-
+
if (add) {
new_list = g_slist_prepend(new_list, GUINT_TO_POINTER(folder_cur_num));
debug_print("Remembered message %u for fetching\n", folder_cur_num);
@@ -2323,11 +2323,11 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
subject_table_insert(subject_table, msginfo->subject, msginfo);
}
}
-
+
/* Move to next folder and cache number */
if (cache_list_cur)
cache_list_cur = cache_list_cur->next;
-
+
if (folder_list_cur)
folder_list_cur = folder_list_cur->next;
@@ -2344,7 +2344,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
continue;
}
}
-
+
for(cache_list_cur = cache_list; cache_list_cur != NULL; cache_list_cur = g_slist_next(cache_list_cur))
procmsg_msginfo_free((MsgInfo **)&(cache_list_cur->data));
@@ -2363,7 +2363,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
}
folder_item_update_freeze();
-
+
item->scanning = ITEM_SCANNING;
if (newmsg_list != NULL) {
@@ -2386,19 +2386,19 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
MSG_IS_IGNORE_THREAD(msginfo->flags) &&
!subject_table_lookup(subject_table, msginfo->subject)) {
subject_table_insert(subject_table, msginfo->subject, msginfo);
- }
+ }
}
}
if (do_filter) {
GSList *unfiltered;
-
+
folder_item_set_batch(item, TRUE);
- procmsg_msglist_filter(newmsg_list, item->folder->account,
- &to_filter, &unfiltered,
+ procmsg_msglist_filter(newmsg_list, item->folder->account,
+ &to_filter, &unfiltered,
TRUE);
folder_item_set_batch(item, FALSE);
-
+
filtering_move_and_copy_msgs(newmsg_list);
if (to_filter != NULL) {
for (elem = to_filter; elem; elem = g_slist_next(elem)) {
@@ -2484,11 +2484,11 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
}
folder_item_set_batch(item, FALSE);
g_slist_free(exists_list);
-
+
if(prefs_common.thread_by_subject) {
g_hash_table_destroy(subject_table);
}
-
+
if (item->new_msgs != newcnt || item->unread_msgs != unreadcnt
|| item->total_msgs != totalcnt || item->marked_msgs != markedcnt
|| item->unreadmarked_msgs != unreadmarkedcnt
@@ -2513,7 +2513,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
folder_item_update(item, update_flags);
folder_item_update_thaw();
-
+
item->scanning = ITEM_NOT_SCANNING;
return 0;
@@ -2530,7 +2530,7 @@ static void folder_count_total_cache_memusage(FolderItem *item, gpointer data)
if (item->cache == NULL)
return;
-
+
*memusage += msgcache_get_memory_usage(item->cache);
}
@@ -2538,7 +2538,7 @@ static gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
{
FolderItem *fa = (FolderItem *)a;
FolderItem *fb = (FolderItem *)b;
-
+
return (gint) (msgcache_get_last_access_time(fa->cache) - msgcache_get_last_access_time(fb->cache));
}
@@ -2546,7 +2546,7 @@ static void folder_find_expired_caches(FolderItem *item, gpointer data)
{
GSList **folder_item_list = (GSList **)data;
gint difftime, expiretime;
-
+
if (item->cache == NULL)
return;
@@ -2565,10 +2565,10 @@ static void folder_find_expired_caches(FolderItem *item, gpointer data)
gboolean folder_item_free_cache(FolderItem *item, gboolean force)
{
cm_return_val_if_fail(item != NULL, TRUE);
-
+
if (item->cache == NULL)
return TRUE;
-
+
if (item->opened > 0 && !force)
return FALSE;
@@ -2596,15 +2596,15 @@ void folder_clean_cache_memory(FolderItem *protected_item)
{
gint memusage = 0;
- folder_func_to_all_folders(folder_count_total_cache_memusage, &memusage);
+ folder_func_to_all_folders(folder_count_total_cache_memusage, &memusage);
debug_print("Total cache memory usage: %d\n", memusage);
-
+
if (memusage > (prefs_common.cache_max_mem_usage * 1024)) {
GSList *folder_item_list = NULL, *listitem;
-
+
debug_print("Trying to free cache memory\n");
- folder_func_to_all_folders(folder_find_expired_caches, &folder_item_list);
+ folder_func_to_all_folders(folder_find_expired_caches, &folder_item_list);
listitem = folder_item_list;
while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
FolderItem *item = (FolderItem *)(listitem->data);
@@ -2632,7 +2632,7 @@ static void folder_item_remove_cached_msg(FolderItem *item, MsgInfo *msginfo)
if (folder->klass->remove_cached_msg == NULL)
return;
-
+
folder->klass->remove_cached_msg(folder, item, msginfo);
}
@@ -2748,7 +2748,7 @@ void folder_item_write_cache(FolderItem *item)
gchar *id;
time_t last_mtime = (time_t)0;
gboolean need_scan = FALSE;
-
+
if (!item || !item->path || !item->cache)
return;
@@ -2805,37 +2805,37 @@ void folder_item_write_cache(FolderItem *item)
MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
{
MsgInfo *msginfo = NULL;
-
+
cm_return_val_if_fail(item != NULL, NULL);
if (item->no_select)
return NULL;
if (!item->cache)
folder_item_read_cache(item);
-
+
if ((msginfo = msgcache_get_msg(item->cache, num)) != NULL)
return msginfo;
-
+
msginfo = get_msginfo(item, num);
if (msginfo != NULL) {
msgcache_add_msg(item->cache, msginfo);
return msginfo;
}
-
+
return NULL;
}
MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
{
MsgInfo *msginfo;
-
+
cm_return_val_if_fail(item != NULL, NULL);
cm_return_val_if_fail(msgid != NULL, NULL);
if (item->no_select)
return NULL;
-
+
if (!item->cache)
folder_item_read_cache(item);
-
+
if ((msginfo = msgcache_get_msg_by_id(item->cache, msgid)) != NULL)
return msginfo;
@@ -2847,12 +2847,12 @@ GSList *folder_item_get_msg_list(FolderItem *item)
cm_return_val_if_fail(item != NULL, NULL);
if (item->no_select)
return NULL;
-
+
if (item->cache == 0)
folder_item_read_cache(item);
cm_return_val_if_fail(item->cache != NULL, NULL);
-
+
return msgcache_get_msg_list(item->cache);
}
@@ -2860,18 +2860,18 @@ static void msginfo_set_mime_flags(GNode *node, gpointer data)
{
MsgInfo *msginfo = data;
MimeInfo *mimeinfo = node->data;
-
+
if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT &&
(!mimeinfo->subtype || (strcmp(mimeinfo->subtype, "pgp-signature") &&
strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
strcmp(mimeinfo->subtype, "pkcs7-signature")))) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
- } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN &&
+ } else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN &&
mimeinfo->id == NULL &&
mimeinfo->type != MIMETYPE_TEXT &&
mimeinfo->type != MIMETYPE_MULTIPART) {
- if (!mimeinfo->subtype
- || (strcmp(mimeinfo->subtype, "pgp-signature") &&
+ if (!mimeinfo->subtype
+ || (strcmp(mimeinfo->subtype, "pgp-signature") &&
strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
strcmp(mimeinfo->subtype, "pkcs7-signature")))
procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
@@ -2879,7 +2879,7 @@ static void msginfo_set_mime_flags(GNode *node, gpointer data)
mimeinfo->id == NULL &&
(strcmp(mimeinfo->subtype, "pgp-signature") &&
strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
- strcmp(mimeinfo->subtype, "pkcs7-signature")) &&
+ strcmp(mimeinfo->subtype, "pkcs7-signature")) &&
(procmime_mimeinfo_get_parameter(mimeinfo, "name") != NULL ||
procmime_mimeinfo_get_parameter(mimeinfo, "filename") != NULL)) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
@@ -2925,13 +2925,13 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
item->cache_dirty = TRUE;
item->mark_dirty = TRUE;
item->tags_dirty = TRUE;
- if (!folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
+ if (!folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
!folder_has_parent_of_type(msginfo->folder, F_DRAFT))
mimeinfo = procmime_scan_file(msgfile);
else
mimeinfo = procmime_scan_queue_file(msgfile);
/* check for attachments */
- if (mimeinfo != NULL) {
+ if (mimeinfo != NULL) {
g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
procmime_mimeinfo_free_all(&mimeinfo);
@@ -2954,17 +2954,17 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
cm_return_val_if_fail(item != NULL, NULL);
if (item->no_select)
return NULL;
-
+
folder = item->folder;
if (folder->klass->fetch_msg_full == NULL)
return folder_item_fetch_msg(item, num);
if (item->prefs->offlinesync)
- msgfile = folder->klass->fetch_msg_full(folder, item, num,
+ msgfile = folder->klass->fetch_msg_full(folder, item, num,
TRUE, TRUE);
else
- msgfile = folder->klass->fetch_msg_full(folder, item, num,
+ msgfile = folder->klass->fetch_msg_full(folder, item, num,
headers, body);
if (msgfile != NULL) {
@@ -3007,7 +3007,7 @@ static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
if ((fp = claws_fopen(file, "rb")) == NULL)
return 0;
- if ((folder_has_parent_of_type(dest, F_QUEUE)) ||
+ if ((folder_has_parent_of_type(dest, F_QUEUE)) ||
(folder_has_parent_of_type(dest, F_DRAFT)))
while (claws_fgets(buf, sizeof(buf), fp) != NULL) {
/* new way */
@@ -3040,7 +3040,7 @@ static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
debug_print("found message as uid %d\n", msgnum);
}
}
-
+
g_free(hentry[0].body);
hentry[0].body = NULL;
claws_fclose(fp);
@@ -3064,9 +3064,9 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
}
/* remove new, unread and deleted in special folders */
- if (folder_has_parent_of_type(dest->folder, F_OUTBOX) ||
- folder_has_parent_of_type(dest->folder, F_QUEUE) ||
- folder_has_parent_of_type(dest->folder, F_DRAFT) ||
+ if (folder_has_parent_of_type(dest->folder, F_OUTBOX) ||
+ folder_has_parent_of_type(dest->folder, F_QUEUE) ||
+ folder_has_parent_of_type(dest->folder, F_DRAFT) ||
folder_has_parent_of_type(dest->folder, F_TRASH))
perm_flags &= ~(MSG_NEW | MSG_UNREAD | MSG_DELETED);
@@ -3090,7 +3090,7 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
~dest->flags.tmp_flags & tmp_flags,
dest->flags.perm_flags & ~perm_flags,
dest->flags.tmp_flags & ~tmp_flags);
-
+
if (source && source->tags) {
g_slist_free(dest->tags);
dest->tags = g_slist_copy(source->tags);
@@ -3176,7 +3176,7 @@ gint folder_item_add_msg(FolderItem *dest, const gchar *file,
cm_return_val_if_fail(dest != NULL, -1);
cm_return_val_if_fail(file != NULL, -1);
-
+
fileinfo.msginfo = NULL;
fileinfo.file = (gchar *)file;
fileinfo.flags = flags;
@@ -3257,7 +3257,7 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
if (num == 0)
continue;
- if (!folderscan &&
+ if (!folderscan &&
((newmsginfo = get_msginfo(dest, num)) != NULL)) {
add_msginfo_to_cache(dest, newmsginfo, NULL);
procmsg_msginfo_free(&newmsginfo);
@@ -3273,7 +3273,7 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
return lastnum;
}
-static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest, gboolean copy)
+static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest, gboolean copy)
{
GSList *mlist;
FolderItem *new_item;
@@ -3289,17 +3289,17 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
g_print("Can't create folder\n");
return NULL;
}
-
+
if (new_item->folder == NULL)
new_item->folder = dest->folder;
/* move messages */
- log_message(LOG_PROTOCOL, copy ?_("Copying %s to %s...\n"):_("Moving %s to %s...\n"),
+ log_message(LOG_PROTOCOL, copy ?_("Copying %s to %s...\n"):_("Moving %s to %s...\n"),
src->name, new_item->path);
/*copy prefs*/
folder_item_prefs_copy_prefs(src, new_item);
-
+
/* copy internal data */
if (src->folder->klass == new_item->folder->klass &&
src->folder->klass->copy_private_data != NULL)
@@ -3326,9 +3326,9 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
}
prefs_matcher_write_config();
-
+
/* recurse */
- srcnode = src->folder->node;
+ srcnode = src->folder->node;
srcnode = g_node_find(srcnode, G_PRE_ORDER, G_TRAVERSE_ALL, src);
srcnode = srcnode->children;
while (srcnode != NULL) {
@@ -3350,7 +3350,7 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
/* if src supports removing, otherwise only copy folder */
- if (src->folder->klass->remove_folder != NULL && !copy)
+ if (src->folder->klass->remove_folder != NULL && !copy)
src->folder->klass->remove_folder(src->folder, src);
folder_write_list();
@@ -3363,7 +3363,7 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
}
g_free(old_id);
g_free(new_id);
-
+
return new_item;
}
@@ -3429,7 +3429,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
g_free(phys_dstpath);
return F_MOVE_FAILED;
}
-
+
g_free(phys_srcpath);
g_free(phys_dstpath);
@@ -3441,7 +3441,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
struct find_data
{
gboolean found;
-};
+};
static void find_num(gpointer key, gpointer value, gpointer data)
{
struct find_data *fdata = (struct find_data *)data;
@@ -3452,10 +3452,10 @@ static void find_num(gpointer key, gpointer value, gpointer data)
static gboolean some_msgs_have_zero_num(GHashTable *hashtable)
{
struct find_data fdata;
-
+
fdata.found = FALSE;
g_hash_table_foreach(hashtable, find_num, &fdata);
-
+
return fdata.found;
}
@@ -3484,12 +3484,12 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
return -1;
msginfo = (MsgInfo *)msglist->data;
-
+
if (!msginfo)
return -1;
-
- if (!MSG_IS_QUEUED(msginfo->flags) &&
- MSG_IS_DRAFT(msginfo->flags) &&
+
+ if (!MSG_IS_QUEUED(msginfo->flags) &&
+ MSG_IS_DRAFT(msginfo->flags) &&
folder_has_parent_of_type(dest, F_QUEUE)) {
GSList *cur = msglist;
gboolean queue_err = FALSE;
@@ -3497,7 +3497,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
Compose *compose = NULL;
FolderItem *queue = dest;
ComposeQueueResult val = COMPOSE_QUEUE_SUCCESS;
-
+
msginfo = (MsgInfo *)cur->data;
compose = compose_reedit(msginfo, TRUE);
if (compose == NULL) {
@@ -3530,8 +3530,8 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
}
}
- /*
- * Copy messages to destination folder and
+ /*
+ * Copy messages to destination folder and
* store new message numbers in newmsgnums
*/
if (folder->klass->copy_msgs != NULL) {
@@ -3603,7 +3603,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
/* Read cache for dest folder */
if (!dest->cache) folder_item_read_cache(dest);
- /*
+ /*
* Fetch new MsgInfos for new messages in dest folder,
* add them to the msgcache and update folder message counts
*/
@@ -3614,7 +3614,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
statusbar_print_all(_("Updating cache for %s..."), dest->path ? dest->path : "(null)");
total = g_slist_length(msglist);
-
+
if (FOLDER_TYPE(dest->folder) == F_IMAP && total > 1) {
folder_item_scan_full(dest, FALSE);
folderscan = TRUE;
@@ -3658,11 +3658,11 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
}
}
}
- if (newmsginfo != NULL
+ if (newmsginfo != NULL
&& msginfo->planned_download == POP3_PARTIAL_DLOAD_DELE) {
partial_mark_for_delete(newmsginfo);
}
- if (newmsginfo != NULL
+ if (newmsginfo != NULL
&& msginfo->planned_download == POP3_PARTIAL_DLOAD_DLOAD) {
partial_mark_for_download(newmsginfo);
}
@@ -3740,7 +3740,7 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
cm_return_val_if_fail(dest != NULL, -1);
cm_return_val_if_fail(msginfo != NULL, -1);
-
+
list.data = msginfo;
list.next = NULL;
@@ -3762,7 +3762,7 @@ gint folder_item_copy_msgs(FolderItem *dest, GSList *msglist)
inc_lock();
result = do_copy_msgs(dest, msglist, FALSE);
inc_unlock();
-
+
return result;
}
@@ -3811,7 +3811,7 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
if (!item->cache) folder_item_read_cache(item);
folder_item_update_freeze();
-
+
/* filter out locked mails */
for (cur = msglist; cur; cur = cur->next) {
MsgInfo *info = (MsgInfo *)cur->data;
@@ -3922,12 +3922,12 @@ void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFla
{
cm_return_if_fail(item != NULL);
cm_return_if_fail(msginfo != NULL);
-
+
item->mark_dirty = TRUE;
if (item->no_select)
return;
-
+
if (item->folder->klass->change_flags != NULL && item->scanning != ITEM_SCANNING_WITH_FLAGS) {
item->folder->klass->change_flags(item->folder, item, msginfo, newflags);
} else {
@@ -3949,12 +3949,12 @@ void folder_item_commit_tags(FolderItem *item, MsgInfo *msginfo, GSList *tags_se
folder = item->folder;
if (!folder)
return;
-
+
item->tags_dirty = TRUE;
if (folder->klass->commit_tags == NULL)
return;
-
+
folder->klass->commit_tags(item, msginfo, tags_set, tags_unset);
}
@@ -3989,12 +3989,12 @@ void folder_item_discard_cache(FolderItem *item)
if (is_dir_exist(dir))
remove_all_numbered_files(dir);
g_free(dir);
-
+
cache = folder_item_get_cache_file(item);
if (is_file_exist(cache))
claws_unlink(cache);
g_free(cache);
-
+
}
static gchar *folder_item_get_cache_file(FolderItem *item)
@@ -4068,14 +4068,14 @@ static gchar *folder_item_get_tags_file(FolderItem *item)
path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
TAGS_DIR, G_DIR_SEPARATOR_S,
identifier, NULL);
-
+
g_free(identifier);
-
+
if (!is_dir_exist(path))
make_dir_hier(path);
file = g_strconcat(path, G_DIR_SEPARATOR_S, TAGS_FILE, NULL);
-
+
g_free(path);
return file;
@@ -4170,7 +4170,7 @@ static Folder *folder_get_from_xml(GNode *node)
cur = cur->next;
}
g_node_traverse(folder->node, G_IN_ORDER, G_TRAVERSE_ALL, -1, folder_item_set_node, NULL);
-
+
return folder;
}
@@ -4218,9 +4218,9 @@ static GNode *folder_get_xml_node(Folder *folder)
xmlnode = xml_node_new(tag, NULL);
node = g_node_new(xmlnode);
-
+
cm_return_val_if_fail (folder->node != NULL, NULL);
-
+
if (folder->node->children) {
GNode *cur;
@@ -4261,7 +4261,7 @@ static void folder_update_op_count_rec(GNode *node)
}
}
-void folder_update_op_count(void)
+void folder_update_op_count(void)
{
GList *cur;
Folder *folder;
@@ -4302,7 +4302,7 @@ static gchar * folder_item_get_tree_identifier(FolderItem * item)
/* CLAWS: temporary local folder for filtering */
#define TEMP_FOLDER "TEMP_FOLDER"
-#define PROCESSING_FOLDER_ITEM "processing"
+#define PROCESSING_FOLDER_ITEM "processing"
static FolderItem *folder_create_processing_folder(int account_id)
{
@@ -4321,7 +4321,7 @@ static FolderItem *folder_create_processing_folder(int account_id)
folder_new(mh_get_class(), TEMP_FOLDER, tmppath);
g_free(tmppath);
tmppath = NULL;
-
+
g_assert(processing_folder != NULL);
processing_folder->klass->scan_tree(processing_folder);
}
@@ -4337,7 +4337,7 @@ static FolderItem *folder_create_processing_folder(int account_id)
processing_folder_item_name);
folder_item_append(FOLDER_ITEM(processing_folder->node->data), processing_folder_item);
debug_print("*TMP* creating %s\n", folder_item_get_path(processing_folder_item));
- }
+ }
g_free(processing_folder_item_name);
g_assert(processing_folder_item != NULL);
@@ -4350,9 +4350,9 @@ FolderItem *folder_get_default_processing(int account_id)
}
/* folder_persist_prefs_new() - return hash table with persistent
- * settings (and folder name as key).
+ * settings (and folder name as key).
* (note that in claws other options are in the folder_item_prefs_RC
- * file, so those don't need to be included in PersistPref yet)
+ * file, so those don't need to be included in PersistPref yet)
*/
static GHashTable *folder_persist_prefs_new(Folder *folder)
{
@@ -4382,15 +4382,15 @@ static void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *ppta
const PersistPrefs *pp;
gchar *id = folder_item_get_identifier(item);
- pp = folder_get_persist_prefs(pptable, id);
+ pp = folder_get_persist_prefs(pptable, id);
g_free(id);
if (!pp) return;
- /* CLAWS: since not all folder properties have been migrated to
+ /* CLAWS: since not all folder properties have been migrated to
* folderlist.xml, we need to call the old stuff first before
* setting things that apply both to Main and Claws. */
- folder_item_prefs_read_config(item);
+ folder_item_prefs_read_config(item);
item->collapsed = pp->collapsed;
item->thread_collapsed = pp->thread_collapsed;
@@ -4425,7 +4425,7 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
pp->collapsed = item->collapsed;
pp->thread_collapsed = item->thread_collapsed;
pp->threaded = item->threaded;
- pp->ret_rcpt = item->ret_rcpt;
+ pp->ret_rcpt = item->ret_rcpt;
pp->hide_read_msgs = item->hide_read_msgs;
pp->hide_del_msgs = item->hide_del_msgs;
pp->hide_read_threads = item->hide_read_threads;
@@ -4441,14 +4441,14 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
child = cur->next;
folder_get_persist_prefs_recursive(cur, pptable);
}
- }
+ }
}
static gboolean persist_prefs_free(gpointer key, gpointer val, gpointer data)
{
g_free(key);
g_free(val);
- return TRUE;
+ return TRUE;
}
void folder_item_apply_processing(FolderItem *item)
@@ -4487,7 +4487,7 @@ void folder_item_apply_processing(FolderItem *item)
MsgInfo * msginfo;
msginfo = (MsgInfo *) cur->data;
-
+
/* reset parameters that can be modified by processing */
msginfo->hidden = 0;
msginfo->score = 0;
@@ -4497,7 +4497,7 @@ void folder_item_apply_processing(FolderItem *item)
/* apply pre global rules */
filter_message_by_msginfo(pre_global_processing, msginfo, NULL,
FILTERING_PRE_PROCESSING, NULL);
-
+
/* apply rules of the folder */
filter_message_by_msginfo(processing_list, msginfo, NULL,
FILTERING_FOLDER_PROCESSING, item->name);
@@ -4519,7 +4519,7 @@ void folder_item_apply_processing(FolderItem *item)
procmsg_msginfo_free((MsgInfo **)&(cur->data));
}
g_slist_free(mlist);
-
+
statusbar_progress_all(0,0,0);
statusbar_pop_all();
@@ -4537,7 +4537,7 @@ static void folder_item_update_with_msg(FolderItem *item, FolderItemUpdateFlags
{
if (folder_item_update_freeze_cnt == 0 /* || (msg != NULL && item->opened) */) {
FolderItemUpdateData source;
-
+
source.item = item;
source.update_flags = update_flags;
source.msg = msg;
@@ -4563,7 +4563,7 @@ void folder_item_update(FolderItem *item, FolderItemUpdateFlags update_flags)
void folder_item_update_recursive(FolderItem *item, FolderItemUpdateFlags update_flags)
{
- GNode *node = item->folder->node;
+ GNode *node = item->folder->node;
node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
node = node->children;
@@ -4587,12 +4587,12 @@ void folder_item_update_freeze(void)
static void folder_item_update_func(FolderItem *item, gpointer data)
{
FolderItemUpdateData source;
-
+
if (item->update_flags) {
source.item = item;
source.update_flags = item->update_flags;
source.msg = NULL;
- hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+ hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
item->update_flags = 0;
}
}
@@ -4613,7 +4613,7 @@ void folder_item_synchronise(FolderItem *item)
return;
if (item->prefs->offlinesync && item->folder->klass->synchronise) {
statusbar_print_all(_("Synchronising %s for offline use...\n"), item->path ? item->path : "(null)");
- item->folder->klass->synchronise(item,
+ item->folder->klass->synchronise(item,
item->prefs->offlinesync_days);
if (item->prefs->offlinesync_days > 0 &&
item->prefs->remove_old_bodies)
@@ -4643,7 +4643,7 @@ typedef struct _WantSyncData {
static void folder_item_want_synchronise_func(FolderItem *item, gpointer data)
{
WantSyncData *want_sync_data = (WantSyncData *)data;
-
+
if (want_sync_data->folder == NULL || item->folder == want_sync_data->folder) {
if (item->prefs->offlinesync && item->folder->klass->synchronise)
want_sync_data->want_sync |= TRUE;
@@ -4656,7 +4656,7 @@ gboolean folder_want_synchronise(Folder *folder)
gboolean result;
want_sync_data->folder = folder;
want_sync_data->want_sync = FALSE;
-
+
folder_func_to_all_folders(folder_item_want_synchronise_func, want_sync_data);
result = want_sync_data->want_sync;
g_free(want_sync_data);
@@ -4674,8 +4674,8 @@ void folder_item_set_batch (FolderItem *item, gboolean batch)
}
}
-gboolean folder_has_parent_of_type(FolderItem *item,
- SpecialFolderItemType type)
+gboolean folder_has_parent_of_type(FolderItem *item,
+ SpecialFolderItemType type)
{
FolderItem *cur = item;
@@ -4685,7 +4685,7 @@ gboolean folder_has_parent_of_type(FolderItem *item,
if (item->parent_stype != -1) {
return (item->parent_stype == type);
}
-
+
/* if we don't, find the type from the first possible parent,
* and set our parent type to be faster next time */
while (cur) {
@@ -4695,7 +4695,7 @@ gboolean folder_has_parent_of_type(FolderItem *item,
}
cur = folder_item_parent(cur);
}
-
+
/* if we didn't match what was asked, we didn't return. If our
* parent type is unknown, we may as well find it now to be faster
* later. */
@@ -4703,18 +4703,18 @@ gboolean folder_has_parent_of_type(FolderItem *item,
cur = item;
while (cur) {
/* here's an exception: Inbox subfolders are normal. */
- if (item->parent_stype == -1 && cur->stype == F_INBOX
+ if (item->parent_stype == -1 && cur->stype == F_INBOX
&& item != cur) {
item->parent_stype = F_NORMAL;
break;
}
- /* ah, we know this parent's parent's type, we may as
+ /* ah, we know this parent's parent's type, we may as
* well copy it instead of going up the full way */
if (cur->parent_stype != -1) {
item->parent_stype = cur->parent_stype;
break;
}
- /* we found a parent that has a special type. That's
+ /* we found a parent that has a special type. That's
* our parent type. */
if (cur->stype != F_NORMAL) {
cur->parent_stype = cur->stype;
@@ -4724,7 +4724,7 @@ gboolean folder_has_parent_of_type(FolderItem *item,
/* if we didn't find anything, go up once more */
cur = folder_item_parent(cur);
}
- /* as we still didn't find anything, our parents must all be
+ /* as we still didn't find anything, our parents must all be
* normal. */
if (item->parent_stype == -1) {
item->parent_stype = F_NORMAL;
@@ -4772,7 +4772,7 @@ gboolean folder_get_sort_type (Folder *folder,
return FALSE;
if (folder->klass->get_sort_type == NULL)
return FALSE;
- folder->klass->get_sort_type(folder, sort_key, sort_type);
+ folder->klass->get_sort_type(folder, sort_key, sort_type);
return TRUE;
}
@@ -4785,7 +4785,7 @@ gint folder_item_search_msgs (Folder *folder,
gpointer progress_data)
{
gint result = -1;
-
+
folder_item_update_freeze();
if (folder->klass->search_msgs)
@@ -4794,7 +4794,7 @@ gint folder_item_search_msgs (Folder *folder,
if (result < 0)
result = folder_item_search_msgs_local(folder, container,
msgs, on_server, predicate, progress_cb, progress_data);
-
+
folder_item_update_thaw();
return result;
@@ -4807,7 +4807,7 @@ MsgNumberList *folder_item_get_number_list(FolderItem *item)
nums = procmsg_get_number_list_for_msgs(msglist);
procmsg_msg_list_free(msglist);
-
+
return nums;
}
diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -81,7 +81,7 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"default_alt_dictionary", NULL, &tmp_prefs.default_alt_dictionary, P_STRING,
NULL, NULL, NULL},
-#endif
+#endif
{"always_sign", "0", &tmp_prefs.always_sign, P_ENUM,
NULL, NULL, NULL},
{"always_encrypt", "0", &tmp_prefs.always_encrypt, P_ENUM,
@@ -160,7 +160,7 @@ void folder_item_prefs_read_config(FolderItem * item)
}
void folder_item_prefs_save_config(FolderItem * item)
-{
+{
gchar * id;
tmp_prefs = * item->prefs;
@@ -182,13 +182,13 @@ static gboolean folder_item_prefs_save_config_func(GNode *node, gpointer data)
}
void folder_item_prefs_save_config_recursive(FolderItem * item)
-{
+{
g_node_traverse(item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
-1, folder_item_prefs_save_config_func, NULL);
}
void folder_prefs_save_config_recursive(Folder *folder)
-{
+{
g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL,
-1, folder_item_prefs_save_config_func, NULL);
}
@@ -308,13 +308,13 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
for (tmp = src->prefs->processing; tmp != NULL && tmp->data != NULL;) {
FilteringProp *prop = (FilteringProp *)tmp->data;
-
+
tmp_prop_list = g_slist_append(tmp_prop_list,
filteringprop_copy(prop));
tmp = tmp->next;
}
tmp_prefs.processing = tmp_prop_list;
-
+
tmp_prefs.request_return_receipt = src->prefs->request_return_receipt;
tmp_prefs.enable_default_from = src->prefs->enable_default_from;
tmp_prefs.default_from = g_strdup(src->prefs->default_from);
diff --git a/src/foldersel.c b/src/foldersel.c
@@ -449,7 +449,7 @@ static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
FOLDERSEL_FOREGROUND, foreground,
FOLDERSEL_BOLD, weight,
-1);
-
+
g_free(name);
}
@@ -485,11 +485,11 @@ static void foldersel_set_tree(Folder *cur_folder, FolderSelectionType type)
if (FOLDER_TYPE(folder) == F_NEWS)
continue;
}
-
+
if (cur_folder && (cur_folder->klass != folder->klass
&& g_strcmp0(cur_folder->name, folder->name) != 0))
continue;
-
+
foldersel_insert_gnode_in_store(tree_store, folder->node, NULL);
}
@@ -612,7 +612,7 @@ static void foldersel_new_folder(GtkButton *button, gpointer data)
/* add new child */
foldersel_append_item(store, new_item, &new_child, &selected);
-
+
selected_p = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &selected);
new_child_p = gtk_tree_model_get_path(GTK_TREE_MODEL(store),
&new_child);
diff --git a/src/folderutils.c b/src/folderutils.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#include "config.h"
@@ -38,10 +38,10 @@ gint folderutils_delete_duplicates(FolderItem *item,
GHashTable *table;
GSList *msglist, *cur, *duplist = NULL;
guint dups;
-
+
if (item->folder->klass->remove_msg == NULL)
return -1;
-
+
debug_print("Deleting duplicated messages...\n");
msglist = folder_item_get_msg_list(item);
@@ -56,12 +56,12 @@ gint folderutils_delete_duplicates(FolderItem *item,
if (!msginfo || !msginfo->msgid || !*msginfo->msgid)
continue;
-
+
msginfo_dup = g_hash_table_lookup(table, msginfo->msgid);
if (msginfo_dup == NULL)
g_hash_table_insert(table, msginfo->msgid, msginfo);
else {
- if ((MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_UNREAD(msginfo_dup->flags)) ||
+ if ((MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_UNREAD(msginfo_dup->flags)) ||
(MSG_IS_UNREAD(msginfo->flags) == MSG_IS_UNREAD(msginfo_dup->flags))) {
duplist = g_slist_prepend(duplist, msginfo);
} else {
@@ -87,7 +87,7 @@ gint folderutils_delete_duplicates(FolderItem *item,
if (folder_has_parent_of_type(item, F_TRASH) || trash == NULL || in_trash)
folder_item_remove_msgs(item, duplist);
- else
+ else
folder_item_move_msgs(trash, duplist);
break;
}
@@ -96,7 +96,7 @@ gint folderutils_delete_duplicates(FolderItem *item,
MsgInfo *msginfo = (MsgInfo *) cur->data;
procmsg_msginfo_set_to_folder(msginfo, NULL);
- procmsg_msginfo_unset_flags(msginfo, MSG_MARKED,
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED,
MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
}
diff --git a/src/folderview.c b/src/folderview.c
@@ -225,14 +225,14 @@ static void folderview_drag_end_cb (GtkWidget *widget,
GdkDragContext *drag_context,
FolderView *folderview);
-static void folderview_create_folder_node (FolderView *folderview,
+static void folderview_create_folder_node (FolderView *folderview,
FolderItem *item);
static gboolean folderview_update_folder (gpointer source,
gpointer userdata);
static gboolean folderview_update_item_claws (gpointer source,
gpointer data);
static void folderview_processing_cb(GtkAction *action, gpointer data);
-static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
+static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
GdkEventButton *event);
static void folderview_header_set_displayed_columns_cb(GtkAction *gaction,
gpointer data);
@@ -242,7 +242,7 @@ static gboolean folderview_header_button_pressed(GtkWidget *widget,
GHashTable *folderview_popups;
-static GtkActionEntry folderview_common_popup_entries[] =
+static GtkActionEntry folderview_common_popup_entries[] =
{
{"FolderViewPopup", NULL, "FolderViewPopup", NULL, NULL , NULL},
{"FolderViewPopup/MarkAllRead", NULL, N_("Mark all re_ad"), NULL, NULL, G_CALLBACK(mark_all_read_cb) },
@@ -257,7 +257,7 @@ static GtkActionEntry folderview_common_popup_entries[] =
{"FolderViewPopup/Processing", NULL, N_("Process_ing..."), NULL, NULL, G_CALLBACK(folderview_processing_cb) },
{"FolderViewPopup/EmptyTrash", NULL, N_("Empty _trash..."), NULL, NULL, G_CALLBACK(folderview_empty_trash_cb) },
{"FolderViewPopup/SendQueue", NULL, N_("Send _queue..."), NULL, NULL, G_CALLBACK(folderview_send_queue_cb) },
-
+
};
static GtkActionEntry folderview_header_popup_entries[] =
@@ -292,10 +292,10 @@ static GtkActionGroup *create_action_group(FolderView *folderview, FolderViewPop
{
FolderViewPopup *fpopup_common;
GtkActionGroup *action_group;
-
+
action_group = cm_menu_create_action_group(
- fpopup->path,
- fpopup->entries, fpopup->n_entries,
+ fpopup->path,
+ fpopup->entries, fpopup->n_entries,
(gpointer)folderview);
if (fpopup->toggle_entries)
@@ -304,8 +304,8 @@ static GtkActionGroup *create_action_group(FolderView *folderview, FolderViewPop
(gpointer)folderview);
if (fpopup->radio_entries)
gtk_action_group_add_radio_actions(action_group, fpopup->radio_entries,
- fpopup->n_radio_entries, fpopup->radio_default,
- G_CALLBACK(fpopup->radio_callback),
+ fpopup->n_radio_entries, fpopup->radio_default,
+ G_CALLBACK(fpopup->radio_callback),
(gpointer)folderview);
fpopup_common = g_hash_table_lookup(folderview_popups, "common");
@@ -319,8 +319,8 @@ static GtkActionGroup *create_action_group(FolderView *folderview, FolderViewPop
(gpointer)folderview);
if (fpopup_common->radio_entries)
gtk_action_group_add_radio_actions(action_group, fpopup_common->radio_entries,
- fpopup_common->n_radio_entries, fpopup_common->radio_default,
- G_CALLBACK(fpopup_common->radio_callback),
+ fpopup_common->n_radio_entries, fpopup_common->radio_default,
+ G_CALLBACK(fpopup_common->radio_callback),
(gpointer)folderview);
}
@@ -353,20 +353,20 @@ static void folderview_column_set_titles(FolderView *folderview)
debug_print("setting titles...\n");
gtk_widget_realize(folderview->ctree);
gtk_widget_show_all(folderview->scrolledwin);
-
+
/* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
* instead text (text overflows making them unreadable and ugly) */
stock_pixbuf_gdk(STOCK_PIXMAP_NEW, &newxpm);
stock_pixbuf_gdk(STOCK_PIXMAP_UNREAD, &unreadxpm);
stock_pixbuf_gdk(STOCK_PIXMAP_READ, &readxpm);
-
+
label_folder = gtk_label_new(_("Folder"));
label_new = gtk_image_new_from_pixbuf(newxpm);
label_unread = gtk_image_new_from_pixbuf(unreadxpm);
label_total = gtk_image_new_from_pixbuf(readxpm);
-
+
gtk_cmclist_column_titles_active(GTK_CMCLIST(ctree));
-
+
hbox_folder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
hbox_new = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
hbox_unread = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
@@ -403,11 +403,11 @@ static gboolean folderview_popup_menu(GtkWidget *widget, gpointer data)
GdkEventButton event;
if (folderview_get_selected_item(folderview) == NULL)
return FALSE;
-
+
event.button = 3;
event.time = gtk_get_current_event_time();
-
- folderview_set_sens_and_popup_menu(folderview, -1,
+
+ folderview_set_sens_and_popup_menu(folderview, -1,
&event);
return TRUE;
@@ -459,7 +459,7 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree),
col_pos[F_COL_UNREAD],
GTK_JUSTIFY_RIGHT);
- gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree),
+ gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree),
col_pos[F_COL_TOTAL],
GTK_JUSTIFY_RIGHT);
gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
@@ -576,7 +576,7 @@ void folderview_set_column_order(FolderView *folderview)
gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_CMCLIST(ctree)->vadjustment);
gtk_widget_show(ctree);
-
+
if (sel_item)
folderview->selected = gtk_cmctree_find_by_row_data(GTK_CMCTREE(ctree), NULL, sel_item);
if (op_item)
@@ -607,7 +607,7 @@ FolderView *folderview_create(MainWindow *mainwin)
folderview->scrolledwin = scrolledwin;
ctree = folderview_ctree_create(folderview);
gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
-
+
/* create popup factories */
folderview->popups = g_hash_table_new(g_str_hash, g_str_equal);
g_hash_table_foreach(folderview_popups, create_action_groups, folderview);
@@ -632,7 +632,7 @@ FolderView *folderview_create(MainWindow *mainwin)
hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item_claws, (gpointer) folderview);
gtk_widget_show_all(scrolledwin);
-
+
folderview->target_list = gtk_target_list_new(folderview_drag_types, 2);
folderview_list = g_list_append(folderview_list, folderview);
@@ -737,12 +737,12 @@ static gboolean folderview_defer_set(gpointer data)
{
FolderView *folderview = (FolderView *)data;
MainWindow *mainwin = folderview->mainwin;
-
+
if (!mainwin)
return FALSE;
if (mainwin->lock_count)
return TRUE;
-
+
debug_print("doing deferred folderview_set now\n");
folderview_set(folderview);
@@ -761,7 +761,7 @@ void folderview_set(FolderView *folderview)
if (mainwin->lock_count) {
if (folderview->deferred_refresh_id == 0)
- folderview->deferred_refresh_id =
+ folderview->deferred_refresh_id =
g_timeout_add(500, folderview_defer_set, folderview);
debug_print("deferred folderview_set\n");
return;
@@ -848,7 +848,7 @@ static void mark_all_read_unread_handler(GtkAction *action, gpointer data,
AlertValue val;
gchar *message;
gchar *title;
-
+
item = folderview_get_selected_item(folderview);
if (item == NULL)
return;
@@ -876,13 +876,13 @@ static void mark_all_read_unread_handler(GtkAction *action, gpointer data,
else if (val & G_ALERTDISABLE)
prefs_common.ask_mark_all_read = FALSE;
}
-
+
folder_item_update_freeze();
if (folderview->summaryview->folder_item != item && !recursive)
summary_lock(folderview->summaryview);
else
summary_freeze(folderview->summaryview);
-
+
if (read) {
if (recursive)
folderutils_mark_all_read_recursive(item, TRUE);
@@ -988,7 +988,7 @@ void folderview_select_next_with_flag(FolderView *folderview,
GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
GtkCMCTreeNode *node = NULL;
EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
-
+
switch (flag) {
case MSG_UNREAD:
prefs_common.summary_select_prio[0] = ACTION_OLDEST_UNREAD;
@@ -1063,7 +1063,7 @@ static gchar *get_scan_str(FolderItem *item)
item->folder->name, item->path);
else
return g_strdup_printf(_("Scanning folder %s..."),
- item->folder->name);
+ item->folder->name);
}
static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
gpointer data)
@@ -1092,8 +1092,8 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
if (!folder->klass->scan_tree) return;
- if (rebuild &&
- alertpanel_full(_("Rebuild folder tree"),
+ if (rebuild &&
+ alertpanel_full(_("Rebuild folder tree"),
_("Rebuilding the folder tree will remove "
"local caches. Do you want to continue?"),
NULL, _("_No"), NULL, _("_Yes"), NULL, NULL,
@@ -1105,12 +1105,12 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
inc_lock();
if (rebuild)
window = label_window_create(_("Rebuilding folder tree..."));
- else
+ else
window = label_window_create(_("Scanning folder tree..."));
if (mainwin)
folderview = mainwin->folderview;
-
+
if (folderview) {
pos = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(folderview->scrolledwin));
@@ -1133,8 +1133,8 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
}
/** folderview_check_new()
- * Scan and update the folder and return the
- * count the number of new messages since last check.
+ * Scan and update the folder and return the
+ * count the number of new messages since last check.
* \param folder the folder to check for new messages
* \return the number of new messages since last check
*/
@@ -1228,7 +1228,7 @@ gint folderview_check_new(Folder *folder)
}
folder_write_list();
- /* Number of new messages since last check is the just the difference
+ /* Number of new messages since last check is the just the difference
* between former_new_msgs and new_msgs. If new_msgs is less than
* former_new_msgs, that would mean another session accessed the folder
* and the result is not well defined.
@@ -1270,12 +1270,12 @@ static gboolean folderview_have_children_sub(FolderView *folderview,
gboolean in_sub)
{
GNode *node = NULL;
-
+
if (!item || !item->folder || !item->folder->node)
return FALSE;
-
+
node = item->folder->node;
-
+
node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
node = node->children;
@@ -1287,7 +1287,7 @@ static gboolean folderview_have_children_sub(FolderView *folderview,
if (node && node->data) {
FolderItem *next_item = (FolderItem*) node->data;
node = node->next;
- if (folderview_have_children_sub(folderview,
+ if (folderview_have_children_sub(folderview,
next_item, TRUE))
return TRUE;
}
@@ -1307,12 +1307,12 @@ static gboolean folderview_have_new_children_sub(FolderView *folderview,
gboolean in_sub)
{
GNode *node = NULL;
-
+
if (!item || !item->folder || !item->folder->node)
return FALSE;
-
+
node = item->folder->node;
-
+
node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
node = node->children;
@@ -1326,7 +1326,7 @@ static gboolean folderview_have_new_children_sub(FolderView *folderview,
if (node && node->data) {
FolderItem *next_item = (FolderItem*) node->data;
node = node->next;
- if (folderview_have_new_children_sub(folderview,
+ if (folderview_have_new_children_sub(folderview,
next_item, TRUE))
return TRUE;
}
@@ -1342,16 +1342,16 @@ static gboolean folderview_have_new_children(FolderView *folderview,
}
static gboolean folderview_have_unread_children_sub(FolderView *folderview,
- FolderItem *item,
+ FolderItem *item,
gboolean in_sub)
{
GNode *node = NULL;
-
+
if (!item || !item->folder || !item->folder->node)
return FALSE;
-
+
node = item->folder->node;
-
+
node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
node = node->children;
@@ -1365,8 +1365,8 @@ static gboolean folderview_have_unread_children_sub(FolderView *folderview,
if (node && node->data) {
FolderItem *next_item = (FolderItem*) node->data;
node = node->next;
- if (folderview_have_unread_children_sub(folderview,
- next_item,
+ if (folderview_have_unread_children_sub(folderview,
+ next_item,
TRUE))
return TRUE;
}
@@ -1382,17 +1382,17 @@ static gboolean folderview_have_unread_children(FolderView *folderview,
}
static gboolean folderview_have_read_children_sub(FolderView *folderview,
- FolderItem *item,
+ FolderItem *item,
gboolean in_sub)
{
GNode *node = NULL;
-
+
if (!item || !item->folder || !item->folder->node) {
return FALSE;
- }
+ }
node = item->folder->node;
-
+
node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
node = node->children;
@@ -1406,8 +1406,8 @@ static gboolean folderview_have_read_children_sub(FolderView *folderview,
if (node && node->data) {
FolderItem *next_item = (FolderItem*) node->data;
node = node->next;
- if (folderview_have_read_children_sub(folderview,
- next_item,
+ if (folderview_have_read_children_sub(folderview,
+ next_item,
TRUE)) {
return TRUE;
}
@@ -1433,7 +1433,7 @@ static gboolean folderview_have_matching_children_sub(FolderView *folderview,
return FALSE;
node = item->folder->node;
-
+
node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
node = node->children;
@@ -1445,8 +1445,8 @@ static gboolean folderview_have_matching_children_sub(FolderView *folderview,
if (node && node->data) {
FolderItem *next_item = (FolderItem*) node->data;
node = node->next;
- if (folderview_have_matching_children_sub(folderview,
- next_item,
+ if (folderview_have_matching_children_sub(folderview,
+ next_item,
TRUE))
return TRUE;
}
@@ -1466,12 +1466,12 @@ static gboolean folderview_have_marked_children_sub(FolderView *folderview,
gboolean in_sub)
{
GNode *node = NULL;
-
+
if (!item || !item->folder || !item->folder->node)
return FALSE;
-
+
node = item->folder->node;
-
+
node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
node = node->children;
@@ -1514,7 +1514,7 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
gboolean use_bold, use_color;
gint *col_pos = folderview->col_pos;
SpecialFolderItemType stype;
-
+
item = gtk_cmctree_node_get_row_data(ctree, node);
cm_return_if_fail(item != NULL);
@@ -1622,7 +1622,7 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
and signs if any */
str = g_strdup_printf("%s (%d%s%s)",
name, item->total_msgs,
- (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
(item->unreadmarked_msgs > 0) ? "!" : "");
}
} else {
@@ -1631,7 +1631,7 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
/* show unread number and signs */
str = g_strdup_printf("%s (%d%s%s)",
name, item->unread_msgs,
- (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
(item->unreadmarked_msgs > 0) ? "!" : "");
}
} else {
@@ -1639,7 +1639,7 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
/* show unread number, total number and signs if any */
str = g_strdup_printf("%s (%d/%d%s%s)",
name, item->unread_msgs, item->total_msgs,
- (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
(item->unreadmarked_msgs > 0) ? "!" : "");
}
}
@@ -1649,7 +1649,7 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
/* no unread/total numbers, but at least one sign */
str = g_strdup_printf("%s (%s%s)",
name,
- (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
(item->unreadmarked_msgs > 0) ? "!" : "");
}
}
@@ -1669,7 +1669,7 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
}
}
gtk_cmctree_set_node_info(ctree, node, str, FOLDER_SPACING,
- xpm, openxpm,
+ xpm, openxpm,
FALSE, GTK_CMCTREE_ROW(node)->expanded);
g_free(str);
g_free(name);
@@ -1712,7 +1712,7 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
use_color =
(item->new_msgs > 0) ||
(add_unread_mark &&
- folderview_have_new_children(folderview, item));
+ folderview_have_new_children(folderview, item));
}
gtk_cmctree_node_set_foreground(ctree, node, NULL);
@@ -1788,13 +1788,13 @@ static gboolean folderview_update_item_claws(gpointer source, gpointer data)
if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
folderview_update_node(folderview, node);
- if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) &&
+ if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) &&
update_info->item == folderview->summaryview->folder_item &&
update_info->item != NULL)
if (!quicksearch_has_sat_predicate(folderview->summaryview->quicksearch))
summary_show(folderview->summaryview, update_info->item, FALSE);
}
-
+
return FALSE;
}
@@ -1898,7 +1898,7 @@ static void folderview_append_folder(FolderView *folderview, Folder *folder)
}
/* callback functions */
-static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
+static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
GdkEventButton *event)
{
FolderItem *item;
@@ -1909,7 +1909,7 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
FolderItem *special_trash = NULL, *special_queue = NULL;
PrefsAccount *ac;
GtkUIManager *ui_manager = gtk_ui_manager_new();
-
+
if (folderview->ui_manager)
g_object_unref(folderview->ui_manager);
@@ -1928,12 +1928,12 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
fpopup = g_hash_table_lookup(folderview_popups, "common");
action_group = g_hash_table_lookup(folderview->popups, "common");
}
-
+
gtk_ui_manager_insert_action_group(ui_manager, action_group, 0);
MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Popup", "Popup", GTK_UI_MANAGER_MENUBAR)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup", "FolderViewPopup", "FolderViewPopup", GTK_UI_MANAGER_MENU)
-
- if (fpopup->add_menuitems)
+
+ if (fpopup->add_menuitems)
fpopup->add_menuitems(ui_manager, item);
MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "MarkAllRead", "FolderViewPopup/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
@@ -1954,19 +1954,19 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
special_trash = account_get_special_folder(ac, F_TRASH);
special_queue = account_get_special_folder(ac, F_QUEUE);
}
-
+
if ((item == folder->trash || item == special_trash
|| folder_has_parent_of_type(item, F_TRASH))) {
MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "SeparatorTrash", "FolderViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "EmptyTrash", "FolderViewPopup/EmptyTrash", GTK_UI_MANAGER_MENUITEM)
- }
-
+ }
+
if ((item == folder->queue || item == special_queue
|| folder_has_parent_of_type(item, F_QUEUE))) {
MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "SeparatorQueue", "FolderViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "SendQueue", "FolderViewPopup/SendQueue", GTK_UI_MANAGER_MENUITEM)
- }
-
+ }
+
#define SET_SENS(name, sens) \
cm_menu_set_sensitive_full(ui_manager, "Popup/"name, sens)
@@ -1975,13 +1975,13 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
(item->unread_msgs != (item->total_msgs - item->ignored_msgs)));
SET_SENS("FolderViewPopup/MarkAllReadRec", folderview_have_unread_children(folderview,item));
SET_SENS("FolderViewPopup/MarkAllUnreadRec", folderview_have_read_children(folderview,item));
- SET_SENS("FolderViewPopup/SearchFolder", item->total_msgs > 0 &&
+ SET_SENS("FolderViewPopup/SearchFolder", item->total_msgs > 0 &&
folderview->selected == folderview->opened);
SET_SENS("FolderViewPopup/Properties", TRUE);
SET_SENS("FolderViewPopup/RunProcessing", item->prefs->processing &&
item->total_msgs >= 1 && !item->processing_pending);
- SET_SENS("FolderViewPopup/Processing", item->node->parent != NULL &&
+ SET_SENS("FolderViewPopup/Processing", item->node->parent != NULL &&
!item->no_select && !item->processing_pending);
if (item->node->parent != NULL) {
@@ -2212,10 +2212,10 @@ void folderview_close_opened(FolderView *folderview, gboolean dirty)
}
FolderItem *olditem =
- gtk_cmctree_node_get_row_data(GTK_CMCTREE(folderview->ctree),
+ gtk_cmctree_node_get_row_data(GTK_CMCTREE(folderview->ctree),
folderview->opened);
if (olditem) {
- gchar *buf = g_strdup_printf(_("Closing folder %s..."),
+ gchar *buf = g_strdup_printf(_("Closing folder %s..."),
olditem->path ? olditem->path:olditem->name);
/* will be null if we just moved the previously opened folder */
STATUSBAR_PUSH(folderview->mainwin, buf);
@@ -2251,19 +2251,19 @@ static void folderview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
GtkCMCTreeNode *old_opened = folderview->opened;
START_TIMING("");
folderview->selected = row;
-
+
display = gdk_display_get_default();
seat = gdk_display_get_default_seat(display);
device = gdk_seat_get_pointer(seat);
- debug_print("newly selected %p, opened %p\n", folderview->selected,
+ debug_print("newly selected %p, opened %p\n", folderview->selected,
folderview->opened);
if (folderview->opened == row) {
folderview->open_folder = FALSE;
END_TIMING();
return;
}
-
+
item = gtk_cmctree_node_get_row_data(ctree, row);
if (!item) {
END_TIMING();
@@ -2292,13 +2292,13 @@ static void folderview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
/* We don't want to lose all caches if app crashes */
/* Resets folderview->opened to NULL */
folderview_close_opened(folderview, FALSE);
-
- /* CLAWS: set compose button type: news folder items
+
+ /* CLAWS: set compose button type: news folder items
* always have a news folder as parent */
- if (item->folder)
+ if (item->folder)
toolbar_set_compose_button
(folderview->mainwin->toolbar,
- FOLDER_TYPE(item->folder) == F_NEWS ?
+ FOLDER_TYPE(item->folder) == F_NEWS ?
COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
if (item->path)
@@ -2356,13 +2356,13 @@ static void folderview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
END_TIMING();
return;
}
-
+
main_window_cursor_normal(folderview->mainwin);
/* Show messages */
summary_set_prefs_from_folderitem(folderview->summaryview, item);
opened = summary_show(folderview->summaryview, item, FALSE);
-
+
folder_clean_cache_memory(item);
if (!opened) {
@@ -2472,7 +2472,7 @@ static void folderview_empty_trash_cb(GtkAction *action, gpointer data)
if (item != item->folder->trash && item != special_trash
&& !folder_has_parent_of_type(item, F_TRASH)) return;
-
+
if (prefs_common.ask_on_clean) {
if (alertpanel(_("Empty trash"),
_("Delete all messages in trash?"),
@@ -2480,15 +2480,15 @@ static void folderview_empty_trash_cb(GtkAction *action, gpointer data)
ALERTFOCUS_SECOND) != G_ALERTALTERNATE)
return;
}
-
+
mlist = folder_item_get_msg_list(item);
-
+
for (cur = mlist ; cur != NULL ; cur = cur->next) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
if (MSG_IS_LOCKED(msginfo->flags))
continue;
/* is it partially received? (partial_recv isn't cached) */
- if (msginfo->total_size != 0 &&
+ if (msginfo->total_size != 0 &&
msginfo->size != (off_t)msginfo->total_size)
partial_mark_for_delete(msginfo);
}
@@ -2515,12 +2515,12 @@ static void folderview_send_queue_cb(GtkAction *action, gpointer data)
if (item != item->folder->queue && item != special_queue
&& !folder_has_parent_of_type(item, F_QUEUE)) return;
-
+
if (procmsg_queue_is_empty(item))
return;
if (prefs_common.work_offline)
- if (alertpanel(_("Offline warning"),
+ if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
NULL, _("_No"), NULL, _("_Yes"),
NULL, NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
@@ -2532,7 +2532,7 @@ static void folderview_send_queue_cb(GtkAction *action, gpointer data)
*/
if (prefs_common.confirm_send_queued_messages) {
if (!prefs_common.work_offline) {
- if (alertpanel(_("Send queued messages"),
+ if (alertpanel(_("Send queued messages"),
_("Send all queued messages?"),
NULL, _("_Cancel"), NULL, _("_Send"),
NULL, NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
@@ -2613,7 +2613,7 @@ static void folderview_recollapse_nodes(FolderView *folderview, GtkCMCTreeNode *
GSList *list = NULL;
GSList *done = NULL;
GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
-
+
for (list = folderview->nodes_to_recollapse; list != NULL; list = g_slist_next(list)) {
if (!gtkut_ctree_node_is_parent(GTK_CMCTREE_NODE(list->data), node)
&& list->data != node) {
@@ -2622,7 +2622,7 @@ static void folderview_recollapse_nodes(FolderView *folderview, GtkCMCTreeNode *
}
}
for (list = done; list != NULL; list = g_slist_next(list)) {
- folderview->nodes_to_recollapse = g_slist_remove(folderview->nodes_to_recollapse,
+ folderview->nodes_to_recollapse = g_slist_remove(folderview->nodes_to_recollapse,
list->data);
}
g_slist_free(done);
@@ -2641,7 +2641,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
if (prefs_common.warn_dnd) {
buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s'?"):
- _("Do you really want to make folder '%s' a subfolder of '%s'?"),
+ _("Do you really want to make folder '%s' a subfolder of '%s'?"),
from_folder->name, to_folder->name);
status = alertpanel_full(copy ? _("Copy folder"):_("Move folder"), buf,
NULL, _("_No"), NULL, _("_Yes"), NULL, NULL,
@@ -2654,7 +2654,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
prefs_common.warn_dnd = FALSE;
}
- buf = g_strdup_printf(copy ? _("Copying %s to %s..."):_("Moving %s to %s..."),
+ buf = g_strdup_printf(copy ? _("Copying %s to %s..."):_("Moving %s to %s..."),
from_folder->name, to_folder->name);
STATUSBAR_PUSH(folderview->mainwin, buf);
g_free(buf);
@@ -2675,13 +2675,13 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
folder_item_update_thaw();
folder_item_update_recursive(new_folder, F_ITEM_UPDATE_MSGCNT);
- folderview_sort_folders(folderview,
- gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree),
+ folderview_sort_folders(folderview,
+ gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree),
NULL, to_folder), new_folder->folder);
folderview_select(folderview, new_folder);
gtk_cmclist_thaw(GTK_CMCLIST(folderview->ctree));
} else {
- statusbar_verbosity_set(FALSE);
+ statusbar_verbosity_set(FALSE);
main_window_cursor_normal(folderview->mainwin);
STATUSBAR_POP(folderview->mainwin);
gtk_cmclist_thaw(GTK_CMCLIST(folderview->ctree));
@@ -2701,8 +2701,8 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
alertpanel_error(copy ? _("Copy failed!"):_("Move failed!"));
break;
}
- }
- inc_unlock();
+ }
+ inc_unlock();
gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), TRUE);
}
@@ -2887,7 +2887,7 @@ static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *even
cm_return_if_fail(folderview != NULL);
if (folderview->selected == NULL) return;
- if (folderview->nodes_to_recollapse)
+ if (folderview->nodes_to_recollapse)
g_slist_free(folderview->nodes_to_recollapse);
folderview->nodes_to_recollapse = NULL;
context = gtk_drag_begin_with_coordinates(widget, folderview->target_list,
@@ -2895,7 +2895,7 @@ static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *even
-1, -1);
gtk_drag_set_icon_default(context);
}
-#endif
+
static void folderview_drag_data_get(GtkWidget *widget,
GdkDragContext *drag_context,
GtkSelectionData *selection_data,
@@ -2934,7 +2934,7 @@ static gboolean folderview_update_folder(gpointer source, gpointer userdata)
GtkWidget *ctree;
hookdata = source;
- folderview = (FolderView *) userdata;
+ folderview = (FolderView *) userdata;
cm_return_val_if_fail(hookdata != NULL, FALSE);
cm_return_val_if_fail(folderview != NULL, FALSE);
@@ -2986,7 +2986,7 @@ static gboolean folderview_dnd_scroll_cb(gpointer data)
new_val = 0;
}
gtk_adjustment_set_value(pos, new_val);
-
+
return TRUE;
}
@@ -3023,7 +3023,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget *widget,
folderview->scroll_value = 0;
}
if (folderview->scroll_value != 0 && folderview->scroll_timeout_id == 0) {
- folderview->scroll_timeout_id =
+ folderview->scroll_timeout_id =
g_timeout_add(30, folderview_dnd_scroll_cb,
folderview);
}
@@ -3053,7 +3053,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget *widget,
acceptable = TRUE;
} else {
/* comes from another app */
- /* we are adding messages, so only accept folder items that are
+ /* we are adding messages, so only accept folder items that are
no root items and can copy messages */
if (item && item->folder && folder_item_parent(item) != NULL
&& FOLDER_CLASS(item->folder)->add_msg != NULL &&
@@ -3064,7 +3064,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget *widget,
if (acceptable || (src_item && src_item == item))
drag_state_start(folderview, node, item);
-
+
if (acceptable) {
g_signal_handlers_block_by_func
(G_OBJECT(widget),
@@ -3073,7 +3073,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget *widget,
g_signal_handlers_unblock_by_func
(G_OBJECT(widget),
G_CALLBACK(folderview_selected), folderview);
- gdk_drag_status(context,
+ gdk_drag_status(context,
(gdk_drag_context_get_actions(context) == GDK_ACTION_COPY ?
GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
} else {
@@ -3110,12 +3110,12 @@ void folderview_finish_dnd(const gchar *data, GdkDragContext *drag_context,
&& FOLDER_CLASS(item->folder)->add_msg != NULL))
{
gtk_drag_finish(drag_context, FALSE, FALSE, time);
- debug_print("item doesn't fit\n");
+ debug_print("item doesn't fit\n");
return;
- }
+ }
if (!list) {
gtk_drag_finish(drag_context, FALSE, FALSE, time);
- debug_print("list is empty\n");
+ debug_print("list is empty\n");
return;
}
for (tmp = list; tmp != NULL; tmp = tmp->next) {
@@ -3178,7 +3178,7 @@ static void folderview_drag_received_cb(GtkWidget *widget,
return;
}
/* re-check (due to acceptable possibly set for folder moves */
- if (!(item && item->folder && item->path && !item->no_select &&
+ if (!(item && item->folder && item->path && !item->no_select &&
src_item && src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)) {
return;
}
@@ -3208,14 +3208,14 @@ static void folderview_drag_received_cb(GtkWidget *widget,
if (gtk_cmclist_get_selection_info
(GTK_CMCLIST(widget), x - offset, y - offset, &row, &column) == 0
|| *source == 0) {
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
return;
}
node = gtk_cmctree_node_nth(GTK_CMCTREE(widget), row);
item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(widget), node);
src_item = folder_find_item_from_identifier(source);
- folder_is_normal =
+ folder_is_normal =
src_item != NULL &&
src_item->stype == F_NORMAL &&
!folder_has_parent_of_type(src_item, F_OUTBOX) &&
@@ -3223,7 +3223,7 @@ static void folderview_drag_received_cb(GtkWidget *widget,
!folder_has_parent_of_type(src_item, F_QUEUE) &&
!folder_has_parent_of_type(src_item, F_TRASH);
if (!item || !src_item || !folder_is_normal) {
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
return;
}
@@ -3239,12 +3239,12 @@ static void folderview_drag_received_cb(GtkWidget *widget,
node = gtk_cmctree_node_nth(GTK_CMCTREE(widget), row);
if (!node) {
gtk_drag_finish(drag_context, FALSE, FALSE, time);
- debug_print("no node\n");
+ debug_print("no node\n");
return;
}
item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(widget), node);
if (!item) {
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
debug_print("no item\n");
return;
}
@@ -3253,7 +3253,7 @@ static void folderview_drag_received_cb(GtkWidget *widget,
}
}
-static void folderview_drag_end_cb(GtkWidget *widget,
+static void folderview_drag_end_cb(GtkWidget *widget,
GdkDragContext *drag_context,
FolderView *folderview)
{
@@ -3273,7 +3273,7 @@ void folderview_register_popup(FolderViewPopup *fpopup)
factory = create_action_group(folderview, fpopup);
g_hash_table_insert(folderview->popups, fpopup->klass, factory);
- }
+ }
g_hash_table_insert(folderview_popups, fpopup->klass, fpopup);
}
@@ -3286,7 +3286,7 @@ void folderview_unregister_popup(FolderViewPopup *fpopup)
FolderView *folderview = folderviews->data;
g_hash_table_remove(folderview->popups, fpopup->klass);
- }
+ }
g_hash_table_remove(folderview_popups, fpopup->klass);
}
diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -148,8 +148,8 @@ static void grouplist_dialog_create(void)
GtkWidget *hgrid;
GtkWidget *msg_label;
GtkWidget *search_button;
- GtkWidget *cancel_button;
- GtkWidget *refresh_button;
+ GtkWidget *cancel_button;
+ GtkWidget *refresh_button;
GtkWidget *scrolledwin;
static GdkGeometry geometry;
gchar *titles[3];
@@ -221,7 +221,7 @@ static void grouplist_dialog_create(void)
(GTK_CMCLIST(ctree), 0, GROUPLIST_COL_NAME_WIDTH);
gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), 0, TRUE);
gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_MULTIPLE);
-
+
gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
GTK_CMCTREE_EXPANDER_TRIANGLE);
@@ -424,7 +424,7 @@ static void grouplist_dialog_set_list(const gchar *pattern, gboolean refresh)
gdk_window_set_cursor(window, watch_cursor);
main_window_cursor_wait(mainwindow_get_mainwindow());
GTK_EVENTS_FLUSH();
-
+
if (refresh) {
ack = TRUE;
grouplist_clear();
@@ -519,7 +519,7 @@ static gboolean grouplist_recv_func(SockInfo *sock, gint count, gint read_bytes,
static void grouplist_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
{
cm_return_if_fail( allocation != NULL );
-
+
gtk_window_get_size(GTK_WINDOW(widget),
&prefs_common.news_subscribe_width, &prefs_common.news_subscribe_height);
}
@@ -548,7 +548,7 @@ static void cancel_clicked(GtkWidget *widget, gpointer data)
}
static void refresh_clicked(GtkWidget *widget, gpointer data)
-{
+{
gchar *str;
if (locked) return;
@@ -585,7 +585,7 @@ static gboolean button_press_cb(GtkCMCTree *ctree, GdkEventButton *button,
if (button->button != 1) return TRUE;
if (button->window != GTK_CMCLIST(ctree)->clist_window) return TRUE;
- if (!gtk_cmclist_get_selection_info(GTK_CMCLIST(ctree),
+ if (!gtk_cmclist_get_selection_info(GTK_CMCLIST(ctree),
button->x, button->y, &row, &col))
return TRUE;
node = gtk_cmctree_node_nth(ctree, row);
diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
@@ -4,8 +4,8 @@
* Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
*
* Parts of this file from gtk/gtkctree.c and gtk/gtkclist.c:
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald,
- * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball, Josh MacDonald,
+ * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
*
* Parts of this file from gtkflist.c:
* Copyright (C) 1999 The Free Software Foundation
@@ -23,7 +23,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#include "config.h"
@@ -84,7 +84,7 @@ static void gtk_sctree_drag_data_received (GtkWidget *widget, GdkDragContext *co
static void gtk_sctree_clear (GtkCMCList *clist);
static void gtk_sctree_real_unselect_all (GtkCMCList *clist);
-
+
static void stree_sort (GtkCMCTree *ctree, GtkCMCTreeNode *node, gpointer data);
void gtk_sctree_sort_node (GtkCMCTree *ctree, GtkCMCTreeNode *node);
void gtk_sctree_sort_recursive (GtkCMCTree *ctree, GtkCMCTreeNode *node);
@@ -95,12 +95,12 @@ static void gtk_sctree_link (GtkCMCTree *ctree,
GtkCMCTreeNode *sibling,
gboolean update_focus_row);
-static void gtk_sctree_unlink (GtkCMCTree *ctree,
+static void gtk_sctree_unlink (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gboolean update_focus_row);
-static void stree_update_level (GtkCMCTree *ctree,
- GtkCMCTreeNode *node,
+static void stree_update_level (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gpointer data);
static GtkCMCTreeNode * gtk_sctree_last_visible (GtkCMCTree *ctree,
@@ -112,7 +112,7 @@ static void gtk_sctree_real_tree_collapse (GtkCMCTree *ctree,
static void
sreal_tree_move (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
- GtkCMCTreeNode *new_parent,
+ GtkCMCTreeNode *new_parent,
GtkCMCTreeNode *new_sibling);
static GtkCMCTreeClass *parent_class;
@@ -121,10 +121,10 @@ static guint sctree_signals[LAST_SIGNAL];
/**
* gtk_sctree_get_type:
- * @void:
- *
+ * @void:
+ *
* Creates the GtkSCTree class and its type information
- *
+ *
* Return value: The type ID for GtkSCTreeClass
**/
GType
@@ -167,10 +167,10 @@ gtk_sctree_change_focus_row_expansion (GtkCMCTree *ctree,
clist = GTK_CMCLIST (ctree);
- if (gtkut_pointer_is_grabbed (GTK_WIDGET (ctree)) &&
+ if (gtkut_pointer_is_grabbed (GTK_WIDGET (ctree)) &&
gtk_widget_has_grab (GTK_WIDGET(ctree)))
return;
-
+
if (!(node =
GTK_CMCTREE_NODE (g_list_nth (clist->row_list, clist->focus_row))) ||
GTK_CMCTREE_ROW (node)->is_leaf || !(GTK_CMCTREE_ROW (node)->children))
@@ -274,7 +274,7 @@ gtk_sctree_class_init (GtkSCTreeClass *klass)
ctree_class->tree_expand = gtk_sctree_real_tree_expand;
ctree_class->tree_move = sreal_tree_move;
ctree_class->change_focus_row_expansion = gtk_sctree_change_focus_row_expansion;
-
+
widget_class->button_press_event = gtk_sctree_button_press;
widget_class->button_release_event = gtk_sctree_button_release;
widget_class->motion_notify_event = gtk_sctree_motion;
@@ -285,7 +285,7 @@ gtk_sctree_class_init (GtkSCTreeClass *klass)
widget_class->drag_motion = gtk_sctree_drag_motion;
widget_class->drag_drop = gtk_sctree_drag_drop;
widget_class->drag_data_received = gtk_sctree_drag_data_received;
-
+
gobject_class->finalize = gtk_sctree_finalize;
}
@@ -334,13 +334,13 @@ select_range (GtkSCTree *sctree, gint row)
max = row;
}
sctree->selecting_range++;
-
+
if (max < min) {
int t = min;
min = max;
max = t;
}
-
+
if (max - min > 10)
gtk_cmclist_freeze(GTK_CMCLIST(sctree));
@@ -370,7 +370,7 @@ select_row (GtkSCTree *sctree, gint row, gint col, guint state, GtkCMCTreeNode *
gboolean range, additive;
cm_return_if_fail (sctree != NULL);
cm_return_if_fail (GTK_IS_SCTREE (sctree));
-
+
range = ((state & GDK_SHIFT_MASK) != 0) &&
(GTK_CMCLIST(sctree)->selection_mode != GTK_SELECTION_SINGLE) &&
(GTK_CMCLIST(sctree)->selection_mode != GTK_SELECTION_BROWSE);
@@ -411,10 +411,10 @@ select_row (GtkSCTree *sctree, gint row, gint col, guint state, GtkCMCTreeNode *
}
static gboolean
-sctree_is_hot_spot (GtkSCTree *sctree,
+sctree_is_hot_spot (GtkSCTree *sctree,
GtkCMCTreeNode *node,
- gint row,
- gint x,
+ gint row,
+ gint x,
gint y)
{
GtkCMCTreeRow *tree_row;
@@ -423,7 +423,7 @@ sctree_is_hot_spot (GtkSCTree *sctree,
gint xl, xmax;
gint yu;
gint hotspot_size;
-
+
cm_return_val_if_fail (GTK_IS_SCTREE (sctree), FALSE);
cm_return_val_if_fail (node != NULL, FALSE);
@@ -844,7 +844,7 @@ gtk_sctree_auto_resize_columns (GtkCMCList *clist)
gtk_sctree_column_auto_resize (clist, NULL, i, clist->column[i].width);
}
-static void
+static void
gtk_sctree_real_tree_collapse (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
@@ -863,7 +863,7 @@ gtk_sctree_real_tree_collapse (GtkCMCTree *ctree,
clist = GTK_CMCLIST (ctree);
GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
-
+
GTK_CMCTREE_ROW (node)->expanded = FALSE;
level = GTK_CMCTREE_ROW (node)->level;
@@ -875,13 +875,13 @@ gtk_sctree_real_tree_collapse (GtkCMCTree *ctree,
(clist, >K_CMCTREE_ROW (node)->row, ctree->tree_column, &requisition);
/* unref/unset opened pixbuf */
- if (GTK_CMCELL_PIXTEXT
+ if (GTK_CMCELL_PIXTEXT
(GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf)
{
g_object_unref
(GTK_CMCELL_PIXTEXT
(GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf);
-
+
GTK_CMCELL_PIXTEXT
(GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf = NULL;
}
@@ -889,8 +889,8 @@ gtk_sctree_real_tree_collapse (GtkCMCTree *ctree,
/* set/ref closed pixbuf */
if (GTK_CMCTREE_ROW (node)->pixbuf_closed)
{
- GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf =
+ GTK_CMCELL_PIXTEXT
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf =
g_object_ref (GTK_CMCTREE_ROW (node)->pixbuf_closed);
}
@@ -942,24 +942,24 @@ gtk_sctree_real_tree_collapse (GtkCMCTree *ctree,
/* resize tree_column if needed */
gtk_sctree_column_auto_resize (clist, >K_CMCTREE_ROW (node)->row, ctree->tree_column,
requisition.width);
-
+
}
-GtkWidget *gtk_sctree_new_with_titles (gint columns, gint tree_column,
+GtkWidget *gtk_sctree_new_with_titles (gint columns, gint tree_column,
gchar *titles[])
{
GtkWidget *widget;
-
+
cm_return_val_if_fail (columns > 0, NULL);
cm_return_val_if_fail (tree_column >= 0, NULL);
-
+
if (tree_column >= columns) {
g_warning("wrong tree column");
tree_column = 0;
print_backtrace();
}
-
+
widget = gtk_widget_new (TYPE_GTK_SCTREE,
"n_columns", columns,
"tree_column", tree_column,
@@ -976,7 +976,7 @@ GtkWidget *gtk_sctree_new_with_titles (gint columns, gint tree_column,
GTK_SCTREE(widget)->show_stripes = TRUE;
GTK_SCTREE(widget)->always_expand_recursively = TRUE;
GTK_SCTREE(widget)->force_additive_sel = FALSE;
-
+
GTK_SCTREE(widget)->use_markup = g_new0(gboolean, columns);
return widget;
@@ -988,10 +988,10 @@ void gtk_sctree_set_use_markup (GtkSCTree *sctree,
{
gint columns = 0;
GValue value = { 0 };
-
+
cm_return_if_fail(GTK_IS_SCTREE(sctree));
- g_value_init (&value, G_TYPE_INT);
+ g_value_init (&value, G_TYPE_INT);
g_object_get_property (G_OBJECT (sctree), "n-columns", &value);
columns = g_value_get_int (&value);
g_value_unset (&value);
@@ -1003,14 +1003,14 @@ void gtk_sctree_set_use_markup (GtkSCTree *sctree,
void gtk_sctree_select (GtkSCTree *sctree, GtkCMCTreeNode *node)
{
- select_row(sctree,
+ select_row(sctree,
g_list_position(GTK_CMCLIST(sctree)->row_list, (GList *)node),
-1, 0, node);
}
void gtk_sctree_select_with_state (GtkSCTree *sctree, GtkCMCTreeNode *node, int state)
{
- select_row(sctree,
+ select_row(sctree,
g_list_position(GTK_CMCLIST(sctree)->row_list, (GList *)node),
-1, state, node);
}
@@ -1080,7 +1080,7 @@ static void heap_sort(GtkCMCList *clist, GPtrArray *numbers, gint array_size)
{
gint i;
GtkCMCTreeNode *temp;
-
+
/* build the Heap */
for (i = (array_size / 2); i >= 1; i--)
sink( clist, numbers, i, array_size);
@@ -1151,14 +1151,14 @@ stree_sort (GtkCMCTree *ctree,
for (i=0; i<viewable_array->len; i++) {
gtk_cmctree_expand( ctree, g_ptr_array_index( viewable_array, i));
}
-
+
}
g_ptr_array_free( row_array, TRUE);
g_ptr_array_free( viewable_array, TRUE);
}
void
-gtk_sctree_sort_recursive (GtkCMCTree *ctree,
+gtk_sctree_sort_recursive (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
GtkCMCList *clist;
@@ -1173,7 +1173,7 @@ gtk_sctree_sort_recursive (GtkCMCTree *ctree,
if (clist->selection_mode == GTK_SELECTION_MULTIPLE) {
GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
-
+
g_list_free (clist->undo_selection);
g_list_free (clist->undo_unselection);
clist->undo_selection = NULL;
@@ -1182,7 +1182,7 @@ gtk_sctree_sort_recursive (GtkCMCTree *ctree,
if (!node || (node && gtk_cmctree_is_viewable (ctree, node)))
focus_node = GTK_CMCTREE_NODE (g_list_nth (clist->row_list, clist->focus_row));
-
+
GTK_SCTREE(ctree)->sorting = TRUE;
gtk_cmctree_post_recursive (ctree, node, GTK_CMCTREE_FUNC (stree_sort), NULL);
@@ -1201,7 +1201,7 @@ gtk_sctree_sort_recursive (GtkCMCTree *ctree,
}
void
-gtk_sctree_sort_node (GtkCMCTree *ctree,
+gtk_sctree_sort_node (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
GtkCMCList *clist;
@@ -1243,7 +1243,7 @@ gtk_sctree_sort_node (GtkCMCTree *ctree,
/************************************************************************/
static void
-gtk_sctree_unlink (GtkCMCTree *ctree,
+gtk_sctree_unlink (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gboolean update_focus_row)
{
@@ -1260,7 +1260,7 @@ gtk_sctree_unlink (GtkCMCTree *ctree,
cm_return_if_fail (node != NULL);
clist = GTK_CMCLIST (ctree);
-
+
if (update_focus_row && clist->selection_mode == GTK_SELECTION_MULTIPLE) {
GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
@@ -1300,7 +1300,7 @@ gtk_sctree_unlink (GtkCMCTree *ctree,
clist->focus_row = MAX (pos - 1, 0);
else
clist->focus_row = pos;
-
+
clist->focus_row = MIN (clist->focus_row, clist->rows - 1);
}
clist->undo_anchor = clist->focus_row;
@@ -1362,7 +1362,7 @@ gtk_sctree_link (GtkCMCTree *ctree,
GList *work;
gboolean visible = FALSE;
gint rows = 0;
-
+
if (sibling)
cm_return_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent);
cm_return_if_fail (node != NULL);
@@ -1465,7 +1465,7 @@ gtk_sctree_link (GtkCMCTree *ctree,
}
}
- gtk_cmctree_pre_recursive (ctree, node, stree_update_level, NULL);
+ gtk_cmctree_pre_recursive (ctree, node, stree_update_level, NULL);
if (clist->row_list_end == NULL ||
clist->row_list_end->next == (GList *)node)
@@ -1474,7 +1474,7 @@ gtk_sctree_link (GtkCMCTree *ctree,
if (visible && update_focus_row) {
gint pos;
pos = g_list_position (clist->row_list, (GList *)node);
-
+
if (pos <= clist->focus_row) {
clist->focus_row += rows;
clist->undo_anchor = clist->focus_row;
@@ -1483,15 +1483,15 @@ gtk_sctree_link (GtkCMCTree *ctree,
}
static void
-stree_update_level (GtkCMCTree *ctree,
- GtkCMCTreeNode *node,
+stree_update_level (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gpointer data)
{
if (!node)
return;
if (GTK_CMCTREE_ROW (node)->parent)
- GTK_CMCTREE_ROW (node)->level =
+ GTK_CMCTREE_ROW (node)->level =
GTK_CMCTREE_ROW (GTK_CMCTREE_ROW (node)->parent)->level + 1;
else
GTK_CMCTREE_ROW (node)->level = 1;
@@ -1502,7 +1502,7 @@ gtk_sctree_last_visible (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
GtkCMCTreeNode *work;
-
+
if (!node)
return NULL;
@@ -1517,7 +1517,7 @@ gtk_sctree_last_visible (GtkCMCTree *ctree,
return gtk_sctree_last_visible (ctree, work);
}
-static void
+static void
sset_node_info (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
const gchar *text,
@@ -1554,7 +1554,7 @@ sset_node_info (GtkCMCTree *ctree,
if (GTK_CMCTREE_ROW (node)->expanded)
gtk_cmctree_node_set_pixtext (ctree, node, ctree->tree_column,
text, spacing, pixbuf_opened);
- else
+ else
gtk_cmctree_node_set_pixtext (ctree, node, ctree->tree_column,
text, spacing, pixbuf_closed);
}
@@ -1594,7 +1594,7 @@ srow_new (GtkCMCTree *ctree)
ctree_row->children = NULL;
ctree_row->pixbuf_closed = NULL;
ctree_row->pixbuf_opened = NULL;
-
+
return ctree_row;
}
@@ -1652,15 +1652,15 @@ srow_delete (GtkCMCTree *ctree,
}
static void
-stree_delete_row (GtkCMCTree *ctree,
- GtkCMCTreeNode *node,
+stree_delete_row (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gpointer data)
{
srow_delete (ctree, GTK_CMCTREE_ROW (node));
g_list_free_1 ((GList *)node);
}
-static void
+static void
gtk_sctree_real_tree_expand (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
@@ -1675,7 +1675,7 @@ gtk_sctree_real_tree_expand (GtkCMCTree *ctree,
return;
clist = GTK_CMCLIST (ctree);
-
+
GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
GTK_CMCTREE_ROW (node)->expanded = TRUE;
@@ -1688,13 +1688,13 @@ gtk_sctree_real_tree_expand (GtkCMCTree *ctree,
(clist, >K_CMCTREE_ROW (node)->row, ctree->tree_column, &requisition);
/* unref/unset closed pixbuf */
- if (GTK_CMCELL_PIXTEXT
+ if (GTK_CMCELL_PIXTEXT
(GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf)
{
g_object_unref
(GTK_CMCELL_PIXTEXT
(GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf);
-
+
GTK_CMCELL_PIXTEXT
(GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf = NULL;
}
@@ -1702,8 +1702,8 @@ gtk_sctree_real_tree_expand (GtkCMCTree *ctree,
/* set/ref opened pixbuf */
if (GTK_CMCTREE_ROW (node)->pixbuf_opened)
{
- GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf =
+ GTK_CMCELL_PIXTEXT
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf =
g_object_ref (GTK_CMCTREE_ROW (node)->pixbuf_opened);
}
@@ -1716,7 +1716,7 @@ gtk_sctree_real_tree_expand (GtkCMCTree *ctree,
gint tmp = 0;
gint row;
gint i;
-
+
if (visible && !GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist))
{
cell_width = g_new0 (gint, clist->columns);
@@ -1773,7 +1773,7 @@ gtk_sctree_real_tree_expand (GtkCMCTree *ctree,
cell_width[i] > clist->column[i].width)
gtk_cmclist_set_column_width (clist, i, cell_width[i]);
g_free (cell_width);
-
+
if (!GTK_SCTREE(ctree)->sorting) {
/* update focus_row position */
row = g_list_position (clist->row_list, (GList *)node);
@@ -1791,9 +1791,9 @@ gtk_sctree_real_tree_expand (GtkCMCTree *ctree,
}
-GtkCMCTreeNode *
+GtkCMCTreeNode *
gtk_sctree_insert_node (GtkCMCTree *ctree,
- GtkCMCTreeNode *parent,
+ GtkCMCTreeNode *parent,
GtkCMCTreeNode *sibling,
gchar *text[],
guint8 spacing,
@@ -1890,7 +1890,7 @@ gtk_sctree_insert_gnode (GtkCMCTree *ctree,
cm_return_val_if_fail (func != NULL, NULL);
if (sibling)
cm_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
-
+
clist = GTK_CMCLIST (ctree);
if (parent)
@@ -1931,8 +1931,8 @@ gtk_sctree_insert_gnode (GtkCMCTree *ctree,
work, func, data);
if (new_child)
child = new_child;
- }
-
+ }
+
gtk_cmclist_thaw (clist);
return cnode;
@@ -1941,7 +1941,7 @@ gtk_sctree_insert_gnode (GtkCMCTree *ctree,
static void
sreal_tree_move (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
- GtkCMCTreeNode *new_parent,
+ GtkCMCTreeNode *new_parent,
GtkCMCTreeNode *new_sibling)
{
GtkCMCList *clist;
@@ -1950,7 +1950,7 @@ sreal_tree_move (GtkCMCTree *ctree,
cm_return_if_fail (ctree != NULL);
cm_return_if_fail (node != NULL);
- cm_return_if_fail (!new_sibling ||
+ cm_return_if_fail (!new_sibling ||
GTK_CMCTREE_ROW (new_sibling)->parent == new_parent);
if (new_parent && GTK_CMCTREE_ROW (new_parent)->is_leaf)
@@ -1968,7 +1968,7 @@ sreal_tree_move (GtkCMCTree *ctree,
if (clist->selection_mode == GTK_SELECTION_MULTIPLE)
{
GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
-
+
g_list_free (clist->undo_selection);
g_list_free (clist->undo_unselection);
clist->undo_selection = NULL;
@@ -1979,7 +1979,7 @@ sreal_tree_move (GtkCMCTree *ctree,
{
if (new_parent == GTK_CMCTREE_ROW (node)->parent)
return;
-
+
if (new_parent)
new_sibling = GTK_CMCTREE_ROW (new_parent)->children;
else
@@ -1990,7 +1990,7 @@ sreal_tree_move (GtkCMCTree *ctree,
new_sibling = GTK_CMCTREE_ROW (new_sibling)->sibling;
}
- if (new_parent == GTK_CMCTREE_ROW (node)->parent &&
+ if (new_parent == GTK_CMCTREE_ROW (node)->parent &&
new_sibling == GTK_CMCTREE_ROW (node)->sibling)
return;
@@ -2000,10 +2000,10 @@ sreal_tree_move (GtkCMCTree *ctree,
if (!GTK_SCTREE(ctree)->sorting && gtk_cmctree_is_viewable (ctree, node))
work = GTK_CMCTREE_NODE (g_list_nth (clist->row_list, clist->focus_row));
-
+
gtk_sctree_unlink (ctree, node, FALSE);
gtk_sctree_link (ctree, node, new_parent, new_sibling, FALSE);
-
+
if (!GTK_SCTREE(ctree)->sorting && work)
{
while (work && !gtk_cmctree_is_viewable (ctree, work))
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
@@ -39,7 +39,7 @@ static GtkTreeStore *prefswindow_create_data_store (void);
static GtkWidget *prefswindow_tree_view_create (PrefsWindow* prefswindow);
static void prefs_filtering_create_tree_view_columns (GtkWidget *tree_view);
static gboolean prefswindow_row_selected (GtkTreeSelection *selector,
- GtkTreeModel *model,
+ GtkTreeModel *model,
GtkTreePath *path,
gboolean currently_selected,
gpointer data);
@@ -121,7 +121,7 @@ static void ok_button_clicked(GtkButton *button, gpointer user_data)
if (query_can_close_all_pages(prefswindow->prefs_pages)) {
save_all_pages(prefswindow->prefs_pages);
close_prefs_window(prefswindow);
- }
+ }
}
static void cancel_button_clicked(GtkButton *button, gpointer user_data)
@@ -149,7 +149,7 @@ static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
case GDK_KEY_Escape :
cancel_button_clicked(NULL, data);
break;
- case GDK_KEY_Return :
+ case GDK_KEY_Return :
case GDK_KEY_KP_Enter :
focused_child = gtkut_get_focused_child
(GTK_CONTAINER(data->notebook));
@@ -184,14 +184,14 @@ static gboolean find_node_by_name(GtkTreeModel *model, GtkTreePath *path,
if (result) {
data->found = TRUE;
data->node = *iter;
- }
+ }
g_free(name);
}
-
+
return result;
}
-static gint prefswindow_tree_sort_by_weight(GtkTreeModel *model,
+static gint prefswindow_tree_sort_by_weight(GtkTreeModel *model,
GtkTreeIter *a,
GtkTreeIter *b,
gpointer context)
@@ -200,16 +200,16 @@ static gint prefswindow_tree_sort_by_weight(GtkTreeModel *model,
gint i1, i2;
/* From observation sorting should keep in account the original
- * order in the prefs_pages list. I.e. if equal weight, prefer
- * the index in the pages list */
- gtk_tree_model_get(model, a,
+ * order in the prefs_pages list. I.e. if equal weight, prefer
+ * the index in the pages list */
+ gtk_tree_model_get(model, a,
PREFS_PAGE_INDEX, &i1,
PREFS_PAGE_WEIGHT, &f1, -1);
- gtk_tree_model_get(model, b,
+ gtk_tree_model_get(model, b,
PREFS_PAGE_INDEX, &i2,
PREFS_PAGE_WEIGHT, &f2, -1);
- return f1 < f2 ? -1 : (f1 > f2 ? 1 :
+ return f1 < f2 ? -1 : (f1 > f2 ? 1 :
(i1 < i2 ? 1 : (i1 > i2 ? -1 : 0)));
}
@@ -222,7 +222,7 @@ static void prefswindow_build_page(PrefsWindow *prefswindow, PrefsPage *page)
gtk_widget_show(scrolledwin);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
+
page->create_widget(page, GTK_WINDOW(prefswindow->window), prefswindow->data);
gtk_container_add(GTK_CONTAINER(scrolledwin), page->widget);
@@ -268,10 +268,10 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
for (i = 0; page->path[i] != NULL; i++) {
find_name.found = FALSE;
find_name.name = page->path[i];
-
- /* find node to attach to
+
+ /* find node to attach to
* FIXME: we search the entire tree, so this is suboptimal... */
- gtk_tree_model_foreach(GTK_TREE_MODEL(store),
+ gtk_tree_model_foreach(GTK_TREE_MODEL(store),
(GtkTreeModelForeachFunc) find_node_by_name,
&find_name);
if (find_name.found && (i == 0 || page->path[i] != page->path[i-1])) {
@@ -280,8 +280,8 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
PREFS_PAGE_DATA, &prefs_node,
-1);
} else {
- GAuto *autoptr;
-
+ GAuto *autoptr;
+
/* create a new top level */
gtk_tree_store_append(store, &child, i == 0 ? NULL : &node);
prefs_node = g_new0(PrefsTreeNode, 1);
@@ -307,8 +307,8 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
/* parents "inherit" the max weight of the children */
do {
gfloat f;
-
- gtk_tree_model_get(GTK_TREE_MODEL(store), &node,
+
+ gtk_tree_model_get(GTK_TREE_MODEL(store), &node,
PREFS_PAGE_WEIGHT, &f,
-1);
if (page->weight > f) {
@@ -316,9 +316,9 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
gtk_tree_store_set(store, &node,
PREFS_PAGE_WEIGHT, f,
-1);
- }
- child = node;
- } while (gtk_tree_model_iter_parent(GTK_TREE_MODEL(store),
+ }
+ child = node;
+ } while (gtk_tree_model_iter_parent(GTK_TREE_MODEL(store),
&node, &child));
}
@@ -388,7 +388,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
prefswindow->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show(prefswindow->vbox);
-
+
prefswindow->paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_widget_show(prefswindow->paned);
@@ -402,12 +402,12 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
+
gtk_paned_add1(GTK_PANED(prefswindow->paned), prefswindow->scrolledwindow1);
prefswindow->tree_view = prefswindow_tree_view_create(prefswindow);
gtk_widget_show(prefswindow->tree_view);
- gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1),
+ gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1),
prefswindow->tree_view);
prefswindow->vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
@@ -487,14 +487,14 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
}
MANAGE_WINDOW_SIGNALS_CONNECT(prefswindow->window);
-
+
gdk_monitor_get_workarea(gdk_display_get_primary_monitor(gdk_display_get_default()),
&workarea);
x = workarea.width;
y = workarea.height;
-
+
if (!geometry.min_height) {
-
+
if (x < 800 && y < 600) {
geometry.min_width = 600;
geometry.min_height = 440;
@@ -587,11 +587,11 @@ static void prefs_filtering_create_tree_view_columns(GtkWidget *tree_view)
renderer,
"text", PREFS_PAGE_TITLE,
NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
}
static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
- GtkTreeModel *model,
+ GtkTreeModel *model,
GtkTreePath *path,
gboolean currently_selected,
gpointer data)
diff --git a/src/html.c b/src/html.c
@@ -104,7 +104,7 @@ gchar *sc_html_parse(SC_HTMLParser *parser)
*/
if (SC_HTML_HREF_BEG == st || SC_HTML_HREF == st)
return parser->str->str;
- }
+ }
break;
case '&':
sc_html_parse_special(parser);
@@ -334,7 +334,7 @@ static void decode_href(SC_HTMLParser *parser)
tparser->bufp = tparser->buf->str;
tmp = sc_html_parse(tparser);
-
+
g_free(parser->href);
parser->href = g_strdup(tmp);
diff --git a/src/image_viewer.c b/src/image_viewer.c
@@ -128,7 +128,7 @@ static void image_viewer_load_image(ImageViewer *imageviewer)
}
if (!pixbuf && !animation) {
- g_warning("couldn't load the image");
+ g_warning("couldn't load the image");
return;
}
@@ -145,7 +145,7 @@ static void image_viewer_load_image(ImageViewer *imageviewer)
gtk_widget_show(imageviewer->image);
- g_signal_handlers_unblock_by_func(G_OBJECT(imageviewer->scrolledwin),
+ g_signal_handlers_unblock_by_func(G_OBJECT(imageviewer->scrolledwin),
G_CALLBACK(scrolledwin_resize_cb), imageviewer);
if (pixbuf)
@@ -479,7 +479,7 @@ MimeViewerFactory image_viewer_factory =
{
content_types,
0,
-
+
image_viewer_create,
};
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -73,7 +73,7 @@ static GtkActionEntry imap_popup_entries[] =
{"FolderViewPopup/Subscriptions", NULL, N_("S_ubscriptions"), NULL, NULL, NULL },
- {"FolderViewPopup/Subscriptions/---", NULL, "---", NULL, NULL, NULL },
+ {"FolderViewPopup/Subscriptions/---", NULL, "---", NULL, NULL, NULL },
{"FolderViewPopup/Subscriptions/Subscribe", NULL, N_("_Subscribe..."), NULL, NULL, G_CALLBACK(subscribe_cb) },
{"FolderViewPopup/Subscriptions/Unsubscribe", NULL, N_("_Unsubscribe..."), NULL, NULL, G_CALLBACK(unsubscribe_cb) },
@@ -134,7 +134,7 @@ static void add_menuitems(GtkUIManager *ui_manager, FolderItem *item)
static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
{
- gboolean folder_is_normal =
+ gboolean folder_is_normal =
item != NULL &&
item->stype == F_NORMAL &&
!folder_has_parent_of_type(item, F_OUTBOX) &&
@@ -154,7 +154,7 @@ static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
SET_SENS("FolderViewPopup/CheckNewFolders", folder_item_parent(item) == NULL);
SET_SENS("FolderViewPopup/RebuildTree", folder_item_parent(item) == NULL);
- SET_SENS("FolderViewPopup/Synchronise",
+ SET_SENS("FolderViewPopup/Synchronise",
item ? (folder_item_parent(item) != NULL
&& folder_want_synchronise(item->folder))
: FALSE);
@@ -163,7 +163,7 @@ static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
SET_SENS("FolderViewPopup/CheckNewMessages", folder_item_parent(item) == NULL);
SET_SENS("FolderViewPopup/CheckNewFolders", folder_item_parent(item) == NULL);
SET_SENS("FolderViewPopup/RebuildTree", folder_item_parent(item) == NULL);
-
+
SET_SENS("FolderViewPopup/Subscriptions/Unsubscribe", item && item->stype == F_NORMAL && folder_item_parent(item) != NULL);
SET_SENS("FolderViewPopup/Subscriptions/Subscribe", TRUE);
if (item && item->folder && item->folder->account)
@@ -182,7 +182,7 @@ static void new_folder_cb(GtkAction *action, gpointer data)
gchar *name;
gchar *p;
gchar separator = '/';
-
+
if ((item = folderview_get_selected_item(folderview)) == NULL) return;
cm_return_if_fail(item != NULL);
@@ -285,7 +285,7 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
}
old_id = folder_item_get_identifier(item);
-
+
if (folder_item_rename(item, new_folder) < 0) {
alertpanel_error(_("The folder could not be renamed.\n"
"The new folder name is not allowed."));
@@ -320,7 +320,7 @@ static void move_folder_cb(GtkAction *action, gpointer data)
g_free(msg);
if (!to_folder)
return;
-
+
folderview_move_folder(folderview, from_folder, to_folder, 0);
}
@@ -340,7 +340,7 @@ static void copy_folder_cb(GtkAction *action, gpointer data)
g_free(msg);
if (!to_folder)
return;
-
+
folderview_move_folder(folderview, from_folder, to_folder, 1);
}
@@ -428,7 +428,7 @@ void imap_gtk_synchronise(FolderItem *item, gint days)
{
MainWindow *mainwin = mainwindow_get_mainwindow();
FolderView *folderview = mainwin->folderview;
-
+
cm_return_if_fail(item != NULL);
cm_return_if_fail(item->folder != NULL);
@@ -481,7 +481,7 @@ static gboolean imap_gtk_subscribe_func(GNode *node, gpointer data)
{
FolderItem *item = node->data;
gboolean action = GPOINTER_TO_INT(data);
-
+
if (item->path)
imap_subscribe(item->folder, item, NULL, action);
@@ -501,7 +501,7 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
name = trim_string(item->name, 32);
AUTORELEASE_STR(name, {g_free(name); return;});
-
+
if (action && item->folder->account->imap_subsonly) {
GList *child_list = NULL;
GList *transc_list = NULL;
@@ -512,7 +512,7 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
rec_chk = gtk_check_button_new_with_label(_("Search recursively"));
- g_signal_connect(G_OBJECT(rec_chk), "toggled",
+ g_signal_connect(G_OBJECT(rec_chk), "toggled",
G_CALLBACK(chk_update_val), &recurse);
avalue = alertpanel_full(_("Subscriptions"), message,
@@ -521,24 +521,24 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
FALSE, rec_chk, ALERT_QUESTION);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
-
+
child_list = imap_scan_subtree(item->folder, item, TRUE, recurse);
-
+
if (child_list) {
GList *cur;
int r = -1;
gchar *msg = g_strdup_printf(_("Choose a subfolder of %s to subscribe to: "),
- item->name);
+ item->name);
gchar *child_folder = NULL;
-
+
for (cur = child_list; cur; cur = cur->next) {
- transc_list = g_list_append(transc_list,
+ transc_list = g_list_append(transc_list,
imap_modified_utf7_to_utf8(cur->data, FALSE));
}
-
+
transc_list = g_list_sort(transc_list, g_str_equal);
-
- child_folder = input_dialog_combo(_("Subscribe"),
+
+ child_folder = input_dialog_combo(_("Subscribe"),
msg,
transc_list->next?_("All of them"):transc_list->data, transc_list);
g_free(msg);
@@ -547,13 +547,13 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
r = imap_subscribe(item->folder, NULL, transc_folder, TRUE);
g_free(transc_folder);
} else if (child_folder) {
- for (cur = child_list; cur; cur = cur->next)
+ for (cur = child_list; cur; cur = cur->next)
r = imap_subscribe(item->folder, NULL, (gchar *)cur->data, TRUE);
}
g_free(child_folder);
- for (cur = child_list; cur; cur = cur->next)
+ for (cur = child_list; cur; cur = cur->next)
g_free((gchar *)cur->data);
- for (cur = transc_list; cur; cur = cur->next)
+ for (cur = transc_list; cur; cur = cur->next)
g_free((gchar *)cur->data);
if (r == 0)
folderview_rescan_tree(item->folder, FALSE);
@@ -569,10 +569,10 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
message = g_markup_printf_escaped
(_("Do you want to %s the '%s' folder?"),
action?_("subscribe"):_("unsubscribe"), name);
-
+
rec_chk = gtk_check_button_new_with_label(_("Apply to subfolders"));
-
- g_signal_connect(G_OBJECT(rec_chk), "toggled",
+
+ g_signal_connect(G_OBJECT(rec_chk), "toggled",
G_CALLBACK(chk_update_val), &recurse);
avalue = alertpanel_full(_("Subscriptions"), message,
@@ -580,7 +580,7 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
NULL, NULL, ALERTFOCUS_SECOND, FALSE, rec_chk, ALERT_QUESTION);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
-
+
FolderItem *opened = folderview_get_opened_item(folderview);
FolderItem *selected = folderview_get_selected_item(folderview);
if (!action) {
@@ -617,7 +617,7 @@ static void subscribed_cb(GtkAction *action, gpointer data)
FolderView *folderview = (FolderView *)data;
FolderItem *item = folderview_get_selected_item(folderview);
FolderItem *opened = folderview_get_opened_item(folderview);
-
+
if (!item || !item->folder || !item->folder->account)
return;
if (item->folder->account->imap_subsonly == gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
diff --git a/src/localfolder.c b/src/localfolder.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#include "config.h"
diff --git a/src/manual.c b/src/manual.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -67,7 +67,7 @@ static gchar *get_local_path_with_locale(gchar *rootpath)
gchar *lang_str, *dir;
lang_str = get_language();
- dir = g_strconcat(rootpath, G_DIR_SEPARATOR_S,
+ dir = g_strconcat(rootpath, G_DIR_SEPARATOR_S,
lang_str, NULL);
g_free(lang_str);
if(!is_dir_exist(dir)) {
@@ -87,7 +87,7 @@ gboolean manual_available(ManualType type)
{
gboolean ret = FALSE;
gchar *dir = NULL, *uri = NULL;
-
+
switch (type) {
case MANUAL_MANUAL_CLAWS:
dir = get_local_path_with_locale(MANUALDIR);
diff --git a/src/matcher.c b/src/matcher.c
@@ -53,7 +53,7 @@
*\brief Keyword lookup element
*/
struct _MatchParser {
- gint id; /*!< keyword id */
+ gint id; /*!< keyword id */
gchar *str; /*!< keyword */
};
typedef struct _MatchParser MatchParser;
@@ -266,7 +266,7 @@ const gchar *get_matchparser_tab_str(gint id)
static void create_matchparser_hashtab(void)
{
int i;
-
+
if (matchparser_hashtab) return;
matchparser_hashtab = g_hash_table_new(g_str_hash, g_str_equal);
for (i = 0; i < sizeof matchparser_tab / sizeof matchparser_tab[0]; i++)
@@ -351,18 +351,18 @@ void matcherprop_free(MatcherProp *prop)
MatcherProp *matcherprop_copy(const MatcherProp *src)
{
MatcherProp *prop = g_new0(MatcherProp, 1);
-
+
prop->criteria = src->criteria;
prop->matchtype = src->matchtype;
prop->value = src->value;
- prop->error = src->error;
+ prop->error = src->error;
if (src->header)
prop->header = g_strdup(src->header);
if (src->expr)
prop->expr = g_strdup(src->expr);
if (src->casefold_expr)
prop->casefold_expr = g_strdup(src->casefold_expr);
- return prop;
+ return prop;
}
/* ************** match ******************************/
@@ -386,7 +386,7 @@ static gboolean match_with_addresses_in_addressbook
path = NULL;
else
path = folderpath;
-
+
start_address_completion(path);
for (walk = address_list; walk != NULL; walk = walk->next) {
@@ -450,7 +450,7 @@ static gboolean match_with_addresses_in_addressbook
}
end_address_completion();
-
+
return found;
}
@@ -458,9 +458,9 @@ static gboolean match_with_addresses_in_addressbook
*\brief Find out if a string matches a condition
*
*\param prop Matcher structure
- *\param str String to check
+ *\param str String to check
*
- *\return gboolean TRUE if str matches the condition in the
+ *\return gboolean TRUE if str matches the condition in the
* matcher structure
*/
static gboolean matcherprop_string_match(MatcherProp *prop, const gchar *str,
@@ -508,7 +508,7 @@ static gboolean matcherprop_string_match(MatcherProp *prop, const gchar *str,
ret = FALSE;
goto free_strs;
}
-
+
if (regexec(prop->preg, str1, 0, NULL, 0) == 0)
ret = TRUE;
else
@@ -562,7 +562,7 @@ static gboolean matcherprop_string_match(MatcherProp *prop, const gchar *str,
default:
break;
}
-
+
free_strs:
if (should_free) {
g_free(str1);
@@ -576,7 +576,7 @@ free_strs:
*\param prop Matcher structure
*\param msginfo message to check
*
- *\return gboolean TRUE if msginfo matches the condition in the
+ *\return gboolean TRUE if msginfo matches the condition in the
* matcher structure
*/
static gboolean matcherprop_tag_match(MatcherProp *prop, MsgInfo *msginfo,
@@ -606,7 +606,7 @@ static gboolean matcherprop_tag_match(MatcherProp *prop, MsgInfo *msginfo,
*\param prop Matcher structure
*\param list GSList of strings to check
*
- *\return gboolean TRUE if str matches the condition in the
+ *\return gboolean TRUE if str matches the condition in the
* matcher structure
*/
static gboolean matcherprop_list_match(MatcherProp *prop, const GSList *list,
@@ -681,7 +681,7 @@ static void *matcher_test_thread(void *data)
*
*\return gboolean TRUE if command was executed successfully
*/
-static gboolean matcherprop_match_test(const MatcherProp *prop,
+static gboolean matcherprop_match_test(const MatcherProp *prop,
MsgInfo *info)
{
gchar *file;
@@ -701,13 +701,13 @@ static gboolean matcherprop_match_test(const MatcherProp *prop,
#endif
return FALSE;
}
- g_free(file);
+ g_free(file);
cmd = matching_build_command(prop->expr, info);
if (cmd == NULL) {
#ifdef USE_PTHREAD
g_free(td);
-#endif
+#endif
return FALSE;
}
@@ -776,7 +776,7 @@ static gboolean matcherprop_match_test(const MatcherProp *prop,
*
*\return gboolean TRUE if a match
*/
-static gboolean matcherprop_match(MatcherProp *prop,
+static gboolean matcherprop_match(MatcherProp *prop,
MsgInfo *info)
{
time_t t;
@@ -1182,7 +1182,7 @@ static gboolean matcherprop_match(MatcherProp *prop,
/* ********************* MatcherList *************************** */
/*!
- *\brief Create a new list of matchers
+ *\brief Create a new list of matchers
*
*\param matchers List of matcher structures
*\param bool_and Operator
@@ -1221,7 +1221,7 @@ static gchar *build_complete_regexp(gchar **strings)
if (g_utf8_validate(strings[i], -1, NULL))
tmpstr = g_strdup(strings[i]);
else
- tmpstr = conv_codeset_strdup(strings[i],
+ tmpstr = conv_codeset_strdup(strings[i],
conv_get_locale_charset_str_no_utf8(),
CS_INTERNAL);
@@ -1230,10 +1230,10 @@ static gchar *build_complete_regexp(gchar **strings)
new_len = strlen(tmpstr);
- expr = g_realloc(expr,
+ expr = g_realloc(expr,
expr ? (old_len + strlen("|()") + new_len + 1)
: (strlen("()") + new_len + 1));
-
+
if (old_len) {
strcpy(expr + old_len, "|(");
strcpy(expr + old_len + 2, tmpstr);
@@ -1259,7 +1259,7 @@ static gchar *build_complete_regexp(gchar **strings)
*
*\return MatcherList * New matcher list
*/
-MatcherList *matcherlist_new_from_lines(gchar *lines, gboolean bool_and,
+MatcherList *matcherlist_new_from_lines(gchar *lines, gboolean bool_and,
gboolean case_sensitive)
{
MatcherProp *m = NULL;
@@ -1270,7 +1270,7 @@ MatcherList *matcherlist_new_from_lines(gchar *lines, gboolean bool_and,
gchar *expr = NULL;
expr = build_complete_regexp(strings);
debug_print("building matcherprop for expr '%s'\n", expr?expr:"NULL");
-
+
m = matcherprop_new(MATCHCRITERIA_SUBJECT, NULL,
case_sensitive? MATCHTYPE_REGEXP: MATCHTYPE_REGEXPCASE,
expr, 0);
@@ -1358,7 +1358,7 @@ static gboolean matcherprop_match_one_header(MatcherProp *matcher,
header = procheader_parse_header(buf);
if (!header)
return FALSE;
- result = matcherprop_header_line_match(matcher,
+ result = matcherprop_header_line_match(matcher,
header->name, header->body,
(matcher->criteria == MATCHCRITERIA_HEADERS_PART),
context_str[CONTEXT_HEADER_LINE]);
@@ -1370,7 +1370,7 @@ static gboolean matcherprop_match_one_header(MatcherProp *matcher,
header = procheader_parse_header(buf);
if (!header)
return FALSE;
- result = !matcherprop_header_line_match(matcher,
+ result = !matcherprop_header_line_match(matcher,
header->name, header->body,
(matcher->criteria == MATCHCRITERIA_NOT_HEADERS_PART),
context_str[CONTEXT_HEADER_LINE]);
@@ -1493,7 +1493,7 @@ static gboolean matcherprop_criteria_message(MatcherProp *matcher)
*\param fp Message file
*
*\return gboolean TRUE if one of the headers is matched by
- * the list of conditions.
+ * the list of conditions.
*/
static gboolean matcherlist_match_headers(MatcherList *matchers, FILE *fp)
{
@@ -1564,7 +1564,7 @@ static gboolean matcherlist_match_headers(MatcherList *matchers, FILE *fp)
matcher->done = TRUE;
}
}
-
+
/* if the rule matched and the matchers are OR, no need to
* check the others */
if (matcher->result && matcher->done) {
@@ -1598,7 +1598,7 @@ static gboolean matcherprop_criteria_body(const MatcherProp *matcher)
return FALSE;
}
}
-
+
static gboolean matcherlist_match_binary_content(MatcherList *matchers, MimeInfo *partinfo)
{
FILE *outfp;
@@ -1619,7 +1619,7 @@ static gboolean matcherlist_match_binary_content(MatcherList *matchers, MimeInfo
for (l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
MatcherProp *matcher = (MatcherProp *) l->data;
- if (matcher->done)
+ if (matcher->done)
continue;
/* Don't scan non-text parts when looking in body, only
@@ -1634,7 +1634,7 @@ static gboolean matcherlist_match_binary_content(MatcherList *matchers, MimeInfo
*/
if (matcher->criteria == MATCHCRITERIA_NOT_BODY_PART ||
matcher->criteria == MATCHCRITERIA_NOT_MESSAGE) {
- if (matcherprop_string_match(matcher, buf,
+ if (matcherprop_string_match(matcher, buf,
context_str[CONTEXT_BODY_LINE])) {
matcher->result = FALSE;
matcher->done = TRUE;
@@ -1674,7 +1674,7 @@ static gboolean match_content_cb(const gchar *buf, gpointer data)
for (l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
MatcherProp *matcher = (MatcherProp *) l->data;
- if (matcher->done)
+ if (matcher->done)
continue;
/* if the criteria is ~body_part or ~message, ZERO lines
@@ -1682,7 +1682,7 @@ static gboolean match_content_cb(const gchar *buf, gpointer data)
*/
if (matcher->criteria == MATCHCRITERIA_NOT_BODY_PART ||
matcher->criteria == MATCHCRITERIA_NOT_MESSAGE) {
- if (matcherprop_string_match(matcher, buf,
+ if (matcherprop_string_match(matcher, buf,
context_str[CONTEXT_BODY_LINE])) {
matcher->result = FALSE;
matcher->done = TRUE;
@@ -1832,7 +1832,7 @@ static gboolean matcherlist_match_file(MatcherList *matchers, MsgInfo *info,
if (read_body) {
matcherlist_match_body(matchers, body_only, info);
}
-
+
for (l = matchers->matchers; l != NULL; l = g_slist_next(l)) {
MatcherProp *matcher = (MatcherProp *) l->data;
@@ -1851,13 +1851,13 @@ static gboolean matcherlist_match_file(MatcherList *matchers, MsgInfo *info,
break;
}
}
- }
+ }
}
g_free(file);
claws_fclose(fp);
-
+
return result;
}
@@ -2017,7 +2017,7 @@ static gint quote_filter_str(gchar * result, guint size,
if ((* p != '\"') && (* p != '\\')) {
if (remaining > 0) {
* result_p = * p;
- result_p ++;
+ result_p ++;
remaining --;
}
else {
@@ -2025,12 +2025,12 @@ static gint quote_filter_str(gchar * result, guint size,
return -1;
}
}
- else {
+ else {
if (remaining >= 2) {
* result_p = '\\';
- result_p ++;
+ result_p ++;
* result_p = * p;
- result_p ++;
+ result_p ++;
remaining -= 2;
}
else {
@@ -2046,7 +2046,7 @@ static gint quote_filter_str(gchar * result, guint size,
result[size - 1] = '\0';
return -1;
}
-
+
return 0;
}
@@ -2055,11 +2055,11 @@ gchar * matcher_quote_str(const gchar * src)
{
gchar * res;
gint len;
-
+
len = strlen(src) * 2 + 1;
res = g_malloc(len);
quote_filter_str(res, len, src);
-
+
return res;
}
@@ -2078,7 +2078,7 @@ gchar *matcherprop_to_string(MatcherProp *matcher)
int i;
gchar * quoted_expr;
gchar * quoted_header;
-
+
criteria_str = NULL;
for (i = 0; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)); i++) {
if (matchparser_tab[i].id == matcher->criteria)
@@ -2210,7 +2210,7 @@ gchar *matcherlist_to_string(const MatcherList *matchers)
break;
}
*cur_str = NULL;
-
+
if (matchers->bool_and)
result = g_strjoinv(" & ", vstr);
else
@@ -2232,15 +2232,15 @@ static void add_str_default(gchar ** dest,
{
gchar quoted_str[4096];
const gchar * str;
-
+
if (s != NULL)
str = s;
else
str = d;
-
+
quote_cmd_argument(quoted_str, sizeof(quoted_str), str);
strcpy(* dest, quoted_str);
-
+
(* dest) += strlen(* dest);
}
@@ -2306,7 +2306,7 @@ gchar *matching_build_command(const gchar *cmd, MsgInfo *info)
case 'F': /* file */
if (filename == NULL)
filename = folder_item_fetch_msg(info->folder, info->msgnum);
-
+
if (filename == NULL) {
g_warning("filename is not set");
return NULL;
@@ -2320,7 +2320,7 @@ gchar *matching_build_command(const gchar *cmd, MsgInfo *info)
}
else s++;
}
-
+
/* as the string can be quoted, we double the result */
size *= 2;
@@ -2388,7 +2388,7 @@ gchar *matching_build_command(const gchar *cmd, MsgInfo *info)
}
}
g_free(filename);
-
+
return processed_cmd;
}
#undef STRLEN_DEFAULT
@@ -2414,7 +2414,7 @@ static int prefs_filtering_write(FILE *fp, GSList *prefs_filtering)
if (NULL == (prop = (FilteringProp *) cur->data))
continue;
-
+
if (NULL == (filtering_str = filteringprop_to_string(prop)))
continue;
@@ -2482,7 +2482,7 @@ static int prefs_filtering_write(FILE *fp, GSList *prefs_filtering)
}
g_free(filtering_str);
}
-
+
return 0;
}
@@ -2544,7 +2544,7 @@ static int prefs_matcher_save(FILE *fp)
{
GList *cur;
NodeLoopData data;
-
+
data.fp = fp;
data.error = FALSE;
@@ -2555,7 +2555,7 @@ static int prefs_matcher_save(FILE *fp)
g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
prefs_matcher_write_func, &data);
}
-
+
if (data.error == TRUE)
return -1;
@@ -2570,7 +2570,7 @@ static int prefs_matcher_save(FILE *fp)
prefs_filtering_write(fp, post_global_processing) < 0 ||
claws_fputc('\n', fp) == EOF)
return -1;
-
+
/* filtering rules */
if (fprintf(fp, "[filtering]\n") < 0 ||
prefs_filtering_write(fp, filtering_rules) < 0 ||
diff --git a/src/mbox.c b/src/mbox.c
@@ -124,12 +124,12 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
dropfolder = folder_get_default_processing(account->account_id);
else
dropfolder = dest;
-
+
do {
FILE *tmp_fp;
gint empty_lines;
gint msgnum;
-
+
if (msgs%10 == 0) {
long cur_offset_mb = ftell(mbox_fp) / (1024 * 1024);
if (printed)
@@ -141,7 +141,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
printed=TRUE;
GTK_EVENTS_FLUSH();
}
-
+
if ((tmp_fp = claws_fopen(tmp_file, "wb")) == NULL) {
FILE_OP_ERROR(tmp_file, "claws_fopen");
g_warning("can't open temporary file");
@@ -194,7 +194,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
/* other line */
/* flush any eaten empty line */
- if (empty_lines > 0) {
+ if (empty_lines > 0) {
while (empty_lines-- > 0) {
FPUTS_TO_TMP_ABORT_IF_FAIL("\n");
}
@@ -215,7 +215,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
/* more emails to expect? */
more = !claws_feof(mbox_fp);
- /* warn if email part is empty (it's the minimum check
+ /* warn if email part is empty (it's the minimum check
we can do */
if (lines == 0) {
g_warning("malformed mbox: %s: message %d is empty", mbox, msgs);
@@ -246,10 +246,10 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
} else {
MsgFileInfo *finfo = g_new0(MsgFileInfo, 1);
finfo->file = tmp_file;
-
+
to_add = g_slist_prepend(to_add, finfo);
tmp_file = get_tmp_file();
-
+
/* flush every 500 */
if (msgs > 0 && msgs % 500 == 0) {
folder_item_add_msgs(dropfolder, to_add, TRUE);
@@ -268,7 +268,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
if (apply_filter) {
folder_item_set_batch(dropfolder, FALSE);
- procmsg_msglist_filter(to_filter, account,
+ procmsg_msglist_filter(to_filter, account,
&filtered, &unfiltered, TRUE);
folder_item_set_batch(dropfolder, TRUE);
@@ -297,7 +297,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
}
folder_item_update_thaw();
-
+
g_free(tmp_file);
claws_fclose(mbox_fp);
debug_print("%d messages found.\n", msgs);
@@ -373,7 +373,7 @@ gint lock_mbox(const gchar *base, LockType type)
FILE_OP_ERROR(base, "open");
return -1;
}
-
+
#if HAVE_FCNTL_H && !defined(G_OS_WIN32)
if (fcntl(lockfd, F_SETLK, &fl) == -1) {
g_warning("can't fnctl %s (%s)", base, g_strerror(errno));
@@ -585,7 +585,7 @@ gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
}
buf[0] = '\0';
-
+
/* write email to mboxrc */
while (claws_fgets(buf, sizeof(buf), msg_fp) != NULL) {
/* quote any From, >From, >>From, etc., according to mbox format specs */
@@ -651,7 +651,7 @@ gint export_to_mbox(FolderItem *src, const gchar *mbox)
{
GSList *mlist;
gint ret;
-
+
cm_return_val_if_fail(src != NULL, -1);
cm_return_val_if_fail(src->folder != NULL, -1);
cm_return_val_if_fail(mbox != NULL, -1);
diff --git a/src/message_search.c b/src/message_search.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/mh.c b/src/mh.c
@@ -82,16 +82,16 @@ static gint mh_add_msgs (Folder *folder,
static gint mh_copy_msg (Folder *folder,
FolderItem *dest,
MsgInfo *msginfo);
-static gint mh_copy_msgs (Folder *folder,
- FolderItem *dest,
- MsgInfoList *msglist,
+static gint mh_copy_msgs (Folder *folder,
+ FolderItem *dest,
+ MsgInfoList *msglist,
GHashTable *relation);
static gint mh_remove_msg (Folder *folder,
FolderItem *item,
gint num);
-static gint mh_remove_msgs (Folder *folder,
- FolderItem *item,
- MsgInfoList *msglist,
+static gint mh_remove_msgs (Folder *folder,
+ FolderItem *item,
+ MsgInfoList *msglist,
GHashTable *relation);
static gint mh_remove_all_msg (Folder *folder,
FolderItem *item);
@@ -100,8 +100,8 @@ static gboolean mh_is_msg_changed (Folder *folder,
MsgInfo *msginfo);
static gint mh_get_num_list (Folder *folder,
- FolderItem *item,
- GSList **list,
+ FolderItem *item,
+ GSList **list,
gboolean *old_uids_valid);
static gint mh_scan_tree (Folder *folder);
@@ -126,7 +126,7 @@ static void mh_scan_tree_recursive (FolderItem *item);
static gboolean mh_rename_folder_func (GNode *node,
gpointer data);
-static gchar *mh_item_get_path (Folder *folder,
+static gchar *mh_item_get_path (Folder *folder,
FolderItem *item);
static gboolean mh_scan_required (Folder *folder,
@@ -150,7 +150,7 @@ FolderClass *mh_get_class(void)
mh_class.idstr = "mh";
mh_class.uistr = "MH";
mh_class.supports_server_search = FALSE;
-
+
/* Folder functions */
mh_class.new_folder = mh_folder_new;
mh_class.destroy_folder = mh_folder_destroy;
@@ -411,11 +411,11 @@ static gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file, MsgF
ret = mh_add_msgs(folder, dest, &file_list, NULL);
return ret;
-}
-
-static gint mh_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
+}
+
+static gint mh_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
GHashTable *relation)
-{
+{
gchar *destfile;
GSList *cur;
MsgFileInfo *fileinfo;
@@ -474,10 +474,10 @@ static gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
msglist.data = msginfo;
msglist.next = NULL;
- return mh_copy_msgs(folder, dest, &msglist, NULL);
+ return mh_copy_msgs(folder, dest, &msglist, NULL);
}
-static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
+static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
GHashTable *relation)
{
gboolean dest_need_scan = FALSE;
@@ -496,7 +496,7 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
cm_return_val_if_fail(dest != NULL, -1);
cm_return_val_if_fail(msglist != NULL, -1);
-
+
msginfo = (MsgInfo *)msglist->data;
cm_return_val_if_fail(msginfo != NULL, -1);
@@ -508,7 +508,7 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
if (msginfo->folder->folder != dest->folder)
full_fetch = TRUE;
-
+
if (FOLDER_TYPE(msginfo->folder->folder) == F_MH) {
src = msginfo->folder;
}
@@ -543,8 +543,8 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
goto err_reset_status;
}
if (!full_fetch) {
- srcfile = g_strconcat(srcpath,
- G_DIR_SEPARATOR_S,
+ srcfile = g_strconcat(srcpath,
+ G_DIR_SEPARATOR_S,
itos(msginfo->msgnum), NULL);
} else {
srcfile = procmsg_get_message_file(msginfo);
@@ -589,7 +589,7 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
g_free(srcfile);
g_free(destfile);
goto err_reset_status;
- }
+ }
if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
if (chmod(destfile, prefs->folder_chmod) < 0)
FILE_OP_ERROR(destfile, "chmod");
@@ -597,7 +597,7 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
if (relation) {
if (g_hash_table_lookup(relation, msginfo) != NULL)
g_warning("already in: %p", msginfo);
-
+
g_hash_table_insert(relation, msginfo, GINT_TO_POINTER(dest->last_num+1));
}
g_free(srcfile);
@@ -661,7 +661,7 @@ static gint mh_remove_msg(Folder *folder, FolderItem *item, gint num)
return 0;
}
-static gint mh_remove_msgs(Folder *folder, FolderItem *item,
+static gint mh_remove_msgs(Folder *folder, FolderItem *item,
MsgInfoList *msglist, GHashTable *relation)
{
gboolean need_scan = FALSE;
@@ -673,7 +673,7 @@ static gint mh_remove_msgs(Folder *folder, FolderItem *item,
cm_return_val_if_fail(item != NULL, -1);
path = folder_item_get_path(item);
-
+
need_scan = mh_scan_required(folder, item);
last_mtime = item->mtime;
@@ -700,12 +700,12 @@ static gint mh_remove_msgs(Folder *folder, FolderItem *item,
file = g_strconcat(path, G_DIR_SEPARATOR_S, itos(msginfo->msgnum), NULL);
if (file == NULL)
continue;
-
+
if (claws_unlink(file) < 0) {
g_free(file);
continue;
}
-
+
g_free(file);
}
@@ -990,7 +990,7 @@ static FolderItem *mh_create_folder(Folder *folder, FolderItem *parent,
cm_return_val_if_fail(name != NULL, NULL);
path = folder_item_get_path(parent);
- if (!is_dir_exist(path))
+ if (!is_dir_exist(path))
if (make_dir_hier(path) != 0)
return NULL;
@@ -1368,7 +1368,7 @@ static gchar *get_unseen_seq_name(void)
g_free(seq_name);
seq_name = tmp;
}
- return seq_name;
+ return seq_name;
}
static void mh_write_sequences(FolderItem *item, gboolean remove_unseen)
@@ -1382,7 +1382,7 @@ static void mh_write_sequences(FolderItem *item, gboolean remove_unseen)
if (!item)
return;
-
+
path = folder_item_get_path(item);
mh_sequences_old = g_strconcat(path, G_DIR_SEPARATOR_S,
@@ -1398,7 +1398,7 @@ static void mh_write_sequences(FolderItem *item, gboolean remove_unseen)
gint seq_len = 0;
msglist = g_slist_sort(msglist, sort_cache_list_by_msgnum);
cur = msglist;
-
+
/* write the unseen sequence if we don't have to scrap it */
if (!remove_unseen) do {
info = (MsgInfo *)(cur ? cur->data:NULL);
@@ -1415,7 +1415,7 @@ static void mh_write_sequences(FolderItem *item, gboolean remove_unseen)
snprintf(tmp, 31, " %d-%d", start, end);
else
snprintf(tmp, 31, " %d", start);
-
+
tmp_len = strlen(tmp);
sequence = g_realloc(sequence, seq_len+tmp_len+1);
strcpy(sequence+seq_len, tmp);
@@ -1427,11 +1427,11 @@ static void mh_write_sequences(FolderItem *item, gboolean remove_unseen)
cur = cur ? cur->next:NULL;
} while (cur || (start > 0 && end > 0));
if (sequence && *sequence) {
- if (fprintf(mh_sequences_new_fp, "%s%s\n",
+ if (fprintf(mh_sequences_new_fp, "%s%s\n",
get_unseen_seq_name(), sequence) < 0)
err = TRUE;
else
- debug_print("wrote unseen sequence: '%s%s'\n",
+ debug_print("wrote unseen sequence: '%s%s'\n",
get_unseen_seq_name(), sequence);
}
/* rewrite the rest of the file */
@@ -1445,7 +1445,7 @@ static void mh_write_sequences(FolderItem *item, gboolean remove_unseen)
}
claws_fclose(mh_sequences_old_fp);
}
-
+
if (claws_safe_fclose(mh_sequences_new_fp) == EOF)
err = TRUE;
diff --git a/src/mh_gtk.c b/src/mh_gtk.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -50,7 +50,7 @@ static void copy_folder_cb(GtkAction *action, gpointer data);
static void update_tree_cb(GtkAction *action, gpointer data);
static void remove_mailbox_cb(GtkAction *action, gpointer data);
-static GtkActionEntry mh_popup_entries[] =
+static GtkActionEntry mh_popup_entries[] =
{
{"FolderViewPopup/CreateNewFolder", NULL, N_("Create _new folder..."), NULL, NULL, G_CALLBACK(new_folder_cb) },
{"FolderViewPopup/RenameFolder", NULL, N_("_Rename folder..."), NULL, NULL, G_CALLBACK(rename_folder_cb) },
@@ -61,7 +61,7 @@ static GtkActionEntry mh_popup_entries[] =
{"FolderViewPopup/CheckNewFolders", NULL, N_("C_heck for new folders"), NULL, NULL, G_CALLBACK(update_tree_cb) }, /*1*/
{"FolderViewPopup/RebuildTree", NULL, N_("R_ebuild folder tree"), NULL, NULL, G_CALLBACK(update_tree_cb) }, /*2*/
{"FolderViewPopup/RemoveMailbox", NULL, N_("Remove _mailbox..."), NULL, NULL, G_CALLBACK(remove_mailbox_cb) },
-};
+};
static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item);
static void add_menuitems(GtkUIManager *ui_manager, FolderItem *item);
@@ -102,7 +102,7 @@ static void add_menuitems(GtkUIManager *ui_manager, FolderItem *item)
static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
{
- gboolean folder_is_normal =
+ gboolean folder_is_normal =
item != NULL &&
item->stype == F_NORMAL &&
!folder_has_parent_of_type(item, F_OUTBOX) &&
@@ -276,7 +276,7 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
}
old_id = folder_item_get_identifier(item);
-
+
if (folder_item_rename(item, new_folder) < 0) {
alertpanel_error(_("The folder could not be renamed.\n"
"The new folder name is not allowed."));
@@ -311,7 +311,7 @@ static void move_folder_cb(GtkAction *action, gpointer data)
g_free(msg);
if (!to_folder)
return;
-
+
folderview_move_folder(folderview, from_folder, to_folder, 0);
}
@@ -331,7 +331,7 @@ static void copy_folder_cb(GtkAction *action, gpointer data)
g_free(msg);
if (!to_folder)
return;
-
+
folderview_move_folder(folderview, from_folder, to_folder, 1);
}
@@ -376,7 +376,7 @@ static void remove_mailbox_cb(GtkAction *action, gpointer data)
NULL, _("_Cancel"), "list-remove-symbolic", _("_Remove"),
NULL, NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
-
+
g_free(message);
g_free(name);
if (avalue != G_ALERTALTERNATE) return;
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -118,18 +118,18 @@ static void mimeview_view_file (const gchar *filename,
MimeInfo *partinfo,
const gchar *cmd,
MimeView *mimeview);
-static gboolean icon_clicked_cb (GtkWidget *button,
- GdkEventButton *event,
+static gboolean icon_clicked_cb (GtkWidget *button,
+ GdkEventButton *event,
MimeView *mimeview);
-static void icon_selected (MimeView *mimeview,
- gint num,
+static void icon_selected (MimeView *mimeview,
+ gint num,
MimeInfo *partinfo);
-static gint icon_key_pressed (GtkWidget *button,
+static gint icon_key_pressed (GtkWidget *button,
GdkEventKey *event,
MimeView *mimeview);
-static void icon_list_append_icon (MimeView *mimeview,
+static void icon_list_append_icon (MimeView *mimeview,
MimeInfo *mimeinfo);
-static void icon_list_create (MimeView *mimeview,
+static void icon_list_create (MimeView *mimeview,
MimeInfo *mimeinfo);
static void icon_list_clear (MimeView *mimeview);
static void icon_list_toggle_by_mime_info (MimeView *mimeview,
@@ -139,11 +139,11 @@ static void ctree_size_allocate_cb (GtkWidget *widget,
MimeView *mimeview);
static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
MimeView *mimeview);
-static gboolean part_button_pressed (MimeView *mimeview,
- GdkEventButton *event,
+static gboolean part_button_pressed (MimeView *mimeview,
+ GdkEventButton *event,
MimeInfo *partinfo);
-static void icon_scroll_size_allocate_cb(GtkWidget *widget,
- GtkAllocation *layout_size,
+static void icon_scroll_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *layout_size,
MimeView *mimeview);
static MimeInfo *mimeview_get_part_to_use(MimeView *mimeview);
static const gchar *get_part_name(MimeInfo *partinfo);
@@ -191,7 +191,7 @@ static void mimeview_copy_cb(GtkAction *action, gpointer data)
static void mimeview_send_to_cb(GtkAction *action, gpointer data)
{
- MimeView *mimeview = (MimeView *)data;
+ MimeView *mimeview = (MimeView *)data;
mimeview_send_to(mimeview, mimeview_get_part_to_use(mimeview));
}
@@ -318,7 +318,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
-
+
model = gtk_tree_store_new(N_MIMEVIEW_COLS,
G_TYPE_STRING,
G_TYPE_STRING,
@@ -336,7 +336,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
-1, titles[COL_MIMETYPE],renderer,
"text", COL_MIMETYPE, NULL);
column = gtk_tree_view_get_column(GTK_TREE_VIEW(ctree), cols-1);
-
+
renderer = gtk_cell_renderer_text_new();
gtk_cell_renderer_set_alignment(renderer, 1, 0.5);
cols = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ctree),
@@ -344,7 +344,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
"text", COL_SIZE, NULL);
column = gtk_tree_view_get_column(GTK_TREE_VIEW(ctree), cols-1);
gtk_tree_view_column_set_alignment(GTK_TREE_VIEW_COLUMN(column), 1);
-
+
renderer = gtk_cell_renderer_text_new();
cols = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ctree),
-1, titles[COL_NAME], renderer,
@@ -357,7 +357,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
gtk_widget_show(ctree);
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
- gtk_drag_source_set(ctree, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
+ gtk_drag_source_set(ctree, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
mimeview_mime_types, 1, GDK_ACTION_COPY);
g_signal_connect(G_OBJECT(selection), "changed",
@@ -406,7 +406,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
arrow = gtk_image_new_from_icon_name("pan-start-symbolic", GTK_ICON_SIZE_MENU);
gtk_widget_show(arrow);
gtk_container_add(GTK_CONTAINER(mime_toggle), arrow);
- g_signal_connect(G_OBJECT(mime_toggle), "button_release_event",
+ g_signal_connect(G_OBJECT(mime_toggle), "button_release_event",
G_CALLBACK(mime_toggle_button_cb), mimeview);
icon_mainbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
@@ -416,13 +416,13 @@ MimeView *mimeview_create(MainWindow *mainwin)
gtk_box_pack_start(GTK_BOX(icon_mainbox), mime_toggle, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(icon_mainbox), icon_scroll, TRUE, TRUE, 3);
gtk_box_pack_end(GTK_BOX(icon_mainbox), scrollbutton, FALSE, FALSE, 0);
- g_signal_connect(G_OBJECT(icon_mainbox), "size_allocate",
+ g_signal_connect(G_OBJECT(icon_mainbox), "size_allocate",
G_CALLBACK(icon_scroll_size_allocate_cb), mimeview);
-
- ctree_mainbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+
+ ctree_mainbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_name(GTK_WIDGET(ctree_mainbox), "mimeview_ctree_mainbox");
gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
- g_signal_connect(G_OBJECT(ctree_mainbox), "size_allocate",
+ g_signal_connect(G_OBJECT(ctree_mainbox), "size_allocate",
G_CALLBACK(ctree_size_allocate_cb), mimeview);
mimeview->ui_manager = gtk_ui_manager_new();
@@ -431,38 +431,38 @@ MimeView *mimeview_create(MainWindow *mainwin)
G_N_ELEMENTS(mimeview_menu_actions), (gpointer)mimeview);
MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, "/", "Menus", "Menus", GTK_UI_MANAGER_MENUBAR)
- MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/", "MimeView", "MimeView", GTK_UI_MANAGER_MENU);
- MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "Open", "MimeView/Open",
GTK_UI_MANAGER_MENUITEM);
#if (!defined G_OS_WIN32)
- MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "OpenWith", "MimeView/OpenWith",
GTK_UI_MANAGER_MENUITEM);
#endif
- MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "Copy", "MimeView/Copy",
GTK_UI_MANAGER_MENUITEM);
MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "SendTo", "MimeView/SendTo",
GTK_UI_MANAGER_MENUITEM);
- MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "DisplayAsText", "MimeView/DisplayAsText",
GTK_UI_MANAGER_MENUITEM);
- MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "SaveAs", "MimeView/SaveAs",
GTK_UI_MANAGER_MENUITEM);
- MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "SaveAll", "MimeView/SaveAll",
GTK_UI_MANAGER_MENUITEM);
- MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "SaveAllAttachments", "MimeView/SaveAllAttachments",
GTK_UI_MANAGER_MENUITEM);
- MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "NextPart", "MimeView/NextPart",
GTK_UI_MANAGER_MENUITEM);
- MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "PrevPart", "MimeView/PrevPart",
GTK_UI_MANAGER_MENUITEM);
@@ -483,7 +483,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
gtk_widget_show(paned);
gtk_paned_pack1(GTK_PANED(paned), ctree_mainbox, FALSE, TRUE);
gtk_paned_pack2(GTK_PANED(paned), vbox, TRUE, TRUE);
-
+
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_name(GTK_WIDGET(hbox), "mimeview");
gtk_box_pack_start(GTK_BOX(hbox), paned, TRUE, TRUE, 0);
@@ -508,8 +508,8 @@ MimeView *mimeview_create(MainWindow *mainwin)
mimeview->siginfoview = siginfoview;
mimeview->scrollbutton = scrollbutton;
mimeview->arrow = arrow;
- mimeview->target_list = gtk_target_list_new(mimeview_mime_types, 1);
-
+ mimeview->target_list = gtk_target_list_new(mimeview_mime_types, 1);
+
mimeviews = g_slist_prepend(mimeviews, mimeview);
return mimeview;
@@ -552,7 +552,7 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
mimeview);
/* check if the mail's signed - it can change the mail structure */
-
+
if (any_part_is_signed(mimeinfo))
debug_print("signed mail\n");
@@ -560,7 +560,7 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
gtk_tree_view_expand_all(ctree);
icon_list_clear(mimeview);
icon_list_create(mimeview, mimeinfo);
-
+
g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
mimeview_selected, mimeview);
}
@@ -576,7 +576,7 @@ static void mimeview_free_mimeinfo(MimeView *mimeview)
void mimeview_destroy(MimeView *mimeview)
{
GSList *cur;
-
+
for (cur = mimeview->viewers; cur != NULL; cur = g_slist_next(cur)) {
MimeViewer *viewer = (MimeViewer *) cur->data;
viewer->destroy_viewer(viewer);
@@ -611,7 +611,7 @@ MimeInfo *mimeview_get_node_part(MimeView *mimeview, GtkTreePath *path)
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(mimeview->ctree));
GtkTreeIter iter;
MimeInfo *partinfo;
-
+
gtk_tree_model_get_iter(model, &iter, path);
gtk_tree_model_get(model, &iter, COL_DATA, &partinfo, -1);
return partinfo;
@@ -628,16 +628,16 @@ static gboolean mimeview_tree_next(GtkTreeModel *model, GtkTreePath *path)
{
GtkTreeIter iter, parent;
gboolean has_parent;
-
+
gtk_tree_model_get_iter(model, &iter, path);
-
+
if (gtk_tree_model_iter_has_child(model, &iter)) {
gtk_tree_path_down(path);
return TRUE;
}
has_parent = gtk_tree_model_iter_parent(model, &parent, &iter);
-
+
if (!gtk_tree_model_iter_next(model, &iter)) {
while (has_parent) {
GtkTreeIter saved_parent = parent;
@@ -649,7 +649,7 @@ static gboolean mimeview_tree_next(GtkTreeModel *model, GtkTreePath *path)
has_parent = gtk_tree_model_iter_parent(model, &parent, &saved_parent);
}
}
-
+
} else {
gtk_tree_path_next(path);
return TRUE;
@@ -664,19 +664,19 @@ static gboolean mimeview_tree_prev(MimeView *mimeview, GtkTreePath *path)
GtkTreeIter iter, child, parent;
gboolean has_parent;
- gtk_tree_model_get_iter(model, &iter, path);
+ gtk_tree_model_get_iter(model, &iter, path);
has_parent = gtk_tree_model_iter_parent(model, &parent, &iter);
if (gtk_tree_path_prev(path)) {
gtk_tree_model_get_iter(model, &iter, path);
-
+
if (gtk_tree_model_iter_nth_child(model, &child, &iter, 0)) {
gtk_tree_path_down(path);
-
+
while (gtk_tree_model_iter_next(model, &child))
gtk_tree_path_next(path);
}
-
+
return TRUE;
}
@@ -698,7 +698,7 @@ gint mimeview_get_selected_part_num(MimeView *mimeview)
if (!gtk_tree_model_get_iter_first(model, &iter))
return -1;
path = gtk_tree_model_get_path(model, &iter);
-
+
do {
if (!gtk_tree_path_compare(mimeview->opened, path)) {
gtk_tree_path_free(path);
@@ -720,14 +720,14 @@ void mimeview_select_part_num(MimeView *mimeview, gint i)
GtkTreePath *path;
GtkTreeSelection *selection;
gint x = 0;
-
+
if (i < 0)
return;
-
+
if (!gtk_tree_model_get_iter_first(model, &iter))
return;
path = gtk_tree_model_get_path(model, &iter);
-
+
while (x != i) {
if (!mimeview_tree_next(model, path)) {
gtk_tree_path_free(path);
@@ -735,7 +735,7 @@ void mimeview_select_part_num(MimeView *mimeview, gint i)
}
x++;
}
-
+
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(mimeview->ctree));
gtk_tree_selection_select_path(selection, path);
gtk_tree_path_free(path);
@@ -778,9 +778,9 @@ static void mimeview_set_multipart_tree(MimeView *mimeview,
g_free(name);
if (mimeinfo->node->children)
- mimeview_set_multipart_tree(mimeview,
+ mimeview_set_multipart_tree(mimeview,
(MimeInfo *) mimeinfo->node->children->data, &iter);
- mimeinfo = mimeinfo->node->next != NULL ?
+ mimeinfo = mimeinfo->node->next != NULL ?
(MimeInfo *) mimeinfo->node->next->data : NULL;
}
}
@@ -850,7 +850,7 @@ static MimeViewer *get_viewer_for_content_type(MimeView *mimeview, const gchar *
gchar *real_contenttype = NULL, *tmp;
real_contenttype = g_utf8_strdown((gchar *)content_type, -1);
-
+
for (cur = mimeviewer_factories; cur != NULL; cur = g_slist_next(cur)) {
MimeViewerFactory *curfactory = cur->data;
gint i = 0;
@@ -875,14 +875,14 @@ static MimeViewer *get_viewer_for_content_type(MimeView *mimeview, const gchar *
for (cur = mimeview->viewers; cur != NULL; cur = g_slist_next(cur)) {
MimeViewer *curviewer = cur->data;
-
+
if (curviewer->factory == factory)
return curviewer;
}
viewer = factory->create_viewer();
gtk_container_add(GTK_CONTAINER(mimeview->mime_notebook),
GTK_WIDGET(viewer->get_widget(viewer)));
-
+
mimeview->viewers = g_slist_append(mimeview->viewers, viewer);
return viewer;
@@ -922,7 +922,7 @@ static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinf
gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
{
MimeViewer *viewer;
-
+
if (mimeview->messageview->partial_display_shown) {
noticeview_hide(mimeview->messageview->noticeview);
mimeview->messageview->partial_display_shown = FALSE;
@@ -953,23 +953,23 @@ static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
{
TextView *textview = mimeview->textview;
GtkWidget *focused = NULL;
-
+
if (mainwindow_get_mainwindow())
focused = gtkut_get_focused_child(
GTK_CONTAINER(mainwindow_get_mainwindow()->window));
- if ((mimeview->type != MIMEVIEW_VIEWER) &&
+ if ((mimeview->type != MIMEVIEW_VIEWER) &&
(mimeview->type == type)) return;
switch (type) {
case MIMEVIEW_TEXT:
gtk_notebook_set_current_page(GTK_NOTEBOOK(mimeview->mime_notebook),
- gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook),
+ gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook),
GTK_WIDGET_PTR(textview)));
break;
case MIMEVIEW_VIEWER:
gtk_notebook_set_current_page(GTK_NOTEBOOK(mimeview->mime_notebook),
- gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook),
+ gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook),
GTK_WIDGET(mimeview->mimeviewer->get_widget(mimeview->mimeviewer))));
break;
default:
@@ -983,13 +983,13 @@ static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
void mimeview_clear(MimeView *mimeview)
{
GtkTreeModel *model;
-
+
if (!mimeview)
return;
if (g_slist_find(mimeviews, mimeview) == NULL)
return;
-
+
if (mimeview->sig_check_timeout_tag != 0) {
g_source_remove(mimeview->sig_check_timeout_tag);
mimeview->sig_check_timeout_tag = 0;
@@ -1046,7 +1046,7 @@ static void update_signature_noticeview(MimeView *mimeview, gboolean special, Si
void *func = NULL;
StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
SignatureStatus mycode = SIGNATURE_UNCHECKED;
-
+
if (mimeview == NULL || mimeview->siginfo == NULL)
g_error("bad call to update noticeview");
@@ -1231,7 +1231,7 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
MimeView *mimeview = (MimeView *) user_data;
MimeInfo *mimeinfo = mimeview->siginfo;
gint ret;
-
+
if (mimeinfo == NULL || !noticeview_is_visible(mimeview->siginfoview))
return;
@@ -1268,7 +1268,7 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
void mimeview_check_signature(MimeView *mimeview)
{
- check_signature_cb(NULL, mimeview);
+ check_signature_cb(NULL, mimeview);
}
static void redisplay_email(GtkWidget *widget, gpointer user_data)
@@ -1297,11 +1297,11 @@ static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
{
MimeInfo *siginfo;
MimeInfo *first_text;
-
+
cm_return_if_fail(mimeview != NULL);
cm_return_if_fail(selected != NULL);
-
- if (selected->type == MIMETYPE_MESSAGE
+
+ if (selected->type == MIMETYPE_MESSAGE
&& !g_ascii_strcasecmp(selected->subtype, "rfc822")) {
/* if the first text part is signed, check that */
first_text = selected;
@@ -1311,7 +1311,7 @@ static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
if (first_text) {
update_signature_info(mimeview, first_text);
return;
- }
+ }
}
siginfo = selected;
@@ -1332,7 +1332,7 @@ static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
noticeview_hide(mimeview->siginfoview);
return;
}
-
+
update_signature_noticeview(mimeview, FALSE, 0);
noticeview_show(mimeview->siginfoview);
}
@@ -1367,7 +1367,7 @@ static void mimeview_selected(GtkTreeSelection *selection, MimeView *mimeview)
gtk_tree_path_free(path);
return;
}
-
+
gtk_tree_path_free(mimeview->opened);
mimeview->opened = path;
mimeview->spec_part = NULL;
@@ -1385,7 +1385,7 @@ static void mimeview_selected(GtkTreeSelection *selection, MimeView *mimeview)
if (gdk_display_device_is_grabbed(display, device))
gdk_seat_ungrab(seat);
}
-
+
mimeview->textview->default_text = FALSE;
update_signature_info(mimeview, partinfo);
@@ -1396,7 +1396,7 @@ static void mimeview_selected(GtkTreeSelection *selection, MimeView *mimeview)
case MIMETYPE_MESSAGE:
case MIMETYPE_MULTIPART:
mimeview_show_message_part(mimeview, partinfo);
-
+
break;
default:
mimeview->textview->default_text = TRUE;
@@ -1428,7 +1428,7 @@ static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
return FALSE;
-
+
gtk_tree_selection_select_iter(selection, &iter);
}
part_button_pressed(mimeview, event, mimeview_get_selected_part(mimeview));
@@ -1461,7 +1461,7 @@ static gboolean mimeview_scrolled(GtkWidget *widget, GdkEventScroll *event,
return TRUE;
}
-static gboolean part_button_pressed(MimeView *mimeview, GdkEventButton *event,
+static gboolean part_button_pressed(MimeView *mimeview, GdkEventButton *event,
MimeInfo *partinfo)
{
static MimeInfo *lastinfo;
@@ -1529,7 +1529,7 @@ void mimeview_select_next_part(MimeView *mimeview)
GtkTreePath *path;
MimeInfo *partinfo = NULL;
gboolean has_next;
-
+
if (!mimeview->opened) return;
gtk_tree_model_get_iter(model, &iter, mimeview->opened);
@@ -1551,7 +1551,7 @@ skip:
gtk_tree_selection_select_path(selection, path);
icon_list_toggle_by_mime_info(mimeview, partinfo);
}
-
+
gtk_tree_path_free(path);
}
@@ -1564,7 +1564,7 @@ void mimeview_select_prev_part(MimeView *mimeview)
GtkTreePath *path;
MimeInfo *partinfo = NULL;
gboolean has_prev;
-
+
if (!mimeview->opened) return;
gtk_tree_model_get_iter(model, &iter, mimeview->opened);
@@ -1585,7 +1585,7 @@ skip:
gtk_tree_selection_select_path(selection, path);
icon_list_toggle_by_mime_info(mimeview, partinfo);
}
-
+
gtk_tree_path_free(path);
}
@@ -1601,10 +1601,10 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
if (!mimeview->opened) return FALSE;
summaryview = mimeview->messageview->mainwin->summaryview;
-
+
if (summaryview && quicksearch_has_focus(summaryview->quicksearch))
return FALSE;
-
+
switch (event->keyval) {
case GDK_KEY_Home:
case GDK_KEY_End:
@@ -1616,7 +1616,7 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
if (mimeview_scroll_page(mimeview,
(event->state & GDK_SHIFT_MASK) != 0))
return TRUE;
-
+
if (!(event->state & GDK_SHIFT_MASK))
mimeview_select_next_part(mimeview);
return TRUE;
@@ -1668,7 +1668,7 @@ static void mimeview_drag_data_get(GtkWidget *widget,
return;
}
}
- } else if (partinfo->type == MIMETYPE_MESSAGE
+ } else if (partinfo->type == MIMETYPE_MESSAGE
&& !g_ascii_strcasecmp(partinfo->subtype, "rfc822")) {
gchar *name = NULL;
GPtrArray *headers = NULL;
@@ -1740,14 +1740,14 @@ check_new_file:
if ((err = procmime_get_part(filename, partinfo)) < 0)
alertpanel_error
- (_("Couldn't save the part of multipart message: %s"),
+ (_("Couldn't save the part of multipart message: %s"),
g_strerror(-err));
tmp = g_filename_to_uri(filename, NULL, NULL);
uriname = g_strconcat(tmp, "\r\n", NULL);
g_free(tmp);
- gtk_selection_data_set(selection_data,
+ gtk_selection_data_set(selection_data,
gtk_selection_data_get_target(selection_data), 8,
(guchar *)uriname, strlen(uriname));
@@ -1779,7 +1779,7 @@ static gchar *mimeview_get_filename_for_part(MimeInfo *partinfo,
g_free(filename);
filename = tmp;
}
-
+
subst_for_filename(filename);
fullname = g_strconcat
@@ -1813,12 +1813,12 @@ static gint mimeview_write_part(const gchar *filename,
AlertValue aval;
gchar *res;
gchar *tmp;
-
+
if (!g_utf8_validate(filename, -1, NULL))
tmp = conv_filename_to_utf8(filename);
- else
+ else
tmp = g_strdup(filename);
-
+
res = g_strdup_printf(_("Overwrite existing file '%s'?"),
tmp);
g_free(tmp);
@@ -1993,9 +1993,9 @@ static MimeInfo *mimeview_get_part_to_use(MimeView *mimeview)
"pop_partinfo");
g_object_set_data(G_OBJECT(mimeview->popupmenu),
"pop_partinfo", NULL);
- if (!partinfo) {
+ if (!partinfo) {
partinfo = mimeview_get_selected_part(mimeview);
- }
+ }
}
return partinfo;
@@ -2018,12 +2018,12 @@ void mimeview_save_as(MimeView *mimeview)
partinfo = mimeview_get_part_to_use(mimeview);
cm_return_if_fail(partinfo != NULL);
-
+
if (get_part_name(partinfo) == NULL) {
return;
}
partname = g_strdup(get_part_name(partinfo));
-
+
if (!g_utf8_validate(partname, -1, NULL)) {
gchar *tmp = conv_filename_to_utf8(partname);
if (!tmp) {
@@ -2038,7 +2038,7 @@ void mimeview_save_as(MimeView *mimeview)
}
subst_for_filename(partname);
-
+
if (prefs_common.attach_save_dir && *prefs_common.attach_save_dir)
filepath = g_strconcat(prefs_common.attach_save_dir,
G_DIR_SEPARATOR_S, partname, NULL);
@@ -2095,7 +2095,7 @@ void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
if ((err = procmime_get_part(filename, partinfo)) < 0)
alertpanel_error
- (_("Couldn't save the part of multipart message: %s"),
+ (_("Couldn't save the part of multipart message: %s"),
g_strerror(-err));
else
mimeview_view_file(filename, partinfo, NULL, mimeview);
@@ -2131,12 +2131,12 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
if ((err = procmime_get_part(filename, partinfo)) < 0) {
alertpanel_error
- (_("Couldn't save the part of multipart message: %s"),
+ (_("Couldn't save the part of multipart message: %s"),
g_strerror(-err));
g_free(filename);
return;
}
-
+
if (!prefs_common.mime_open_cmd_history)
prefs_common.mime_open_cmd_history =
add_history(NULL, prefs_common.mime_open_cmd);
@@ -2145,12 +2145,12 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
(!g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))) {
/* guess content-type from filename */
content_type = procmime_get_mime_type(filename);
- }
+ }
if (content_type == NULL) {
content_type = procmime_get_content_type_str(partinfo->type,
partinfo->subtype);
}
-
+
if ((partinfo->type == MIMETYPE_TEXT && !strcmp(partinfo->subtype, "html"))
&& prefs_common_get_uri_cmd() && prefs_common.uri_cmd[0]) {
mime_command = g_strdup(prefs_common_get_uri_cmd());
@@ -2173,7 +2173,7 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
if (mime_command == NULL)
automatic = FALSE;
-
+
if (!automatic) {
gboolean remember = FALSE;
if (content_type != NULL)
@@ -2233,9 +2233,9 @@ static void mimeview_send_to(MimeView *mimeview, MimeInfo *partinfo)
ainfo->charset = g_strdup(procmime_mimeinfo_get_parameter(
partinfo, "charset"));
attach_file = g_list_append(attach_file, ainfo);
-
+
compose_new(NULL, NULL, attach_file);
-
+
g_free(ainfo->name);
g_free(ainfo->content_type);
g_free(ainfo->charset);
@@ -2243,7 +2243,7 @@ static void mimeview_send_to(MimeView *mimeview, MimeInfo *partinfo)
g_list_free(attach_file);
} else
alertpanel_error
- (_("Couldn't save the part of multipart message: %s"),
+ (_("Couldn't save the part of multipart message: %s"),
g_strerror(-err));
g_free(filename);
}
@@ -2290,7 +2290,7 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
}
if ((SHGetFileInfo((LPCWSTR)fn16, 0, &file_info, sizeof(SHFILEINFO), SHGFI_EXETYPE)) != 0) {
- AlertValue val = alertpanel_full(_("Execute untrusted binary?"),
+ AlertValue val = alertpanel_full(_("Execute untrusted binary?"),
_("This attachment is an executable file. Executing "
"untrusted binaries is dangerous and could compromise "
"your computer.\n\n"
@@ -2306,7 +2306,7 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
}
g_free(fn16);
-
+
#endif
}
@@ -2326,7 +2326,7 @@ void mimeview_unregister_viewer_factory(MimeViewerFactory *factory)
for (mimeview_list = mimeviews; mimeview_list != NULL; mimeview_list = g_slist_next(mimeview_list)) {
MimeView *mimeview = (MimeView *) mimeview_list->data;
-
+
if (mimeview->mimeviewer && mimeview->mimeviewer->factory == factory) {
mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
mimeview->mimeviewer = NULL;
@@ -2367,11 +2367,11 @@ static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
GtkTreeIter iter;
GtkTreePath *path;
MimeInfo *curr = NULL;
-
+
if (!gtk_tree_model_get_iter_first(model, &iter))
return;
path = gtk_tree_model_get_path(model, &iter);
-
+
do {
gtk_tree_model_get_iter(model, &iter, path);
gtk_tree_model_get(model, &iter, COL_DATA, &curr, -1);
@@ -2383,9 +2383,9 @@ static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
return;
}
} while (mimeview_tree_next(model, path));
-
+
gtk_tree_path_free(path);
-}
+}
void mimeview_select_mimepart_icon(MimeView *mimeview, MimeInfo *partinfo)
{
@@ -2397,7 +2397,7 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
MimeView *mimeview)
{
SummaryView *summaryview;
-
+
if (!event) return FALSE;
switch (event->keyval) {
@@ -2424,7 +2424,7 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
case GDK_KEY_t:
BREAK_ON_MODIFIER_KEY();
mimeview_display_as_text(mimeview);
- return TRUE;
+ return TRUE;
case GDK_KEY_l:
BREAK_ON_MODIFIER_KEY();
mimeview_launch(mimeview, NULL);
@@ -2493,13 +2493,13 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
G_CALLBACK(mimeview_enter_notify), mimeview);
gtk_container_set_border_width(GTK_CONTAINER(button), 2);
- g_object_set_data(G_OBJECT(button), "icon_number",
+ g_object_set_data(G_OBJECT(button), "icon_number",
GINT_TO_POINTER(mimeview->icon_count));
- g_object_set_data(G_OBJECT(button), "partinfo",
+ g_object_set_data(G_OBJECT(button), "partinfo",
mimeinfo);
switch (mimeinfo->type) {
-
+
case MIMETYPE_TEXT:
if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "html"))
stockp = STOCK_PIXMAP_MIME_TEXT_HTML;
@@ -2538,7 +2538,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
stockp = STOCK_PIXMAP_MIME_UNKNOWN;
break;
}
-
+
partinfo = mimeinfo;
while (partinfo != NULL) {
if (privacy_mimeinfo_is_signed(partinfo)) {
@@ -2550,7 +2550,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
break;
}
partinfo = procmime_mimeinfo_parent(partinfo);
- }
+ }
if (siginfo != NULL) {
switch (privacy_mimeinfo_get_sig_status(siginfo)) {
@@ -2578,7 +2578,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
sigshort = privacy_mimeinfo_get_sig_info(siginfo, FALSE);
} else if (encrypted != NULL) {
pixmap = stock_pixmap_widget_with_overlay(stockp,
- STOCK_PIXMAP_PRIVACY_EMBLEM_ENCRYPTED, OVERLAY_BOTTOM_RIGHT, 6, 3);
+ STOCK_PIXMAP_PRIVACY_EMBLEM_ENCRYPTED, OVERLAY_BOTTOM_RIGHT, 6, 3);
} else {
pixmap = stock_pixmap_widget_with_overlay(stockp, 0,
OVERLAY_NONE, 6, 3);
@@ -2606,7 +2606,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
tmp = g_strdup(desc);
}
escaped = g_markup_escape_text(tmp,-1);
-
+
tiptmp = g_strconcat(tip, "\n<b>",
prefs_common.attach_desc && mimeinfo->description ?
_("Description:") : _("Filename:"),
@@ -2664,7 +2664,7 @@ static void icon_list_clear (MimeView *mimeview)
*
*\return true if the icon 'number' exists and was selected.
*/
-static void icon_scroll_size_allocate_cb(GtkWidget *widget,
+static void icon_scroll_size_allocate_cb(GtkWidget *widget,
GtkAllocation *size, MimeView *mimeview)
{
GtkAllocation grid_size;
@@ -2677,10 +2677,10 @@ static void icon_scroll_size_allocate_cb(GtkWidget *widget,
gtk_widget_get_allocation(mimeview->icon_grid, &grid_size);
gtk_widget_get_allocation(mimeview->icon_scroll, &layout_size);
-
+
gtk_layout_get_size(GTK_LAYOUT(mimeview->icon_scroll), &width, &height);
- gtk_layout_set_size(GTK_LAYOUT(mimeview->icon_scroll),
- MIN(grid_size.width, layout_size.width),
+ gtk_layout_set_size(GTK_LAYOUT(mimeview->icon_scroll),
+ MIN(grid_size.width, layout_size.width),
MAX(grid_size.height, layout_size.height));
gtk_adjustment_set_step_increment(adj, 10);
}
@@ -2695,15 +2695,15 @@ static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
if (mimeinfo->type != MIMETYPE_MULTIPART)
icon_list_append_icon(mimeview, mimeinfo);
if (mimeinfo->node->children != NULL)
- icon_list_create(mimeview,
+ icon_list_create(mimeview,
(MimeInfo *) mimeinfo->node->children->data);
- mimeinfo = mimeinfo->node->next != NULL
- ? (MimeInfo *) mimeinfo->node->next->data
+ mimeinfo = mimeinfo->node->next != NULL
+ ? (MimeInfo *) mimeinfo->node->next->data
: NULL;
}
gtk_widget_get_preferred_width(mimeview->icon_mainbox, &min_width, &width);
if (min_width < width) {
- gtk_widget_set_size_request(mimeview->icon_mainbox,
+ gtk_widget_set_size_request(mimeview->icon_mainbox,
min_width, -1);
}
if (mimeview->opened)
@@ -2715,7 +2715,7 @@ static void icon_list_toggle_by_mime_info (MimeView *mimeview,
MimeInfo *mimeinfo)
{
GList *children, *child;
-
+
children = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_grid));
for (child = children; child != NULL; child = g_list_next(child)) {
gboolean *highlight = NULL;
@@ -2742,7 +2742,7 @@ static void ctree_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation,
static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
MimeView *mimeview)
{
- g_object_ref(button);
+ g_object_ref(button);
mimeview_leave_notify(button, NULL, NULL);
@@ -2755,9 +2755,9 @@ static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
gtk_paned_set_position(GTK_PANED(mimeview->paned),
prefs_common.mimeview_tree_height);
- gtk_container_remove(GTK_CONTAINER(mimeview->icon_mainbox),
+ gtk_container_remove(GTK_CONTAINER(mimeview->icon_mainbox),
button);
- gtk_box_pack_end(GTK_BOX(mimeview->ctree_mainbox),
+ gtk_box_pack_end(GTK_BOX(mimeview->ctree_mainbox),
button, FALSE, FALSE, 0);
} else {
gtk_image_set_from_icon_name(GTK_IMAGE(mimeview->arrow),
@@ -2766,9 +2766,9 @@ static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
gtk_widget_show(mimeview->icon_mainbox);
gtk_paned_set_position(GTK_PANED(mimeview->paned), 0);
- gtk_container_remove(GTK_CONTAINER(mimeview->ctree_mainbox),
+ gtk_container_remove(GTK_CONTAINER(mimeview->ctree_mainbox),
button);
- gtk_box_pack_start(GTK_BOX(mimeview->icon_mainbox),
+ gtk_box_pack_start(GTK_BOX(mimeview->icon_mainbox),
button, FALSE, FALSE, 0);
gtk_box_reorder_child(GTK_BOX(gtk_widget_get_parent(button)), button, 0);
if (mimeview->opened)
@@ -2792,18 +2792,18 @@ void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd, GdkEventButton *e
{
MessageView *msgview = NULL;
MainWindow *mainwin = NULL;
-
+
if (!cmd)
return;
-
+
msgview = mimeview->messageview;
if (!msgview)
return;
-
+
mainwin = msgview->mainwin;
if (!mainwin)
return;
-
+
g_object_set_data(G_OBJECT(mimeview->popupmenu),
"pop_partinfo", NULL);
@@ -2831,9 +2831,9 @@ void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd, GdkEventButton *e
const gchar *tagname = cmd + strlen("cm://search_tags:");
gchar *buf = g_strdup_printf("tag matchcase \"%s\"", tagname);
gtk_toggle_button_set_active(
- GTK_TOGGLE_BUTTON(mimeview->messageview->mainwin->summaryview->toggle_search),
+ GTK_TOGGLE_BUTTON(mimeview->messageview->mainwin->summaryview->toggle_search),
TRUE);
- quicksearch_set(mimeview->messageview->mainwin->summaryview->quicksearch,
+ quicksearch_set(mimeview->messageview->mainwin->summaryview->quicksearch,
ADVANCED_SEARCH_EXTENDED, buf);
g_free(buf);
}
diff --git a/src/msgcache.c b/src/msgcache.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -54,7 +54,7 @@
#define bswap_32(x) \
((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
(((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
-
+
#define MMAP_TO_GUINT32(x) \
(((x[3]&0xff)) | \
((x[2]&0xff) << 8) | \
@@ -125,7 +125,7 @@ struct _CharsetConverter {
MsgCache *msgcache_new(void)
{
MsgCache *cache;
-
+
cache = g_new0(MsgCache, 1),
cache->msgnum_table = g_hash_table_new(g_int_hash, g_int_equal);
cache->msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
@@ -138,7 +138,7 @@ static gboolean msgcache_msginfo_free_func(gpointer num, gpointer msginfo, gpoin
{
procmsg_msginfo_free((MsgInfo **)&msginfo);
return TRUE;
-}
+}
void msgcache_destroy(MsgCache *cache)
{
@@ -150,7 +150,7 @@ void msgcache_destroy(MsgCache *cache)
g_free(cache);
}
-void msgcache_add_msg(MsgCache *cache, MsgInfo *msginfo)
+void msgcache_add_msg(MsgCache *cache, MsgInfo *msginfo)
{
MsgInfo *newmsginfo;
@@ -196,12 +196,12 @@ void msgcache_remove_msg(MsgCache *cache, guint msgnum)
void msgcache_update_msg(MsgCache *cache, MsgInfo *msginfo)
{
MsgInfo *oldmsginfo, *newmsginfo;
-
+
cm_return_if_fail(cache != NULL);
cm_return_if_fail(msginfo != NULL);
oldmsginfo = g_hash_table_lookup(cache->msgnum_table, &msginfo->msgnum);
- if(oldmsginfo && oldmsginfo->msgid)
+ if(oldmsginfo && oldmsginfo->msgid)
g_hash_table_remove(cache->msgid_table, oldmsginfo->msgid);
if (oldmsginfo) {
g_hash_table_remove(cache->msgnum_table, &oldmsginfo->msgnum);
@@ -215,7 +215,7 @@ void msgcache_update_msg(MsgCache *cache, MsgInfo *msginfo)
g_hash_table_insert(cache->msgid_table, newmsginfo->msgid, newmsginfo);
cache->memusage += procmsg_msginfo_memusage(newmsginfo);
cache->last_access = time(NULL);
-
+
debug_print("Cache size: %d messages, %u bytes\n", g_hash_table_size(cache->msgnum_table), cache->memusage);
msginfo->folder->cache_dirty = TRUE;
@@ -233,14 +233,14 @@ MsgInfo *msgcache_get_msg(MsgCache *cache, guint num)
if(!msginfo)
return NULL;
cache->last_access = time(NULL);
-
+
return procmsg_msginfo_new_ref(msginfo);
}
MsgInfo *msgcache_get_msg_by_id(MsgCache *cache, const gchar *msgid)
{
MsgInfo *msginfo;
-
+
cm_return_val_if_fail(cache != NULL, NULL);
cm_return_val_if_fail(msgid != NULL, NULL);
@@ -248,8 +248,8 @@ MsgInfo *msgcache_get_msg_by_id(MsgCache *cache, const gchar *msgid)
if(!msginfo)
return NULL;
cache->last_access = time(NULL);
-
- return procmsg_msginfo_new_ref(msginfo);
+
+ return procmsg_msginfo_new_ref(msginfo);
}
static void msgcache_get_msg_list_func(gpointer key, gpointer value, gpointer user_data)
@@ -266,9 +266,9 @@ MsgInfoList *msgcache_get_msg_list(MsgCache *cache)
START_TIMING("");
cm_return_val_if_fail(cache != NULL, NULL);
- g_hash_table_foreach((GHashTable *)cache->msgnum_table, msgcache_get_msg_list_func, (gpointer)&msg_list);
+ g_hash_table_foreach((GHashTable *)cache->msgnum_table, msgcache_get_msg_list_func, (gpointer)&msg_list);
cache->last_access = time(NULL);
-
+
msg_list = g_slist_reverse(msg_list);
END_TIMING();
return msg_list;
@@ -277,7 +277,7 @@ MsgInfoList *msgcache_get_msg_list(MsgCache *cache)
time_t msgcache_get_last_access_time(MsgCache *cache)
{
cm_return_val_if_fail(cache != NULL, 0);
-
+
return cache->last_access;
}
@@ -441,7 +441,7 @@ static FILE *msgcache_open_data_file(const gchar *file, guint version,
}
data_ver = bswap_32(data_ver);
}
-
+
if (mode == DATA_READ)
return fp;
@@ -460,7 +460,7 @@ static FILE *msgcache_open_data_file(const gchar *file, guint version,
return fp;
}
-static gint msgcache_read_cache_data_str(FILE *fp, gchar **str,
+static gint msgcache_read_cache_data_str(FILE *fp, gchar **str,
StringConverter *conv)
{
gchar *tmpstr = NULL;
@@ -508,7 +508,7 @@ static gint msgcache_read_cache_data_str(FILE *fp, gchar **str,
if (conv != NULL) {
*str = conv->convert(conv, tmpstr);
g_free(tmpstr);
- } else
+ } else
*str = tmpstr;
return len;
@@ -541,7 +541,7 @@ static gint msgcache_get_cache_data_str(gchar *src, gchar **str, gint len,
if (conv != NULL) {
*str = conv->convert(conv, tmpstr);
g_free(tmpstr);
- } else
+ } else
*str = tmpstr;
return len;
@@ -587,7 +587,7 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
swapping = TRUE;
/* In case we can't open the mark file with MARK_VERSION, check if we can open it with the
- * swapped MARK_VERSION. As msgcache_open_data_file swaps it too, if this succeeds,
+ * swapped MARK_VERSION. As msgcache_open_data_file swaps it too, if this succeeds,
* it means it's the old version (not little-endian) on a big-endian machine. The code has
* no effect on x86 as their file doesn't change. */
@@ -821,7 +821,7 @@ void msgcache_read_mark(MsgCache *cache, const gchar *mark_file)
swapping = TRUE;
/* In case we can't open the mark file with MARK_VERSION, check if we can open it with the
- * swapped MARK_VERSION. As msgcache_open_data_file swaps it too, if this succeeds,
+ * swapped MARK_VERSION. As msgcache_open_data_file swaps it too, if this succeeds,
* it means it's the old version (not little-endian) on a big-endian machine. The code has
* no effect on x86 as their file doesn't change. */
@@ -833,7 +833,7 @@ void msgcache_read_mark(MsgCache *cache, const gchar *mark_file)
swapping = FALSE; /* yay */
}
debug_print("reading %sswapped mark file.\n", swapping?"":"un");
-
+
if (msgcache_use_mmap_read) {
if (fstat(fileno(fp), &st) >= 0)
map_len = st.st_size;
@@ -886,7 +886,7 @@ void msgcache_read_mark(MsgCache *cache, const gchar *mark_file)
if(msginfo) {
msginfo->flags.perm_flags = perm_flags;
}
- }
+ }
}
bail_err:
if (cache_data != NULL && cache_data != MAP_FAILED) {
@@ -915,7 +915,7 @@ void msgcache_read_tags(MsgCache *cache, const gchar *tags_file)
swapping = TRUE;
/* In case we can't open the mark file with MARK_VERSION, check if we can open it with the
- * swapped MARK_VERSION. As msgcache_open_data_file swaps it too, if this succeeds,
+ * swapped MARK_VERSION. As msgcache_open_data_file swaps it too, if this succeeds,
* it means it's the old version (not little-endian) on a big-endian machine. The code has
* no effect on x86 as their file doesn't change. */
@@ -927,7 +927,7 @@ void msgcache_read_tags(MsgCache *cache, const gchar *tags_file)
swapping = FALSE; /* yay */
}
debug_print("reading %sswapped tags file.\n", swapping?"":"un");
-
+
if (msgcache_use_mmap_read) {
if (fstat(fileno(fp), &st) >= 0)
map_len = st.st_size;
@@ -969,7 +969,7 @@ void msgcache_read_tags(MsgCache *cache, const gchar *tags_file)
GET_CACHE_DATA_INT(id);
if (id > 0) {
msginfo->tags = g_slist_prepend(
- msginfo->tags,
+ msginfo->tags,
GINT_TO_POINTER(id));
}
} while (id > 0);
@@ -986,13 +986,13 @@ void msgcache_read_tags(MsgCache *cache, const gchar *tags_file)
g_slist_free(msginfo->tags);
msginfo->tags = NULL;
do {
- if (claws_fread(&id, sizeof(id), 1, fp) != 1)
+ if (claws_fread(&id, sizeof(id), 1, fp) != 1)
id = -1;
if (swapping)
id = bswap_32(id);
if (id > 0) {
msginfo->tags = g_slist_prepend(
- msginfo->tags,
+ msginfo->tags,
GINT_TO_POINTER(id));
}
} while (id > 0);
@@ -1039,7 +1039,7 @@ static int msgcache_write_cache(MsgInfo *msginfo, FILE *fp)
WRITE_CACHE_DATA(msginfo->xref, fp);
WRITE_CACHE_DATA_INT(msginfo->planned_download, fp);
WRITE_CACHE_DATA_INT(msginfo->total_size, fp);
-
+
WRITE_CACHE_DATA_INT(g_slist_length(msginfo->references), fp);
for (cur = msginfo->references; cur != NULL; cur = cur->next) {
diff --git a/src/news_gtk.c b/src/news_gtk.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -96,27 +96,27 @@ static void add_menuitems(GtkUIManager *ui_manager, FolderItem *item)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "CheckNewMessages", "FolderViewPopup/CheckNewMessages", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "SeparatorNews3", "FolderViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
}
-
+
static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
{
MainWindow *mainwin = mainwindow_get_mainwindow();
-
+
#define SET_SENS(name, sens) \
cm_menu_set_sensitive_full(ui_manager, "Popup/"name, sens)
- SET_SENS("FolderViewPopup/Subscribe",
- folder_item_parent(item) == NULL
+ SET_SENS("FolderViewPopup/Subscribe",
+ folder_item_parent(item) == NULL
&& mainwin->lock_count == 0
&& news_folder_locked(item->folder) == 0);
- SET_SENS("FolderViewPopup/Unsubscribe",
- folder_item_parent(item) != NULL
+ SET_SENS("FolderViewPopup/Unsubscribe",
+ folder_item_parent(item) != NULL
&& mainwin->lock_count == 0
&& news_folder_locked(item->folder) == 0);
- SET_SENS("FolderViewPopup/CheckNewMessages",
- folder_item_parent(item) == NULL
+ SET_SENS("FolderViewPopup/CheckNewMessages",
+ folder_item_parent(item) == NULL
&& mainwin->lock_count == 0
&& news_folder_locked(item->folder) == 0);
- SET_SENS("FolderViewPopup/Synchronise",
+ SET_SENS("FolderViewPopup/Synchronise",
item ? (folder_item_parent(item) != NULL
&& folder_want_synchronise(item->folder))
: FALSE);
@@ -125,7 +125,7 @@ static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
&& !item->no_select)
: FALSE);
SET_SENS("FolderViewPopup/RenameFolder",
- folder_item_parent(item) != NULL
+ folder_item_parent(item) != NULL
&& mainwin->lock_count == 0
&& news_folder_locked(item->folder) == 0);
#undef SET_SENS
@@ -157,7 +157,7 @@ static void subscribe_newsgroup_cb(GtkAction *action, gpointer data)
GSList *cur;
GNode *gnode;
MainWindow *mainwin = mainwindow_get_mainwindow();
-
+
if ((item = folderview_get_selected_item(folderview)) == NULL) return;
if (mainwin->lock_count || news_folder_locked(item->folder))
@@ -231,7 +231,7 @@ static void unsubscribe_newsgroup_cb(GtkAction *action, gpointer data)
gchar *old_id;
AlertValue avalue;
MainWindow *mainwin = mainwindow_get_mainwindow();
-
+
if (!folderview->selected) return;
item = folderview_get_selected_item(folderview);
@@ -271,9 +271,9 @@ static void unsubscribe_newsgroup_cb(GtkAction *action, gpointer data)
return;
}
g_free(name);
-
+
folder_write_list();
-
+
prefs_filtering_delete_path(old_id);
g_free(old_id);
}
@@ -327,7 +327,7 @@ static void update_tree_cb(GtkAction *action, gpointer data)
FolderView *folderview = (FolderView *)data;
FolderItem *item;
MainWindow *mainwin = mainwindow_get_mainwindow();
-
+
item = folderview_get_selected_item(folderview);
cm_return_if_fail(item != NULL);
diff --git a/src/oauth2.c b/src/oauth2.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -231,7 +231,7 @@ void account_read_oauth2_all(void)
gint matchedversion = 0;
debug_print("Reading oauth2rc file\n");
-
+
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, OAUTH2_RC, NULL);
if ((fp = claws_fopen(rcpath, "rb")) == NULL) {
//No oauth2rc file exists
@@ -245,7 +245,7 @@ void account_read_oauth2_all(void)
g_free(rcpath);
return;
}
- }else{
+ }else{
//oauth2rc file exists. Check version and whether protected from update
version_text = g_strconcat("[Version: ", VERSION, "]\n", NULL);
while (claws_fgets(buf, sizeof(buf), fp) != NULL) {
@@ -253,7 +253,7 @@ void account_read_oauth2_all(void)
protected = 0;
debug_print("oauth2rc file is unprotected from updates\n");
}
-
+
if (!strcmp(buf, version_text)) {
matchedversion = 1;
debug_print("oauth2rc file matches Claws version\n");
@@ -261,7 +261,7 @@ void account_read_oauth2_all(void)
}
g_free(version_text);
rewind(fp);
-
+
if(!protected && !matchedversion){
//oauth2rc not protected from updates and does not match this version of Claws
//Update it to the latest template version.
@@ -270,7 +270,7 @@ void account_read_oauth2_all(void)
str_write_to_file(oauth2_text, rcpath, TRUE);
g_free(oauth2_text);
debug_print("Replacement oauth2rc file created to match this Claws version\n");
-
+
if ((fp = claws_fopen(rcpath, "rb")) == NULL) {
if (ENOENT != errno) FILE_OP_ERROR(rcpath, "claws_fopen");
g_free(rcpath);
@@ -327,30 +327,30 @@ static gint oauth2_filter_access (gchar *json, gchar *access_token, gint *expiry
{
GMatchInfo *matchInfo;
GRegex *regex;
-
+
regex = g_regex_new ("\"access_token\": ?\"(.*?)\",?", G_REGEX_RAW, 0, NULL);
g_regex_match (regex, json, 0, &matchInfo);
- if (g_match_info_matches (matchInfo))
+ if (g_match_info_matches (matchInfo))
g_stpcpy (access_token,g_match_info_fetch (matchInfo, 1));
- else{
+ else{
g_match_info_free (matchInfo);
return (-1);
}
-
+
g_match_info_free (matchInfo);
-
+
regex = g_regex_new ("\"expires_in\": ?([0-9]*),?", G_REGEX_RAW, 0, NULL);
g_regex_match (regex, json, 0, &matchInfo);
if (g_match_info_matches (matchInfo)){
// Reduce available token life to avoid attempting connections with (near) expired tokens
- *expiry = (g_get_real_time () / G_USEC_PER_SEC) + atoi(g_match_info_fetch (matchInfo, 1)) - 120;
+ *expiry = (g_get_real_time () / G_USEC_PER_SEC) + atoi(g_match_info_fetch (matchInfo, 1)) - 120;
}else{
g_match_info_free (matchInfo);
return (-2);
}
-
+
g_match_info_free (matchInfo);
-
+
return(0);
}
@@ -358,18 +358,18 @@ static gint oauth2_filter_refresh (gchar *json, gchar *refresh_token)
{
GMatchInfo *matchInfo;
GRegex *regex;
-
+
regex = g_regex_new ("\"refresh_token\": ?\"(.*?)\",?", G_REGEX_RAW, 0, NULL);
g_regex_match (regex, json, 0, &matchInfo);
- if (g_match_info_matches (matchInfo))
+ if (g_match_info_matches (matchInfo))
g_stpcpy (refresh_token,g_match_info_fetch (matchInfo, 1));
- else{
+ else{
g_match_info_free (matchInfo);
return (-1);
}
-
+
g_match_info_free (matchInfo);
-
+
return(0);
}
@@ -377,17 +377,17 @@ static gchar* oauth2_get_token_from_response(Oauth2Service provider, const gchar
gchar* token = NULL;
gint i;
Oauth2Info *oa2;
-
+
//Retrieve oauth2 configuration information
if(provider > g_list_length(oauth2_providers_list)){
debug_print("Configured OAUTH2 provider is not present in the oauth2rc config file\n");
return NULL;
}
-
+
i = (int)provider - 1;
oa2 = g_list_nth_data (oauth2_providers_list, i);
-
+
debug_print("Auth response: %s\n", response);
if (!oa2->oa2_codemarker_start || !oa2->oa2_codemarker_stop ||
!oa2->oa2_codemarker_start[0] || !oa2->oa2_codemarker_stop[0]) {
@@ -403,7 +403,7 @@ static gchar* oauth2_get_token_from_response(Oauth2Service provider, const gchar
return NULL;
token = g_strndup(start, stop - start);
}
-
+
return token;
}
@@ -471,13 +471,13 @@ int oauth2_obtain_tokens (Oauth2Service provider, OAUTH2Data *OAUTH2Data, const
gchar *tmp;
gint i;
Oauth2Info *oa2;
-
+
//Retrieve oauth2 configuration information
if(provider > g_list_length(oauth2_providers_list)){
debug_print("Configured OAUTH2 provider is not present in the oauth2rc config file\n");
return (1);
}
-
+
i = (int)provider - 1;
oa2 = g_list_nth_data (oauth2_providers_list, i);
@@ -507,7 +507,7 @@ int oauth2_obtain_tokens (Oauth2Service provider, OAUTH2Data *OAUTH2Data, const
return (1);
}
- refresh_token = g_malloc(OAUTH2BUFSIZE+1);
+ refresh_token = g_malloc(OAUTH2BUFSIZE+1);
access_token = g_malloc(OAUTH2BUFSIZE+1);
request = g_malloc(OAUTH2BUFSIZE+1);
@@ -626,13 +626,13 @@ gint oauth2_use_refresh_token (Oauth2Service provider, OAUTH2Data *OAUTH2Data)
gchar *tmp;
gint i;
Oauth2Info *oa2;
-
+
//Retrieve oauth2 configuration information
if(provider > g_list_length(oauth2_providers_list)){
debug_print("Configured OAUTH2 provider is not present in the oauth2rc config file\n");
return (1);
}
-
+
i = (int)provider - 1;
oa2 = g_list_nth_data (oauth2_providers_list, i);
@@ -663,7 +663,7 @@ gint oauth2_use_refresh_token (Oauth2Service provider, OAUTH2Data *OAUTH2Data)
client_id = g_strdup(oa2->oa2_client_id);
uri = g_uri_escape_string (client_id, NULL, FALSE);
- body = g_strconcat ("client_id=", uri, "&refresh_token=", OAUTH2Data->refresh_token, NULL);
+ body = g_strconcat ("client_id=", uri, "&refresh_token=", OAUTH2Data->refresh_token, NULL);
g_free(uri);
if(oa2->oa2_client_secret[0]){
@@ -683,7 +683,7 @@ gint oauth2_use_refresh_token (Oauth2Service provider, OAUTH2Data *OAUTH2Data)
if(oa2->oa2_grant_type_refresh[0]) {
uri = g_uri_escape_string (oa2->oa2_grant_type_refresh, NULL, FALSE);
- tmp = g_strconcat (body, "&grant_type=", uri, NULL);
+ tmp = g_strconcat (body, "&grant_type=", uri, NULL);
g_free(body);
g_free(uri);
body = tmp;
@@ -739,7 +739,7 @@ gint oauth2_use_refresh_token (Oauth2Service provider, OAUTH2Data *OAUTH2Data)
debug_print("OAuth2 - access token: %s\n", access_token);
debug_print("OAuth2 - access token expiry: %i\n", expiry);
-
+
sock_close(sock, TRUE);
g_free(body);
g_free(header);
@@ -760,13 +760,13 @@ gint oauth2_authorisation_url (Oauth2Service provider, gchar **url, const gchar
gchar *tmp;
gchar *uri;
Oauth2Info *oa2;
-
+
//Retrieve oauth2 configuration information
if(provider > g_list_length(oauth2_providers_list)){
debug_print("Configured OAUTH2 provider is not present in the oauth2rc config file\n");
return (1);
}
-
+
i = (int)provider - 1;
oa2 = g_list_nth_data (oauth2_providers_list, i);
@@ -775,7 +775,7 @@ gint oauth2_authorisation_url (Oauth2Service provider, gchar **url, const gchar
if(!custom_client_id[0])
client_id = g_strdup(oa2->oa2_client_id);
-
+
uri = g_uri_escape_string (custom_client_id[0] ? custom_client_id : client_id, NULL, FALSE);
*url = g_strconcat ("https://", oa2->oa2_base_url, oa2->oa2_auth_resource, "?client_id=",
uri, NULL);
@@ -789,43 +789,43 @@ gint oauth2_authorisation_url (Oauth2Service provider, gchar **url, const gchar
g_free(*url);
*url = tmp;
g_free(uri);
-
- }
+
+ }
if(oa2->oa2_response_type[0]) {
uri = g_uri_escape_string (oa2->oa2_response_type, NULL, FALSE);
tmp = g_strconcat (*url, "&response_type=", uri, NULL);
g_free(*url);
*url = tmp;
g_free(uri);
- }
+ }
if(oa2->oa2_scope_for_auth[0]) {
uri = g_uri_escape_string (oa2->oa2_scope_for_auth, NULL, FALSE);
tmp = g_strconcat (*url, "&scope=", uri, NULL);
g_free(*url);
*url = tmp;
g_free(uri);
- }
+ }
if(oa2->oa2_tenant[0]) {
uri = g_uri_escape_string (oa2->oa2_tenant, NULL, FALSE);
tmp = g_strconcat (*url, "&tenant=", uri, NULL);
g_free(*url);
*url = tmp;
g_free(uri);
- }
+ }
if(oa2->oa2_response_mode[0]) {
uri = g_uri_escape_string (oa2->oa2_response_mode, NULL, FALSE);
tmp = g_strconcat (*url, "&response_mode=", uri, NULL);
g_free(*url);
*url = tmp;
g_free(uri);
- }
+ }
if(oa2->oa2_state[0]) {
uri = g_uri_escape_string (oa2->oa2_state, NULL, FALSE);
tmp = g_strconcat (*url, "&state=", uri, NULL);
g_free(*url);
*url = tmp;
g_free(uri);
- }
+ }
return (0);
}
@@ -834,7 +834,7 @@ gint oauth2_check_passwds (PrefsAccount *ac_prefs)
{
gchar *uid = g_strdup_printf("%d", ac_prefs->account_id);
gint expiry;
- OAUTH2Data *OAUTH2Data = g_malloc(sizeof(* OAUTH2Data));
+ OAUTH2Data *OAUTH2Data = g_malloc(sizeof(* OAUTH2Data));
gint ret;
gchar *acc;
@@ -842,7 +842,7 @@ gint oauth2_check_passwds (PrefsAccount *ac_prefs)
OAUTH2Data->custom_client_id = ac_prefs->oauth2_client_id;
OAUTH2Data->custom_client_secret = ac_prefs->oauth2_client_secret;
-
+
if (passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_EXPIRY)) {
acc = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY);
expiry = atoi(acc);
@@ -854,7 +854,7 @@ gint oauth2_check_passwds (PrefsAccount *ac_prefs)
return (0);
}
}
-
+
if (passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_REFRESH)) {
log_message(LOG_PROTOCOL, _("OAuth2 obtaining access token using refresh token\n"));
OAUTH2Data->refresh_token = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_REFRESH);
@@ -866,7 +866,7 @@ gint oauth2_check_passwds (PrefsAccount *ac_prefs)
g_free(acc);
} else
ret = 1;
-
+
if (ret)
log_message(LOG_PROTOCOL, _("OAuth2 access token not obtained\n"));
else {
@@ -876,11 +876,11 @@ gint oauth2_check_passwds (PrefsAccount *ac_prefs)
if (ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_SEND, OAUTH2Data->access_token, FALSE);
passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, OAUTH2Data->expiry_str, FALSE);
- //Some providers issue replacement refresh tokens with each access token. Re-store whether replaced or not.
+ //Some providers issue replacement refresh tokens with each access token. Re-store whether replaced or not.
if (OAUTH2Data->refresh_token != NULL)
passwd_store_set_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_REFRESH, OAUTH2Data->refresh_token, FALSE);
passwd_store_write_config();
- log_message(LOG_PROTOCOL, _("OAuth2 access and refresh token updated\n"));
+ log_message(LOG_PROTOCOL, _("OAuth2 access and refresh token updated\n"));
}
if (OAUTH2Data->refresh_token) {
memset(OAUTH2Data->refresh_token, 0, strlen(OAUTH2Data->refresh_token));
@@ -888,19 +888,19 @@ gint oauth2_check_passwds (PrefsAccount *ac_prefs)
g_free(OAUTH2Data->refresh_token);
g_free(OAUTH2Data);
g_free(uid);
-
+
return (ret);
}
gint oauth2_init (OAUTH2Data *OAUTH2Data)
-{
+{
OAUTH2Data->refresh_token = NULL;
OAUTH2Data->access_token = NULL;
OAUTH2Data->expiry_str = NULL;
OAUTH2Data->expiry = 0;
OAUTH2Data->custom_client_id = NULL;
OAUTH2Data->custom_client_secret = NULL;
-
+
return (0);
}
diff --git a/src/partial_download.c b/src/partial_download.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/* Partial download:
@@ -24,12 +24,12 @@
*
* A mail which has been partially downloaded will have some special headers,
* and its entry in the uidl file will first be 1 (POP3_PARTIALLY_RECEIVED);
- * the special headers will be including "SC-Marked-For-Download" which can
+ * the special headers will be including "SC-Marked-For-Download" which can
* have three values:
* 0 (POP3_PARTIAL_DLOAD_UNKN) meaning that the user has not yet chosen to
* download the mail or let it be deleted - this header is absent until the
* user first chooses an action
- * 1 (POP3_PARTIAL_DLOAD_DLOAD) meaning that the user wants to finish
+ * 1 (POP3_PARTIAL_DLOAD_DLOAD) meaning that the user wants to finish
* downloading the mail
* 2 (POP3_PARTIAL_DLOAD_DELE) meaning that the user does not want to finish
* downloading the mail
@@ -74,19 +74,19 @@ int partial_msg_in_uidl_list(MsgInfo *msginfo)
time_t recv_time;
time_t now;
gchar *sanitized_uid = NULL;
-
+
if (!msginfo->extradata)
return FALSE;
sanitized_uid = g_strdup(msginfo->extradata->account_login);
-
+
subst_for_filename(sanitized_uid);
if (!msginfo->extradata->account_server
|| !msginfo->extradata->account_login
|| !msginfo->extradata->partial_recv)
return FALSE;
-
+
path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
"uidl", G_DIR_SEPARATOR_S, msginfo->extradata->account_server,
"-", msginfo->extradata->account_login, NULL);
@@ -112,8 +112,8 @@ int partial_msg_in_uidl_list(MsgInfo *msginfo)
gchar tmp[POPBUFSIZE];
strretchomp(buf);
recv_time = RECV_TIME_NONE;
-
- if (sscanf(buf, "%s\t%ld\t%s", uidl, (long int *) &recv_time,
+
+ if (sscanf(buf, "%s\t%ld\t%s", uidl, (long int *) &recv_time,
tmp) < 2) {
if (sscanf(buf, "%s", uidl) != 1)
continue;
@@ -127,7 +127,7 @@ int partial_msg_in_uidl_list(MsgInfo *msginfo)
}
}
- claws_fclose(fp);
+ claws_fclose(fp);
return FALSE;
}
@@ -145,7 +145,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
int err = -1;
gchar *filename;
MsgInfo *tinfo;
- gchar *sanitized_uid = NULL;
+ gchar *sanitized_uid = NULL;
filename = procmsg_get_message_file_path(msginfo);
if (!filename) {
@@ -153,7 +153,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
return err;
}
tinfo = procheader_parse_file(filename, msginfo->flags, TRUE, TRUE);
-
+
if (!tinfo->extradata) {
g_free(filename);
return err;
@@ -187,7 +187,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
pathnew = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
"uidl", G_DIR_SEPARATOR_S, tinfo->extradata->account_server,
"-", sanitized_uid, ".new", NULL);
-
+
g_free(sanitized_uid);
if ((fpnew = claws_fopen(pathnew, "wb")) == NULL) {
@@ -197,15 +197,15 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
g_free(pathnew);
goto bail;
}
-
+
now = time(NULL);
while (claws_fgets(buf, sizeof(buf), fp) != NULL) {
strretchomp(buf);
recv_time = RECV_TIME_NONE;
sprintf(partial_recv,"0");
-
- if (sscanf(buf, "%s\t%ld\t%s",
+
+ if (sscanf(buf, "%s\t%ld\t%s",
uidl, (long int *) &recv_time, partial_recv) < 2) {
if (sscanf(buf, "%s", uidl) != 1)
continue;
@@ -214,7 +214,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
}
}
if (strcmp(tinfo->extradata->partial_recv, uidl)) {
- if (fprintf(fpnew, "%s\t%ld\t%s\n",
+ if (fprintf(fpnew, "%s\t%ld\t%s\n",
uidl, (long int) recv_time, partial_recv) < 0) {
FILE_OP_ERROR(pathnew, "fprintf");
claws_fclose(fpnew);
@@ -236,8 +236,8 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
stat = g_strdup("1");
else if (download == POP3_PARTIAL_DLOAD_DELE)
stat = g_strdup("0");
-
- if (fprintf(fpnew, "%s\t%ld\t%s\n",
+
+ if (fprintf(fpnew, "%s\t%ld\t%s\n",
uidl, (long int) recv_time, stat) < 0) {
FILE_OP_ERROR(pathnew, "fprintf");
claws_fclose(fpnew);
@@ -262,7 +262,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
g_free(path);
g_free(pathnew);
-
+
if ((fp = claws_fopen(filename,"rb")) == NULL) {
FILE_OP_ERROR(filename, "claws_fopen");
goto bail;
@@ -274,8 +274,8 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
g_free(pathnew);
goto bail;
}
-
- if (fprintf(fpnew, "SC-Marked-For-Download: %d\n",
+
+ if (fprintf(fpnew, "SC-Marked-For-Download: %d\n",
download) < 0) {
FILE_OP_ERROR(pathnew, "fprintf");
claws_fclose(fpnew);
@@ -285,9 +285,9 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
}
while (claws_fgets(buf, sizeof(buf)-1, fp) != NULL) {
if(strlen(buf) > strlen("SC-Marked-For-Download: x\n")
- && !strncmp(buf, "SC-Marked-For-Download:",
+ && !strncmp(buf, "SC-Marked-For-Download:",
strlen("SC-Marked-For-Download:"))) {
- if (fprintf(fpnew, "%s",
+ if (fprintf(fpnew, "%s",
buf+strlen("SC-Marked-For-Download: x\n")) < 0) {
FILE_OP_ERROR(pathnew, "fprintf");
claws_fclose(fpnew);
@@ -297,7 +297,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
}
continue;
} else if (strlen(buf) == strlen("SC-Marked-For-Download: x\n")
- && !strncmp(buf, "SC-Marked-For-Download:",
+ && !strncmp(buf, "SC-Marked-For-Download:",
strlen("SC-Marked-For-Download:"))) {
continue;
}
@@ -330,10 +330,10 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
bail:
g_free(filename);
procmsg_msginfo_free(&tinfo);
-
+
return err;
}
-
+
int partial_mark_for_delete(MsgInfo *msginfo)
{
return partial_uidl_mark_mail(msginfo, POP3_PARTIAL_DLOAD_DELE);
@@ -349,7 +349,7 @@ int partial_unmark(MsgInfo *msginfo)
return partial_uidl_mark_mail(msginfo, POP3_PARTIAL_DLOAD_UNKN);
}
-void partial_delete_old(const gchar *file)
+void partial_delete_old(const gchar *file)
{
gchar *id = g_strdup(file);
gchar *snum = strrchr(file, ':');
@@ -374,7 +374,7 @@ void partial_delete_old(const gchar *file)
if (item) {
debug_print("removing %d in %s\n", num, id);
folder_item_remove_msg(item, num);
- }
+ }
g_free(id);
}
@@ -388,12 +388,12 @@ gchar *partial_get_filename(const gchar *server, const gchar *login,
gchar uidl[POPBUFSIZE];
time_t recv_time;
time_t now;
- gchar *sanitized_uid = g_strdup(login);
+ gchar *sanitized_uid = g_strdup(login);
subst_for_filename(sanitized_uid);
path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
- "uidl", G_DIR_SEPARATOR_S,
+ "uidl", G_DIR_SEPARATOR_S,
server, "-", sanitized_uid, NULL);
if ((fp = claws_fopen(path, "rb")) == NULL) {
if (ENOENT != errno) FILE_OP_ERROR(path, "claws_fopen");
@@ -417,8 +417,8 @@ gchar *partial_get_filename(const gchar *server, const gchar *login,
gchar tmp[POPBUFSIZE];
strretchomp(buf);
recv_time = RECV_TIME_NONE;
-
- if (sscanf(buf, "%s\t%ld\t%s", uidl, (long int *) &recv_time,
+
+ if (sscanf(buf, "%s\t%ld\t%s", uidl, (long int *) &recv_time,
tmp) < 2) {
if (sscanf(buf, "%s", uidl) != 1)
continue;
@@ -433,6 +433,6 @@ gchar *partial_get_filename(const gchar *server, const gchar *login,
}
claws_fclose(fp);
-
+
return result;
}
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -177,7 +177,7 @@ typedef struct ReceivePage
GtkWidget *filter_on_recv_checkbtn;
GtkWidget *filterhook_on_recv_checkbtn;
GtkWidget *recvatgetall_checkbtn;
-
+
GtkWidget *imap_frame;
GtkWidget *imap_auth_type_optmenu;
GtkWidget *imapdir_label;
@@ -227,7 +227,7 @@ typedef struct Oauth2Page
GtkWidget *oauth2_authorise_btn;
GtkWidget *oauth2_deauthorise_btn;
GtkWidget *oauth2_authcode_entry;
- GtkWidget *oauth2_auth_optmenu;
+ GtkWidget *oauth2_auth_optmenu;
GtkWidget *oauth2_link_button;
GtkWidget *oauth2_link_copy_button;
gpointer *protocol_optmenu;
@@ -517,7 +517,7 @@ static PrefParam basic_param[] = {
{"use_nntp_auth", "FALSE", &tmp_ac_prefs.use_nntp_auth, P_BOOL,
&basic_page.nntpauth_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
-
+
{"use_nntp_auth_onconnect", "FALSE", &tmp_ac_prefs.use_nntp_auth_onconnect, P_BOOL,
&basic_page.nntpauth_onconnect_checkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
@@ -719,9 +719,9 @@ static PrefParam compose_param[] = {
{"auto_signature", "TRUE", &tmp_ac_prefs.auto_sig, P_BOOL,
&compose_page.checkbtn_autosig,
prefs_set_data_from_toggle, prefs_set_toggle},
-
+
{"signature_separator", "-- ", &tmp_ac_prefs.sig_sep, P_STRING,
- &compose_page.entry_sigsep,
+ &compose_page.entry_sigsep,
prefs_set_data_from_entry, prefs_set_entry},
{"set_autocc", "FALSE", &tmp_ac_prefs.set_autocc, P_BOOL,
@@ -778,7 +778,7 @@ static PrefParam compose_param[] = {
{"default_alt_dictionary", NULL, &tmp_ac_prefs.default_alt_dictionary, P_STRING,
NULL, NULL, NULL},
-#endif
+#endif
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
@@ -1079,7 +1079,7 @@ static PrefParam advanced_param[] = {
{"trash_folder", NULL, &tmp_ac_prefs.trash_folder, P_STRING,
&advanced_page.trash_folder_entry,
prefs_set_data_from_entry, prefs_set_entry},
-
+
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
@@ -1116,7 +1116,7 @@ static void prefs_account_receive_itv_spinbutton_value_changed_cb(GtkWidget *w,
* system choice. */
static void privacy_system_activated(GtkWidget *combobox)
{
- gtk_widget_set_sensitive (privacy_page.save_clear_text_checkbtn,
+ gtk_widget_set_sensitive (privacy_page.save_clear_text_checkbtn,
!gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(privacy_page.encrypt_to_self_checkbtn)));
}
@@ -1145,7 +1145,7 @@ static void update_privacy_system_menu() {
for (cur = system_ids; cur != NULL; cur = g_slist_next(cur)) {
gchar *id = (gchar *) cur->data;
const gchar *name;
-
+
name = privacy_system_get_name(id);
gtk_list_store_append(menu, &iter);
gtk_list_store_set(menu, &iter,
@@ -1361,7 +1361,7 @@ static void basic_create_widget_func(PrefsPage * _page,
nntpauth_checkbtn = gtk_check_button_new_with_label
(_("This server requires authentication"));
gtk_widget_show (nntpauth_checkbtn);
-
+
gtk_grid_attach(GTK_GRID(serv_table), nntpauth_checkbtn, 0, 6, 2, 1);
nntpauth_onconnect_checkbtn = gtk_check_button_new_with_label
@@ -1412,7 +1412,7 @@ static void basic_create_widget_func(PrefsPage * _page,
gtk_widget_set_halign(pass_entry, GTK_ALIGN_FILL);
gtk_entry_set_visibility (GTK_ENTRY (pass_entry), FALSE);
gtk_entry_set_icon_from_icon_name(GTK_ENTRY(pass_entry),
- GTK_ENTRY_ICON_SECONDARY,
+ GTK_ENTRY_ICON_SECONDARY,
"view-reveal-symbolic");
gtk_entry_set_icon_activatable(GTK_ENTRY(pass_entry),
GTK_ENTRY_ICON_SECONDARY, TRUE);
@@ -2104,7 +2104,7 @@ static void send_create_widget_func(PrefsPage * _page,
gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0);
gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE);
gtk_entry_set_icon_from_icon_name(GTK_ENTRY(smtp_pass_entry),
- GTK_ENTRY_ICON_SECONDARY,
+ GTK_ENTRY_ICON_SECONDARY,
"view-reveal-symbolic");
gtk_entry_set_icon_activatable(GTK_ENTRY(smtp_pass_entry),
GTK_ENTRY_ICON_SECONDARY, TRUE);
@@ -2141,7 +2141,7 @@ static void send_create_widget_func(PrefsPage * _page,
PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_checkbtn,
_("Authenticate with POP before sending"));
-
+
g_signal_connect (G_OBJECT (pop_bfr_smtp_checkbtn), "clicked",
G_CALLBACK (pop_bfr_smtp_tm_set_sens),
NULL);
@@ -2166,7 +2166,7 @@ static void send_create_widget_func(PrefsPage * _page,
pop_auth_minutes_lbl = gtk_label_new(_("minutes"));
gtk_widget_show (pop_auth_minutes_lbl);
gtk_box_pack_start (GTK_BOX (hbox), pop_auth_minutes_lbl, FALSE, FALSE, 0);
-
+
page->msgid_checkbtn = msgid_checkbtn;
page->xmailer_checkbtn = xmailer_checkbtn;
page->customhdr_checkbtn = customhdr_checkbtn;
@@ -2237,7 +2237,7 @@ static void oauth2_create_widget_func(PrefsPage * _page,
auth_vbox = gtkut_get_options_frame(vbox1, &auth_frame,
_("Authorization"));
-
+
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (auth_vbox), hbox, FALSE, FALSE, 0);
@@ -2261,7 +2261,7 @@ static void oauth2_create_widget_func(PrefsPage * _page,
menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(oauth2_auth_optmenu)));
gtk_widget_show (oauth2_auth_optmenu);
gtk_box_pack_start (GTK_BOX (hbox), oauth2_auth_optmenu, FALSE, FALSE, 0);
-
+
COMBOBOX_ADD (menu, _("Select"), NULL);
COMBOBOX_ADD (menu, NULL, 0);
@@ -2288,7 +2288,7 @@ static void oauth2_create_widget_func(PrefsPage * _page,
vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox3);
gtk_box_pack_start (GTK_BOX (auth_vbox), vbox3, FALSE, FALSE, 0);
-
+
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox3), vbox2, FALSE, FALSE, 0);
@@ -2402,9 +2402,9 @@ static void oauth2_create_widget_func(PrefsPage * _page,
tmp_ac_prefs = *ac_prefs;
- g_signal_connect(G_OBJECT(oauth2_auth_optmenu), "changed",
+ g_signal_connect(G_OBJECT(oauth2_auth_optmenu), "changed",
G_CALLBACK(prefs_account_oauth2_set_sensitivity), NULL);
- g_signal_connect(G_OBJECT(oauth2_authcode_entry), "changed",
+ g_signal_connect(G_OBJECT(oauth2_authcode_entry), "changed",
G_CALLBACK(prefs_account_oauth2_set_auth_sensitivity), NULL);
prefs_account_oauth2_set_auth_sensitivity();
@@ -2655,7 +2655,7 @@ static void compose_create_widget_func(PrefsPage * _page,
page->page.widget = vbox1;
}
-
+
static void templates_create_widget_func(PrefsPage * _page,
GtkWindow * window,
gpointer data)
@@ -2668,7 +2668,7 @@ static void templates_create_widget_func(PrefsPage * _page,
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(vbox);
-
+
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
@@ -2688,11 +2688,11 @@ static void templates_create_widget_func(PrefsPage * _page,
TRUE, NULL);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(C_("Templates", "New")));
- /* reply format */
+ /* reply format */
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
-
+
quotefmt_create_reply_fmt_widgets(
window,
vbox2,
@@ -2703,7 +2703,7 @@ static void templates_create_widget_func(PrefsPage * _page,
TRUE, NULL);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(C_("Templates", "Reply")));
- /* forward format */
+ /* forward format */
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
@@ -2864,7 +2864,7 @@ static void pop_ssltunnel_toggled(GtkToggleButton *button,
gpointer data)
{
gboolean active = gtk_toggle_button_get_active(button);
-
+
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
advanced_page.popport_checkbtn)) == TRUE)
return;
@@ -2876,7 +2876,7 @@ static void imap_ssltunnel_toggled(GtkToggleButton *button,
gpointer data)
{
gboolean active = gtk_toggle_button_get_active(button);
-
+
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
advanced_page.imapport_checkbtn)) == TRUE)
return;
@@ -2888,24 +2888,24 @@ static void nntp_ssltunnel_toggled(GtkToggleButton *button,
gpointer data)
{
gboolean active = gtk_toggle_button_get_active(button);
-
+
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
advanced_page.nntpport_checkbtn)) == TRUE)
return;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.nntpport_spinbtn),
active ? 563 : 119);
-}
+}
static void smtp_ssltunnel_toggled(GtkToggleButton *button,
gpointer data)
{
gboolean active = gtk_toggle_button_get_active(button);
-
+
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
advanced_page.smtpport_checkbtn)) == TRUE)
return;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.smtpport_spinbtn),
- active ? 465 : 25);
+ active ? 465 : 25);
}
static void ssl_create_widget_func(PrefsPage * _page,
@@ -2971,7 +2971,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
SSL_STARTTLS);
g_signal_connect(G_OBJECT(pop_ssltunnel_radiobtn), "toggled",
G_CALLBACK(pop_ssltunnel_toggled), NULL);
-
+
vbox3 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP"));
CREATE_RADIO_BUTTONS(vbox3,
@@ -3045,7 +3045,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
entry_in_cert_pass = gtk_entry_new();
gtk_entry_set_visibility(GTK_ENTRY(entry_in_cert_pass), FALSE);
gtk_entry_set_icon_from_icon_name(GTK_ENTRY(entry_in_cert_pass),
- GTK_ENTRY_ICON_SECONDARY,
+ GTK_ENTRY_ICON_SECONDARY,
"view-reveal-symbolic");
gtk_entry_set_icon_activatable(GTK_ENTRY(entry_in_cert_pass),
GTK_ENTRY_ICON_SECONDARY, TRUE);
@@ -3078,7 +3078,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
entry_out_cert_pass = gtk_entry_new();
gtk_entry_set_visibility(GTK_ENTRY(entry_out_cert_pass), FALSE);
gtk_entry_set_icon_from_icon_name(GTK_ENTRY(entry_out_cert_pass),
- GTK_ENTRY_ICON_SECONDARY,
+ GTK_ENTRY_ICON_SECONDARY,
"view-reveal-symbolic");
gtk_entry_set_icon_activatable(GTK_ENTRY(entry_out_cert_pass),
GTK_ENTRY_ICON_SECONDARY, TRUE);
@@ -3098,7 +3098,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
G_CALLBACK(prefs_account_in_cert_browse_cb), NULL);
g_signal_connect(G_OBJECT(out_ssl_cert_browse_button), "clicked",
G_CALLBACK(prefs_account_out_cert_browse_cb), NULL);
-
+
vbox7 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox7);
gtk_box_pack_start (GTK_BOX (vbox1), vbox7, FALSE, FALSE, 0);
@@ -3279,7 +3279,7 @@ static void proxy_create_widget_func(PrefsPage * _page,
gtk_widget_set_size_request(proxy_pass_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_entry_set_visibility(GTK_ENTRY(proxy_pass_entry), FALSE);
gtk_entry_set_icon_from_icon_name(GTK_ENTRY(proxy_pass_entry),
- GTK_ENTRY_ICON_SECONDARY,
+ GTK_ENTRY_ICON_SECONDARY,
"view-reveal-symbolic");
gtk_entry_set_icon_activatable(GTK_ENTRY(proxy_pass_entry),
GTK_ENTRY_ICON_SECONDARY, TRUE);
@@ -3411,7 +3411,7 @@ static void advanced_create_widget_func(PrefsPage * _page,
PACK_PORT_SPINBTN (hbox1, spinbtn_smtpport);
SET_TOGGLE_SENSITIVITY (checkbtn_smtpport, spinbtn_smtpport);
gtk_size_group_add_widget(size_group, checkbtn_smtpport);
-
+
PACK_HBOX (hbox_popport);
PACK_CHECK_BUTTON (hbox_popport, checkbtn_popport,
_("POP port"));
@@ -3435,7 +3435,7 @@ static void advanced_create_widget_func(PrefsPage * _page,
PACK_HBOX (hbox1);
PACK_CHECK_BUTTON (hbox1, checkbtn_domain, _("Domain name"));
- gtk_size_group_add_widget(size_group, checkbtn_domain);
+ gtk_size_group_add_widget(size_group, checkbtn_domain);
tip_domain = _("The domain name will be used in the generated "
"Message-ID, and when connecting to SMTP servers");
@@ -3448,7 +3448,7 @@ static void advanced_create_widget_func(PrefsPage * _page,
SET_TOGGLE_SENSITIVITY (checkbtn_domain, entry_domain);
CLAWS_SET_TIP(entry_domain, tip_domain);
-#ifndef G_OS_WIN32
+#ifndef G_OS_WIN32
PACK_HBOX (hbox1);
PACK_CHECK_BUTTON (hbox1, checkbtn_tunnelcmd,
_("Use command to communicate with server"));
@@ -3459,7 +3459,7 @@ static void advanced_create_widget_func(PrefsPage * _page,
#endif
PACK_HBOX (hbox1);
- PACK_CHECK_BUTTON (hbox1, checkbtn_crosspost,
+ PACK_CHECK_BUTTON (hbox1, checkbtn_crosspost,
_("Mark cross-posted messages as read and color:"));
g_signal_connect (G_OBJECT (checkbtn_crosspost), "toggled",
G_CALLBACK (crosspost_color_toggled),
@@ -3557,10 +3557,10 @@ static void advanced_create_widget_func(PrefsPage * _page,
page->vbox = vbox1;
page->page.widget = vbox1;
-
+
g_object_unref(G_OBJECT(size_group));
}
-
+
static gint prefs_basic_apply(void)
{
RecvProtocol protocol;
@@ -3585,8 +3585,8 @@ static gint prefs_basic_apply(void)
return -1;
}
- if (((protocol == A_POP3) ||
- (protocol == A_LOCAL && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(basic_page.mailcmd_checkbtn))) ||
+ if (((protocol == A_POP3) ||
+ (protocol == A_LOCAL && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(basic_page.mailcmd_checkbtn))) ||
(protocol == A_NONE)) &&
*gtk_entry_get_text(GTK_ENTRY(basic_page.smtpserv_entry)) == '\0') {
alertpanel_error(_("SMTP server is not entered."));
@@ -3645,12 +3645,12 @@ static gint prefs_basic_apply(void)
alertpanel_error(_("mail command is not entered."));
return -1;
}
-
- if (protocol == A_IMAP4 || protocol == A_NNTP)
+
+ if (protocol == A_IMAP4 || protocol == A_NNTP)
old_id = g_strdup_printf("#%s/%s",
protocol == A_IMAP4 ? "imap":"news",
tmp_ac_prefs.account_name ? tmp_ac_prefs.account_name : "(null)");
-
+
if (strchr(gtk_entry_get_text(GTK_ENTRY(basic_page.uid_entry)), '\n') != NULL) {
alertpanel_error(_("User ID cannot contain a newline character."));
if (old_id)
@@ -3689,7 +3689,7 @@ static gint prefs_basic_apply(void)
if (new_id)
g_free(new_id);
}
-
+
return 0;
}
@@ -3885,7 +3885,7 @@ static void advanced_destroy_widget_func(PrefsPage *_page)
}
static gboolean basic_can_close_func(PrefsPage *_page)
-{
+{
BasicPage *page = (BasicPage *) _page;
if (!page->page.page_open)
@@ -3895,7 +3895,7 @@ static gboolean basic_can_close_func(PrefsPage *_page)
}
static gboolean receive_can_close_func(PrefsPage *_page)
-{
+{
ReceivePage *page = (ReceivePage *) _page;
if (!page->page.page_open)
@@ -3905,7 +3905,7 @@ static gboolean receive_can_close_func(PrefsPage *_page)
}
static gboolean send_can_close_func(PrefsPage *_page)
-{
+{
SendPage *page = (SendPage *) _page;
if (!page->page.page_open)
@@ -3916,7 +3916,7 @@ static gboolean send_can_close_func(PrefsPage *_page)
#ifdef USE_OAUTH2
static gboolean oauth2_can_close_func(PrefsPage *_page)
-{
+{
Oauth2Page *page = (Oauth2Page *) _page;
if (!page->page.page_open)
@@ -3927,7 +3927,7 @@ static gboolean oauth2_can_close_func(PrefsPage *_page)
#endif
static gboolean compose_can_close_func(PrefsPage *_page)
-{
+{
ComposePage *page = (ComposePage *) _page;
if (!page->page.page_open)
@@ -4121,7 +4121,7 @@ static void register_basic_page(void)
path[0] = _("Account");
path[1] = _("Basic");
path[2] = NULL;
-
+
basic_page.page.path = path;
basic_page.page.weight = 1000.0;
basic_page.page.create_widget = basic_create_widget_func;
@@ -4139,7 +4139,7 @@ static void register_receive_page(void)
path[0] = _("Account");
path[1] = _("Receive");
path[2] = NULL;
-
+
receive_page.page.path = path;
receive_page.page.weight = 1000.0;
receive_page.page.create_widget = receive_create_widget_func;
@@ -4157,7 +4157,7 @@ static void register_send_page(void)
path[0] = _("Account");
path[1] = (gchar *) C_("Preferences menu item", "Send");
path[2] = NULL;
-
+
send_page.page.path = path;
send_page.page.weight = 1000.0;
send_page.page.create_widget = send_create_widget_func;
@@ -4176,14 +4176,14 @@ static void register_oauth2_page(void)
path[0] = _("Account");
path[1] = _("OAuth2");
path[2] = NULL;
-
+
oauth2_page.page.path = path;
oauth2_page.page.weight = 1000.0;
oauth2_page.page.create_widget = oauth2_create_widget_func;
oauth2_page.page.destroy_widget = oauth2_destroy_widget_func;
oauth2_page.page.save_page = oauth2_save_func;
oauth2_page.page.can_close = oauth2_can_close_func;
-
+
prefs_account_register_page((PrefsPage *) &oauth2_page);
}
#endif
@@ -4195,7 +4195,7 @@ static void register_compose_page(void)
path[0] = _("Account");
path[1] = _("Write");
path[2] = NULL;
-
+
compose_page.page.path = path;
compose_page.page.weight = 1000.0;
compose_page.page.create_widget = compose_create_widget_func;
@@ -4213,7 +4213,7 @@ static void register_templates_page(void)
path[0] = _("Account");
path[1] = _("Templates");
path[2] = NULL;
-
+
templates_page.page.path = path;
templates_page.page.weight = 1000.0;
templates_page.page.create_widget = templates_create_widget_func;
@@ -4231,7 +4231,7 @@ static void register_privacy_page(void)
path[0] = _("Account");
path[1] = _("Privacy");
path[2] = NULL;
-
+
privacy_page.page.path = path;
privacy_page.page.weight = 1000.0;
privacy_page.page.create_widget = privacy_create_widget_func;
@@ -4250,7 +4250,7 @@ static void register_ssl_page(void)
path[0] = _("Account");
path[1] = _("TLS");
path[2] = NULL;
-
+
ssl_page.page.path = path;
ssl_page.page.weight = 1000.0;
ssl_page.page.create_widget = ssl_create_widget_func;
@@ -4274,7 +4274,7 @@ static gboolean sslcert_get_client_cert_hook(gpointer source, gpointer data)
g_warning("can't find account");
return TRUE;
}
-
+
if (hookdata->is_smtp) {
if (account->out_ssl_client_cert_file && *account->out_ssl_client_cert_file)
hookdata->cert_path = account->out_ssl_client_cert_file;
@@ -4306,7 +4306,7 @@ static gboolean do_get_pass(gpointer data)
return FALSE;
}
static gboolean sslcert_get_password(gpointer source, gpointer data)
-{
+{
struct GetPassData pass_data;
/* do complicated stuff to be able to call GTK from the mainloop */
g_cond_init(&pass_data.cond);
@@ -4351,7 +4351,7 @@ static void register_advanced_page(void)
path[0] = _("Account");
path[1] = _("Advanced");
path[2] = NULL;
-
+
advanced_page.page.path = path;
advanced_page.page.weight = 1000.0;
advanced_page.page.create_widget = advanced_create_widget_func;
@@ -4567,7 +4567,7 @@ void prefs_account_write_config_all(GList *account_list)
g_free(rcpath);
return;
}
-
+
str = g_string_sized_new(32);
g_hash_table_foreach(tmp_ac_prefs.privacy_prefs, create_privacy_prefs, str);
privacy_prefs = g_string_free(str, FALSE);
@@ -4675,7 +4675,7 @@ static void destroy_dialog(gpointer data)
if (ac_prefs->protocol == A_IMAP4 && !new_account) {
if ((&tmp_ac_prefs)->imap_subsonly != ac_prefs->imap_subsonly) {
update_fld_list = TRUE;
- }
+ }
}
*ac_prefs = tmp_ac_prefs;
if (update_fld_list)
@@ -4686,7 +4686,7 @@ static void destroy_dialog(gpointer data)
} else /* the customhdr_list may have changed, update it anyway */
ac_prefs->customhdr_list = (&tmp_ac_prefs)->customhdr_list;
-
+
gtk_main_quit();
}
@@ -4767,11 +4767,11 @@ static void prefs_account_crosspost_set_colormenu(PrefParam *pparam)
static void pop_bfr_smtp_tm_set_sens(GtkWidget *widget, gpointer data)
{
- gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_spinbtn,
+ gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_spinbtn,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(send_page.pop_bfr_smtp_checkbtn)));
- gtk_widget_set_sensitive(send_page.pop_auth_timeout_lbl,
+ gtk_widget_set_sensitive(send_page.pop_auth_timeout_lbl,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(send_page.pop_bfr_smtp_checkbtn)));
- gtk_widget_set_sensitive(send_page.pop_auth_minutes_lbl,
+ gtk_widget_set_sensitive(send_page.pop_auth_minutes_lbl,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(send_page.pop_bfr_smtp_checkbtn)));
}
@@ -5058,7 +5058,7 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
if (protocol == A_IMAP4) {
if (new_account)
gtk_toggle_button_set_active(
- GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn),
+ GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn),
TRUE);
gtk_widget_hide(send_page.msgid_checkbtn);
} else
@@ -5176,15 +5176,15 @@ static void prefs_account_oauth2_copy_url(GtkButton *button, gpointer data)
Oauth2Service service;
const gchar * custom_client_id = NULL;
struct Oauth2Listener *oauth2_listener_data;
-
+
service = combobox_get_active_data(GTK_COMBO_BOX(optmenu));
custom_client_id = gtk_entry_get_text((GtkEntry *)oauth2_page.oauth2_client_id_entry);
-
+
oauth2_authorisation_url(service, &url, custom_client_id);
-
+
win = gtk_widget_get_toplevel (optmenu);
len = strlen(url);
-
+
clip = gtk_widget_get_clipboard (win, GDK_SELECTION_PRIMARY);
clip2 = gtk_widget_get_clipboard (win, GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clip, url, len);
@@ -5204,7 +5204,7 @@ static void prefs_account_oauth2_copy_url(GtkButton *button, gpointer data)
while (oauth2_listener_closed == 0)
gtk_main_iteration();
}
-
+
debug_print("Starting oauth2 listener task\n");
oauth2_listener_data = g_new(struct Oauth2Listener, 1);
@@ -5213,14 +5213,14 @@ static void prefs_account_oauth2_copy_url(GtkButton *button, gpointer data)
oauth2_listener_data->service = combobox_get_active_data(GTK_COMBO_BOX(optmenu));
oauth2_listener_data->OAUTH2Data = g_malloc(sizeof(* oauth2_listener_data->OAUTH2Data));
oauth2_init (oauth2_listener_data->OAUTH2Data);
- oauth2_listener_data->OAUTH2Data->custom_client_secret =
+ oauth2_listener_data->OAUTH2Data->custom_client_secret =
g_strdup(gtk_entry_get_text((GtkEntry *)oauth2_page.oauth2_client_secret_entry));
- oauth2_listener_data->OAUTH2Data->custom_client_id =
+ oauth2_listener_data->OAUTH2Data->custom_client_id =
g_strdup(gtk_entry_get_text((GtkEntry *)oauth2_page.oauth2_client_id_entry));
oauth2_listener_cancel = 0;
oauth2_listener_closed = 0;
-
+
oauth2_listener_task = g_task_new(NULL, NULL, prefs_account_oauth2_callback, oauth2_listener_data);
g_task_set_task_data(oauth2_listener_task, oauth2_listener_data, NULL);
g_task_run_in_thread(oauth2_listener_task, prefs_account_oauth2_listener);
@@ -5241,15 +5241,15 @@ static void prefs_account_oauth2_obtain_tokens(GtkButton *button, gpointer data)
oauth2_init (OAUTH2Data);
- OAUTH2Data->custom_client_secret =
+ OAUTH2Data->custom_client_secret =
g_strdup(gtk_entry_get_text((GtkEntry *)oauth2_page.oauth2_client_secret_entry));
- OAUTH2Data->custom_client_id =
+ OAUTH2Data->custom_client_id =
g_strdup(gtk_entry_get_text((GtkEntry *)oauth2_page.oauth2_client_id_entry));
-
+
service = combobox_get_active_data(GTK_COMBO_BOX(optmenu));
ret = oauth2_obtain_tokens (service, OAUTH2Data, trim_text);
-
+
if(!ret){
if(OAUTH2Data->refresh_token != NULL){
passwd_store_set_account(tmp_ac_prefs.account_id,
@@ -5442,7 +5442,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_show(basic_page.pass_label);
gtk_widget_show(basic_page.uid_entry);
gtk_widget_show(basic_page.pass_entry);
-
+
gtk_widget_set_sensitive(basic_page.uid_label, TRUE);
gtk_widget_set_sensitive(basic_page.pass_label, TRUE);
gtk_widget_set_sensitive(basic_page.uid_entry, TRUE);
@@ -5466,13 +5466,13 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
(GTK_TOGGLE_BUTTON(send_page.pop_bfr_smtp_checkbtn), FALSE);
gtk_widget_set_sensitive(send_page.pop_bfr_smtp_checkbtn, FALSE);
gtk_widget_set_sensitive(send_page.pop_bfr_smtp_tm_spinbtn, FALSE);
-
+
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
+ (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
TRUE);
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
+ (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn),
@@ -5551,10 +5551,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
+ (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
TRUE);
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
+ (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn),
@@ -5589,7 +5589,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
#endif
if (new_account)
gtk_toggle_button_set_active(
- GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn),
+ GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn),
TRUE);
gtk_widget_hide(send_page.msgid_checkbtn);
gtk_widget_show(send_page.xmailer_checkbtn);
@@ -5642,10 +5642,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
+ (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
TRUE);
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
+ (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn),
@@ -5724,7 +5724,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
/* update pop_before_smtp sensitivity */
gtk_widget_set_sensitive(send_page.pop_bfr_smtp_checkbtn, FALSE);
pop_bfr_smtp_tm_set_sens(NULL, NULL);
-
+
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn), FALSE);
gtk_toggle_button_set_active
@@ -5806,13 +5806,13 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
/* update pop_before_smtp sensitivity */
gtk_widget_set_sensitive(send_page.pop_bfr_smtp_checkbtn, TRUE);
pop_bfr_smtp_tm_set_sens(NULL, NULL);
-
+
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
+ (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
TRUE);
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
+ (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
TRUE);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn),
@@ -5958,7 +5958,7 @@ static void prefs_account_compose_default_dictionary_set_optmenu_from_string
}
combo = *pparam->widget;
if (dictionary && *dictionary)
- gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(combo),
+ gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(combo),
dictionary);
else {
GtkTreeModel *model;
@@ -6022,7 +6022,7 @@ gchar *prefs_account_generate_msgid(PrefsAccount *account)
void prefs_account_register_page(PrefsPage *page)
{
prefs_pages = g_slist_append(prefs_pages, page);
-
+
}
void prefs_account_unregister_page(PrefsPage *page)
@@ -6105,7 +6105,7 @@ static void prefs_account_oauth2_listener(GTask *task, gpointer source, gpointer
struct timeval timeout;
debug_print("oauth2 listener task running\n");
-
+
//Create socket
socket_desc = socket(AF_INET , SOCK_STREAM , 0);
if (socket_desc == -1)
@@ -6116,12 +6116,12 @@ static void prefs_account_oauth2_listener(GTask *task, gpointer source, gpointer
return;
}
debug_print("oauth2 listener socket created\n");
-
+
//Prepare the sockaddr_in structure
server.sin_family = AF_INET;
server.sin_addr.s_addr = INADDR_ANY;
server.sin_port = htons( 8888 );
-
+
//Bind
if( bind(socket_desc,(struct sockaddr *)&server , sizeof(server)) < 0)
{
@@ -6134,11 +6134,11 @@ static void prefs_account_oauth2_listener(GTask *task, gpointer source, gpointer
debug_print("oauth2 listener bind done\n");
listen(socket_desc , 1);
-
+
//Accept and incoming connection
debug_print("oauth2 listener waiting for incoming connections...\n");
c = sizeof(struct sockaddr_in);
-
+
do{
FD_ZERO(&rfds);
FD_SET(socket_desc, &rfds);
@@ -6187,7 +6187,7 @@ static void prefs_account_oauth2_listener(GTask *task, gpointer source, gpointer
close(client_sock);
}
}while(ret && !oauth2_listener_cancel);
-
+
close(socket_desc);
debug_print("oauth2 closing task\n");
g_task_return_boolean (task, TRUE);
@@ -6252,7 +6252,7 @@ static int prefs_account_oauth2_get_line(int sock, char *buf, int size)
int i = 0;
char c = '\0';
int n;
-
+
while ((i < size - 1) && (c != '\n')) {
n = recv(sock, &c, 1, 0);
//printf("%02X\n", c);
@@ -6263,7 +6263,7 @@ static int prefs_account_oauth2_get_line(int sock, char *buf, int size)
if ((n > 0) && (c == '\n')) {
n = recv(sock, &c, 1, 0);
if (n < 0)
- log_message(LOG_PROTOCOL, "Receiving from pipe failed\n");
+ log_message(LOG_PROTOCOL, "Receiving from pipe failed\n");
}
else
c = '\n';
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
@@ -52,10 +52,10 @@
#include "file-utils.h"
enum {
- PREFS_ACTIONS_STRING, /*!< string pointer managed by list store,
- * and never touched or retrieved by
- * us */
- PREFS_ACTIONS_DATA, /*!< pointer to string that is not managed by
+ PREFS_ACTIONS_STRING, /*!< string pointer managed by list store,
+ * and never touched or retrieved by
+ * us */
+ PREFS_ACTIONS_DATA, /*!< pointer to string that is not managed by
* the list store, and which is retrieved
* and touched by us */
PREFS_ACTIONS_VALID, /*!< contains a valid action, otherwise "(New)" */
@@ -73,7 +73,7 @@ static struct Actions
GtkWidget *info_btn;
GtkWidget *shell_radiobtn;
GtkWidget *filter_radiobtn;
-
+
GtkWidget *actions_list_view;
} actions;
@@ -106,8 +106,8 @@ static gint prefs_actions_deleted (GtkWidget *widget,
static gboolean prefs_actions_key_pressed(GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-static gboolean prefs_actions_search_func_cb (GtkTreeModel *model, gint column,
- const gchar *key, GtkTreeIter *iter,
+static gboolean prefs_actions_search_func_cb (GtkTreeModel *model, gint column,
+ const gchar *key, GtkTreeIter *iter,
gpointer search_data);
static void prefs_actions_cancel (GtkWidget *w,
gpointer data);
@@ -242,7 +242,7 @@ static void prefs_actions_create(MainWindow *mainwin)
vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show(vbox1);
gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);
table = gtk_grid_new();
gtk_widget_show(table);
@@ -283,12 +283,12 @@ static void prefs_actions_create(MainWindow *mainwin)
gtk_box_pack_start(GTK_BOX(filter_hbox), shell_radiobtn, FALSE, FALSE, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(shell_radiobtn), TRUE);
gtk_widget_show(shell_radiobtn);
-
+
g_signal_connect(G_OBJECT(shell_radiobtn), "clicked",
G_CALLBACK(prefs_action_shell_radiobtn_cb), NULL);
filter_radiobtn =
- gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(shell_radiobtn),
+ gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(shell_radiobtn),
_("Filter action"));
gtk_box_pack_start(GTK_BOX(filter_hbox), filter_radiobtn, FALSE, FALSE, 0);
gtk_widget_show(filter_radiobtn);
@@ -372,7 +372,7 @@ static void prefs_actions_create(MainWindow *mainwin)
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(cond_scrolledwin),
GTK_SHADOW_ETCHED_IN);
- cond_list_view = prefs_actions_list_view_create();
+ cond_list_view = prefs_actions_list_view_create();
gtk_widget_show(cond_list_view);
gtk_container_add(GTK_CONTAINER (cond_scrolledwin), cond_list_view);
@@ -437,7 +437,7 @@ static void prefs_actions_create(MainWindow *mainwin)
actions.filter_btn = filter_btn;
actions.shell_radiobtn = shell_radiobtn;
actions.filter_radiobtn = filter_radiobtn;
-
+
actions.actions_list_view = cond_list_view;
}
@@ -485,7 +485,7 @@ void prefs_actions_read_config(void)
g_strchomp(tmp);
act = strstr(tmp, ": ");
- if (act && act[2] &&
+ if (act && act[2] &&
action_get_type(&act[2]) != ACTION_ERROR)
prefs_common.actions_list =
g_slist_append(prefs_common.actions_list,
@@ -533,7 +533,7 @@ void prefs_actions_write_config(void)
}
g_free(act);
}
-
+
g_free(rcpath);
if (prefs_file_close(pfile) < 0) {
@@ -558,12 +558,12 @@ static void prefs_actions_set_dialog(void)
store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(actions.actions_list_view)));
- prefs_actions_clear_list(store);
+ prefs_actions_clear_list(store);
prefs_actions_reset_dialog();
for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) {
gchar *action = (gchar *) cur->data;
-
+
prefs_actions_list_view_insert_action(actions.actions_list_view,
-1, action, TRUE);
}
@@ -573,7 +573,7 @@ static void prefs_actions_set_list(void)
{
GtkTreeIter iter;
GtkListStore *store;
-
+
g_slist_free(prefs_common.actions_list);
prefs_common.actions_list = NULL;
@@ -589,9 +589,9 @@ static void prefs_actions_set_list(void)
PREFS_ACTIONS_DATA, &action,
PREFS_ACTIONS_VALID, &is_valid,
-1);
-
- if (is_valid)
- prefs_common.actions_list =
+
+ if (is_valid)
+ prefs_common.actions_list =
g_slist_append(prefs_common.actions_list,
action);
@@ -635,7 +635,7 @@ static gint prefs_actions_clist_set_row(gint row)
memmove(where, to_move, strlen(to_move));
action[old_len-1] = '\0';
}
-
+
g_strstrip(action);
/* Keep space for the ': ' delimiter */
@@ -670,10 +670,10 @@ static gint prefs_actions_clist_set_row(gint row)
strcat(action, entry_text);
- new_action = g_strdup(action);
+ new_action = g_strdup(action);
prefs_actions_list_view_insert_action(actions.actions_list_view,
row, new_action, TRUE);
-
+
prefs_actions_set_list();
return 0;
@@ -711,13 +711,13 @@ static void prefs_actions_delete_cb(gpointer gtk_action, gpointer data)
gint row;
row = gtkut_list_view_get_selected_row(actions.actions_list_view);
- if (row <= 0)
- return;
+ if (row <= 0)
+ return;
if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
(GTK_TREE_VIEW(actions.actions_list_view)),
&model, &sel))
- return;
+ return;
if (alertpanel(_("Delete action"),
_("Do you really want to delete this action?"),
@@ -725,7 +725,7 @@ static void prefs_actions_delete_cb(gpointer gtk_action, gpointer data)
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
- /* XXX: Here's the reason why we need to store the original
+ /* XXX: Here's the reason why we need to store the original
* pointer: we search the slist for it. */
gtk_tree_model_get(model, &sel,
PREFS_ACTIONS_DATA, &action,
@@ -770,7 +770,7 @@ static void prefs_actions_clear_cb(gpointer gtk_action, gpointer data)
static void prefs_actions_duplicate_cb(gpointer gtk_action, gpointer data)
{
gint row;
-
+
row = gtkut_list_view_get_selected_row(actions.actions_list_view);
if (row <= 0)
return;
@@ -785,11 +785,11 @@ static void prefs_actions_top_cb(GtkWidget *w, gpointer data)
GtkTreeModel *model;
row = gtkut_list_view_get_selected_row(actions.actions_list_view);
- if (row <= 1)
+ if (row <= 1)
return;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view));
-
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view));
+
if (!gtk_tree_model_iter_nth_child(model, &top, NULL, 0)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, row))
return;
@@ -806,10 +806,10 @@ static void prefs_actions_up_cb(GtkWidget *w, gpointer data)
GtkTreeModel *model;
row = gtkut_list_view_get_selected_row(actions.actions_list_view);
- if (row <= 1)
+ if (row <= 1)
return;
-
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view));
+
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view));
if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row - 1)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, row))
@@ -826,7 +826,7 @@ static void prefs_actions_down_cb(GtkWidget *w, gpointer data)
GtkTreeIter top, sel;
GtkTreeModel *model;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view));
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view));
n_rows = gtk_tree_model_iter_n_children(model, NULL);
row = gtkut_list_view_get_selected_row(actions.actions_list_view);
if (row < 1 || row >= n_rows - 1)
@@ -835,7 +835,7 @@ static void prefs_actions_down_cb(GtkWidget *w, gpointer data)
if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, row + 1))
return;
-
+
gtk_list_store_swap(GTK_LIST_STORE(model), &top, &sel);
gtkut_list_view_select_row(actions.actions_list_view, row + 1);
modified_list = TRUE;
@@ -847,7 +847,7 @@ static void prefs_actions_bottom_cb(GtkWidget *w, gpointer data)
GtkTreeIter top, sel;
GtkTreeModel *model;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view));
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view));
n_rows = gtk_tree_model_iter_n_children(model, NULL);
row = gtkut_list_view_get_selected_row(actions.actions_list_view);
if (row < 1 || row >= n_rows - 1)
@@ -857,7 +857,7 @@ static void prefs_actions_bottom_cb(GtkWidget *w, gpointer data)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, n_rows - 1))
return;
- gtk_list_store_move_after(GTK_LIST_STORE(model), &top, &sel);
+ gtk_list_store_move_after(GTK_LIST_STORE(model), &top, &sel);
gtkut_list_view_select_row(actions.actions_list_view, n_rows - 1);
modified_list = TRUE;
}
@@ -883,8 +883,8 @@ static gboolean prefs_actions_key_pressed(GtkWidget *widget, GdkEventKey *event,
return FALSE;
}
-static gboolean prefs_actions_search_func_cb (GtkTreeModel *model, gint column, const gchar *key,
- GtkTreeIter *iter, gpointer search_data)
+static gboolean prefs_actions_search_func_cb (GtkTreeModel *model, gint column, const gchar *key,
+ GtkTreeIter *iter, gpointer search_data)
{
gchar *store_string;
gboolean retval;
@@ -946,7 +946,7 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
"window-close", _("_Close"), NULL, _("_Continue editing"),
NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return;
- }
+ }
modified = FALSE;
modified_list = FALSE;
prefs_actions_set_list();
@@ -974,7 +974,7 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
/* Update toolbars */
prefs_toolbar_update_action_btns();
-
+
gtk_widget_hide(actions.window);
gtk_window_set_modal(GTK_WINDOW(actions.window), FALSE);
inc_unlock();
@@ -982,7 +982,7 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
/*
* Strings describing action format strings
- *
+ *
* When adding new lines, remember to put one string for each line
*/
static gchar *actions_desc_strings[] = {
@@ -998,7 +998,7 @@ static gchar *actions_desc_strings[] = {
" |", N_("to replace message body or selection with command's standard output"),
" >", N_("to insert command's standard output without replacing old text"),
" &", N_("to run command asynchronously"),
- N_("<span weight=\"bold\">Use:</span>"), NULL,
+ N_("<span weight=\"bold\">Use:</span>"), NULL,
" %f", N_("for the file of the selected message in RFC822/2822 format "),
" %F", N_("for the list of the files of the selected messages in RFC822/2822 format"),
" %p", N_("for the file of the selected decoded message MIME part"),
@@ -1011,7 +1011,7 @@ static gchar *actions_desc_strings[] = {
};
-static DescriptionWindow actions_desc_win = {
+static DescriptionWindow actions_desc_win = {
NULL,
NULL,
TRUE,
@@ -1033,7 +1033,7 @@ static void prefs_actions_info_cb(GtkWidget *w, GtkWidget *window)
static GtkListStore* prefs_actions_create_data_store(void)
{
return gtk_list_store_new(N_PREFS_ACTIONS_COLUMNS,
- G_TYPE_STRING,
+ G_TYPE_STRING,
G_TYPE_POINTER,
G_TYPE_BOOLEAN,
-1);
@@ -1042,7 +1042,7 @@ static GtkListStore* prefs_actions_create_data_store(void)
static void prefs_actions_list_view_insert_action(GtkWidget *list_view,
gint row,
gchar *action,
- gboolean is_valid)
+ gboolean is_valid)
{
GtkTreeIter iter;
GtkTreeIter sibling;
@@ -1061,7 +1061,7 @@ static void prefs_actions_list_view_insert_action(GtkWidget *list_view,
} else if (row < -1 ) {
if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(list_store),
&sibling, NULL, -row-2))
- row = -1;
+ row = -1;
}
if (row == -1 ) {
@@ -1087,7 +1087,7 @@ static void prefs_actions_list_view_insert_action(GtkWidget *list_view,
gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter,
PREFS_ACTIONS_DATA, &old_action,
-1);
- g_free(old_action);
+ g_free(old_action);
gtk_list_store_set(list_store, &iter,
PREFS_ACTIONS_STRING, action,
@@ -1112,10 +1112,10 @@ static void prefs_actions_row_selected(GtkTreeSelection *selection, GtkTreeView
GtkTreePath *path;
GtkTreeIter iter;
GtkTreeModel *model;
-
+
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
-
+
path = gtk_tree_model_get_path(model, &iter);
prefs_actions_select_row(list_view, path);
gtk_tree_path_free(path);
@@ -1177,10 +1177,10 @@ static gboolean prefs_actions_list_popup_menu(GtkWidget *widget, gpointer data)
{
GtkTreeView *list_view = (GtkTreeView *)data;
GdkEventButton event;
-
+
event.button = 3;
event.time = gtk_get_current_event_time();
-
+
prefs_actions_list_btn_pressed(NULL, &event, list_view);
return TRUE;
@@ -1194,8 +1194,8 @@ static GtkWidget *prefs_actions_list_view_create(void)
model = GTK_TREE_MODEL(prefs_actions_create_data_store());
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
- g_object_unref(model);
-
+ g_object_unref(model);
+
g_signal_connect(G_OBJECT(list_view), "popup-menu",
G_CALLBACK(prefs_actions_list_popup_menu), list_view);
g_signal_connect(G_OBJECT(list_view), "button-press-event",
@@ -1225,7 +1225,7 @@ static void prefs_actions_create_list_view_columns(GtkWidget *list_view)
renderer,
"text", PREFS_ACTIONS_STRING,
NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(list_view), prefs_actions_search_func_cb , NULL, NULL);
}
@@ -1249,7 +1249,7 @@ static void prefs_actions_select_row(GtkTreeView *list_view, GtkTreePath *path)
selection = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_select_path(selection, path);
- gtk_tree_model_get(model, &iter,
+ gtk_tree_model_get(model, &iter,
PREFS_ACTIONS_VALID, &is_valid,
PREFS_ACTIONS_DATA, &action,
-1);
@@ -1257,7 +1257,7 @@ static void prefs_actions_select_row(GtkTreeView *list_view, GtkTreePath *path)
prefs_actions_reset_dialog();
return;
}
-
+
strncpy(buf, action, PREFSBUFSIZE - 1);
buf[PREFSBUFSIZE - 1] = '\0';
cmd = strstr(buf, ": ");
@@ -1322,14 +1322,14 @@ static void prefs_action_filterbtn_cb(GtkWidget *widget, gpointer data)
if (action_list == NULL)
alertpanel_error(_("Action string is not valid."));
}
-
+
prefs_filtering_action_open(action_list, prefs_action_define_filter_done);
if (action_list != NULL) {
for(cur = action_list ; cur != NULL ; cur = cur->next)
filteringaction_free(cur->data);
}
-
+
g_free(action_str);
g_strfreev(tokens);
}
@@ -1358,12 +1358,12 @@ void prefs_actions_rename_path(const gchar *old_path, const gchar *new_path)
{
gchar **tokens, *action_str;
GSList *action, *action_list;
-
+
for (action = prefs_common.actions_list; action != NULL;
action = action->next) {
action_str = (gchar *)action->data;
tokens = g_strsplit_set(action_str, "{}", 5);
-
+
if (tokens[0] && tokens[1] && *tokens[1] != '\0')
action_list = matcher_parser_get_action_list(tokens[1]);
else
@@ -1390,7 +1390,7 @@ gint prefs_actions_find_by_name(const gchar *name)
GSList *act = prefs_common.actions_list;
gchar *action_name, *action_p;
gint action_nb = 0;
-
+
for (; act != NULL; act = act->next) {
action_name = g_strdup((gchar *)act->data);
action_p = strstr(action_name, ": ");
diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
@@ -69,11 +69,11 @@ typedef struct _WritingPage
GtkWidget *checkbtn_warn_pasted_attachments;
} WritingPage;
-static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *window,
+static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
WritingPage *prefs_writing = (WritingPage *) _page;
-
+
GtkWidget *vbox1;
GtkWidget *vbox2;
GtkWidget *checkbtn_autoextedit;
@@ -251,7 +251,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
optmenu_dnd_insert_or_attach, FALSE, FALSE, 0);
PACK_CHECK_BUTTON(vbox1, checkbtn_warn_pasted_attachments, _("Warn when pasting files as attachments"));
-
+
SET_TOGGLE_SENSITIVITY (checkbtn_autosave, spinbtn_autosave_length);
SET_TOGGLE_SENSITIVITY (checkbtn_autosave, label_autosave_length);
SET_TOGGLE_SENSITIVITY (checkbtn_autosave, checkbtn_autosave_encrypted);
@@ -273,7 +273,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
prefs_writing->checkbtn_warn_large_insert = checkbtn_warn_large_insert;
prefs_writing->spinbtn_warn_large_insert_size = spinbtn_warn_large_insert_size;
-
+
prefs_writing->checkbtn_forward_as_attachment =
checkbtn_forward_as_attachment;
prefs_writing->checkbtn_redirect_keep_from = checkbtn_redirect_keep_from;
@@ -323,25 +323,25 @@ static void prefs_compose_writing_save(PrefsPage *_page)
{
WritingPage *page = (WritingPage *) _page;
- prefs_common.auto_exteditor =
+ prefs_common.auto_exteditor =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_autoextedit));
prefs_common.forward_as_attachment =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_forward_as_attachment));
prefs_common.redirect_keep_from =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_redirect_keep_from));
- prefs_common.autosave =
+ prefs_common.autosave =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_autosave));
- prefs_common.autosave_encrypted =
+ prefs_common.autosave_encrypted =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_autosave_encrypted));
prefs_common.autosave_length =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->spinbtn_autosave_length));
- prefs_common.undolevels =
+ prefs_common.undolevels =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->spinbtn_undolevel));
- prefs_common.warn_large_insert =
+ prefs_common.warn_large_insert =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_warn_large_insert));
prefs_common.warn_large_insert_size =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->spinbtn_warn_large_insert_size));
-
+
prefs_common.reply_account_autosel =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_reply_account_autosel));
prefs_common.forward_account_autosel =
@@ -352,10 +352,10 @@ static void prefs_compose_writing_save(PrefsPage *_page)
GTK_TOGGLE_BUTTON(page->checkbtn_reply_with_quote));
prefs_common.default_reply_list =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_reply_list));
-
+
prefs_common.compose_dnd_mode = combobox_get_active_data(
GTK_COMBO_BOX(page->optmenu_dnd_insert_or_attach));
-
+
prefs_common.notify_pasted_attachments =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_warn_pasted_attachments));
}
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
@@ -111,11 +111,11 @@ static gchar *defaults[] =
"Cc",
"Bcc",
"Subject",
- "Date",
+ "Date",
"Reply-To",
"Sender",
"User-Agent",
- "X-Mailer",
+ "X-Mailer",
"Newsgroups",
"Followup-To",
"Organization",
@@ -194,7 +194,7 @@ static void prefs_display_header_create(void)
GtkWidget *checkbtn_other_headers;
gint i;
-
+
debug_print("Creating display header setting window...\n");
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_display_header");
@@ -323,13 +323,13 @@ static void prefs_display_header_create(void)
gtk_container_add(GTK_CONTAINER(list_view_scrolledwin), headers_list_view);
gtk_tree_view_set_reorderable(GTK_TREE_VIEW(headers_list_view), TRUE);
- g_signal_connect(G_OBJECT(headers_list_view), "drag_end",
+ g_signal_connect(G_OBJECT(headers_list_view), "drag_end",
G_CALLBACK(drag_end),
headers_list_view);
-
+
/* connect rows change for this list view's model */
g_signal_connect(G_OBJECT(gtk_tree_view_get_model(GTK_TREE_VIEW(headers_list_view))),
- "rows-reordered",
+ "rows-reordered",
G_CALLBACK(headers_list_model_rows_reordered),
headers_list_view);
@@ -480,7 +480,7 @@ static void prefs_display_header_set_dialog(void)
if (dp->hidden)
prefs_display_header_insert_header(GTK_LIST_STORE
- (model_hidden), dp->name, dp);
+ (model_hidden), dp->name, dp);
else
prefs_display_header_insert_header(GTK_LIST_STORE
(model_list), dp->name, dp);
@@ -507,7 +507,7 @@ static void prefs_display_header_set_list(void)
if (dp)
prefs_common.disphdr_list =
g_slist_append(prefs_common.disphdr_list, dp);
- row++;
+ row++;
}
model = gtk_tree_view_get_model
@@ -515,7 +515,7 @@ static void prefs_display_header_set_list(void)
row = 0;
while (gtk_tree_model_iter_nth_child(model, &iter, NULL, row)) {
gtk_tree_model_get(model, &iter, PREFS_HDR_DATA, &dp, -1);
- if (dp)
+ if (dp)
prefs_common.disphdr_list =
g_slist_append(prefs_common.disphdr_list, dp);
row++;
@@ -577,7 +577,7 @@ static void prefs_display_header_list_view_set_row(gboolean hidden)
dp->name, dp);
prefs_display_header_set_list();
-
+
g_free(entry_text);
}
@@ -599,7 +599,7 @@ static void prefs_display_header_delete_cb(GtkButton *btn, gpointer list_view_da
return;
gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, PREFS_HDR_DATA, &dp, -1);
- if (!dp)
+ if (!dp)
return;
prefs_common.disphdr_list =
@@ -615,18 +615,18 @@ static void prefs_display_header_up(void)
GtkListStore *store = NULL;
GtkTreeModel *model = NULL;
GtkTreeIter iprev;
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(dispheader.headers_list_view)),
- &model,
+ &model,
&isel))
return;
store = (GtkListStore *)model;
sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
if (!sel)
return;
-
+
/* no move if we're at row 0... */
try = gtk_tree_path_copy(sel);
if (!gtk_tree_path_prev(try)) {
@@ -650,7 +650,7 @@ static void prefs_display_header_down(void)
GtkTreeModel *model = NULL;
GtkTreeIter next, sel;
GtkTreePath *try;
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(dispheader.headers_list_view)),
@@ -659,13 +659,13 @@ static void prefs_display_header_down(void)
return;
store = (GtkListStore *)model;
try = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &sel);
- if (!try)
+ if (!try)
return;
-
+
next = sel;
if (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &next))
gtk_list_store_swap(store, &next, &sel);
-
+
gtk_tree_path_free(try);
}
@@ -743,7 +743,7 @@ static GtkWidget *prefs_display_header_list_view_create(const gchar *name)
return list_view;
}
-static void prefs_filtering_create_list_view_columns(GtkWidget *list_view,
+static void prefs_filtering_create_list_view_columns(GtkWidget *list_view,
const gchar *name)
{
GtkTreeViewColumn *column;
@@ -752,14 +752,14 @@ static void prefs_filtering_create_list_view_columns(GtkWidget *list_view,
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(name, renderer, "text", PREFS_HDR_HEADER, NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
}
/*!
*\brief Called as a result of a gtk_list_store_swap()
*/
static void headers_list_model_rows_reordered(GtkTreeModel *model,
- GtkTreePath *path,
+ GtkTreePath *path,
GtkTreeIter *iter,
gpointer arg,
GtkTreeView *list_view)
diff --git a/src/prefs_ext_prog.c b/src/prefs_ext_prog.c
@@ -62,7 +62,7 @@ typedef struct _ExtProgPage
GtkWidget *astextviewer_entry;
} ExtProgPage;
-static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
+static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
ExtProgPage *prefs_ext_prog = (ExtProgPage *) _page;
@@ -124,8 +124,8 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_set_halign(table2, GTK_ALIGN_FILL);
cmds_use_system_default_checkbtn = gtk_check_button_new_with_label(
- _("Use system defaults when possible"));
-
+ _("Use system defaults when possible"));
+
gtk_widget_show(cmds_use_system_default_checkbtn);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cmds_use_system_default_checkbtn),
prefs_common.cmds_use_system_default);
@@ -139,9 +139,9 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
} else
g_free(tmp);
-
+
gtk_grid_attach(GTK_GRID(table2), cmds_use_system_default_checkbtn, 0, i, 2, 1);
-
+
#ifndef G_OS_WIN32
uri_label = gtk_label_new (_("Web browser"));
gtk_widget_show(uri_label);
@@ -195,7 +195,7 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_grid_attach(GTK_GRID(table2), exteditor_combo, 1, i, 1, 1);
exteditor_entry = gtk_bin_get_child(GTK_BIN((exteditor_combo)));
- gtk_entry_set_text(GTK_ENTRY(exteditor_entry),
+ gtk_entry_set_text(GTK_ENTRY(exteditor_entry),
prefs_common.ext_editor_cmd ? prefs_common.ext_editor_cmd : "");
astextviewer_label = gtk_label_new(_("Command for 'Display as text'"));
@@ -212,12 +212,12 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
_("This option enables MIME parts to be displayed in the "
"message view via a script when using the 'Display as text' "
"contextual menu item"));
-
+
gtk_grid_attach(GTK_GRID(table2), astextviewer_entry, 1, i, 1, 1);
gtk_widget_set_hexpand(astextviewer_entry, TRUE);
gtk_widget_set_halign(astextviewer_entry, GTK_ALIGN_FILL);
- gtk_entry_set_text(GTK_ENTRY(astextviewer_entry),
+ gtk_entry_set_text(GTK_ENTRY(astextviewer_entry),
prefs_common.mime_textviewer ? prefs_common.mime_textviewer : "");
#ifndef G_OS_WIN32
@@ -269,7 +269,7 @@ void prefs_ext_prog_init(void)
{
ExtProgPage *page;
static gchar *path[3];
-
+
path[0] = _("Message View");
path[1] = _("External Programs");
path[2] = NULL;
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
@@ -98,8 +98,8 @@ static void prefs_filtering_set_dialog (const gchar *header,
static void prefs_filtering_set_list (void);
/* callback functions */
-static gboolean prefs_filtering_search_func_cb (GtkTreeModel *model, gint column,
- const gchar *key, GtkTreeIter *iter,
+static gboolean prefs_filtering_search_func_cb (GtkTreeModel *model, gint column,
+ const gchar *key, GtkTreeIter *iter,
gpointer search_data);
static void prefs_filtering_register_cb (gpointer action, gpointer data);
static void prefs_filtering_substitute_cb (gpointer action, gpointer data);
@@ -127,7 +127,7 @@ static void prefs_filtering_ok (gpointer action, gpointer data);
static void prefs_filtering_condition_define (gpointer action, gpointer data);
static void prefs_filtering_action_define (gpointer action, gpointer data);
static gint prefs_filtering_list_view_set_row (gint row, FilteringProp * prop);
-
+
static void prefs_filtering_reset_dialog (void);
static gboolean prefs_filtering_rename_tag_func(GNode *node, gpointer data);
static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data);
@@ -143,11 +143,11 @@ static gint prefs_filtering_list_view_insert_rule (GtkListStore *list_store,
const gchar *name,
gint account_id,
const gchar *account_name,
- const gchar *rule,
+ const gchar *rule,
gboolean prop);
-static gchar *prefs_filtering_list_view_get_rule (GtkWidget *list,
+static gchar *prefs_filtering_list_view_get_rule (GtkWidget *list,
gint row);
-static void prefs_filtering_list_view_get_rule_info (GtkWidget *list,
+static void prefs_filtering_list_view_get_rule_info (GtkWidget *list,
gint row,
gboolean *enabled,
gchar **name,
@@ -188,7 +188,7 @@ void prefs_filtering_open(GSList ** p_processing,
manage_window_set_transient(GTK_WINDOW(filtering.window));
gtk_widget_grab_focus(filtering.ok_btn);
-
+
if (title != NULL)
gtk_window_set_title(GTK_WINDOW(filtering.window), title);
else
@@ -212,7 +212,7 @@ void prefs_filtering_open(GSList ** p_processing,
}
p_processing_list = p_processing;
-
+
prefs_filtering_set_dialog(header, key);
if (per_account_filtering) {
gtk_widget_show(filtering.account_label);
@@ -276,7 +276,7 @@ static GtkWidget *prefs_filtering_account_option_menu(Filtering *filtering)
GtkWidget *optmenu = NULL;
GtkWidget *optmenubox = NULL;
GtkListStore *menu = NULL;
-
+
optmenubox = gtk_event_box_new();
optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
@@ -435,7 +435,7 @@ static void prefs_filtering_create(void)
g_signal_connect(G_OBJECT (action_btn), "clicked",
G_CALLBACK(prefs_filtering_action_define),
NULL);
-
+
/* register / substitute / delete */
reg_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show (reg_hbox);
@@ -497,7 +497,7 @@ static void prefs_filtering_create(void)
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- cond_list_view = prefs_filtering_list_view_create();
+ cond_list_view = prefs_filtering_list_view_create();
gtk_widget_show (cond_list_view);
gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_list_view);
@@ -595,11 +595,11 @@ void prefs_filtering_rename_tag(const gchar *old_tag, const gchar *new_tag)
g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
prefs_filtering_rename_tag_func, tags);
}
-
+
rename_tag(pre_global_processing, old_tag, new_tag);
rename_tag(post_global_processing, old_tag, new_tag);
rename_tag(filtering_rules, old_tag, new_tag);
-
+
prefs_matcher_write_config();
}
@@ -619,11 +619,11 @@ void prefs_filtering_rename_path(const gchar *old_path, const gchar *new_path)
g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
prefs_filtering_rename_path_func, paths);
}
-
+
rename_path(pre_global_processing, old_path, new_path);
rename_path(post_global_processing, old_path, new_path);
rename_path(filtering_rules, old_path, new_path);
-
+
prefs_matcher_write_config();
}
@@ -646,7 +646,7 @@ static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
const gchar * new_path;
const gchar ** paths;
FolderItem *item;
-
+
paths = data;
old_path = paths[0];
new_path = paths[1];
@@ -673,12 +673,12 @@ static void rename_tag(GSList * filters,
for (cur = filters; cur != NULL; cur = cur->next) {
FilteringProp *filtering = (FilteringProp *)cur->data;
-
+
for(action_cur = filtering->action_list ; action_cur != NULL ;
action_cur = action_cur->next) {
FilteringAction *action = action_cur->data;
-
+
if (action->type != MATCHACTION_SET_TAG &&
action->type != MATCHACTION_UNSET_TAG)
continue;
@@ -699,7 +699,7 @@ static gboolean prefs_filtering_rename_tag_func(GNode *node, gpointer data)
const gchar * new_tag;
const gchar ** tags;
FolderItem *item;
-
+
tags = data;
old_tag = tags[0];
new_tag = tags[1];
@@ -730,7 +730,7 @@ void prefs_filtering_delete_path(const gchar *path)
delete_path(&pre_global_processing, path);
delete_path(&post_global_processing, path);
delete_path(&filtering_rules, path);
-
+
prefs_matcher_write_config();
}
@@ -744,32 +744,32 @@ static void delete_path(GSList ** p_filters, const gchar * path)
gint pathlen;
GSList * action_cur;
GSList * cur;
-
+
filters = *p_filters;
pathlen = strlen(path);
duplist = g_slist_copy(filters);
for (cur = duplist ; cur != NULL; cur = g_slist_next(cur)) {
FilteringProp *filtering = (FilteringProp *) cur->data;
-
+
for(action_cur = filtering->action_list ; action_cur != NULL ;
action_cur = action_cur->next) {
-
+
FilteringAction *action;
-
+
action = action_cur->data;
-
+
if (action->type == MATCHACTION_SET_TAG ||
action->type == MATCHACTION_UNSET_TAG)
continue;
- if (!action->destination)
+ if (!action->destination)
continue;
-
+
destlen = strlen(action->destination);
-
+
if (destlen > pathlen) {
prefixlen = destlen - pathlen;
suffix = action->destination + prefixlen;
-
+
if ((suffix && !strncmp(path, suffix, pathlen)) && filtering) {
filters = g_slist_remove(filters, filtering);
filteringprop_free(filtering);
@@ -781,9 +781,9 @@ static void delete_path(GSList ** p_filters, const gchar * path)
filtering = NULL;
}
}
- }
+ }
g_slist_free(duplist);
-
+
* p_filters = filters;
}
@@ -792,7 +792,7 @@ static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data)
const gchar *path = data;
FolderItem *item;
GSList ** p_filters;
-
+
cm_return_val_if_fail(path != NULL, FALSE);
cm_return_val_if_fail(node != NULL, FALSE);
@@ -800,7 +800,7 @@ static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data)
if (!item || !item->prefs)
return FALSE;
p_filters = &item->prefs->processing;
-
+
delete_path(p_filters, path);
return FALSE;
@@ -811,7 +811,7 @@ static void prefs_filtering_clear_list(GtkListStore *list_store)
gtk_list_store_clear(list_store);
/* add the place holder (New) at row 0 */
- prefs_filtering_list_view_insert_rule(list_store, -1,
+ prefs_filtering_list_view_insert_rule(list_store, -1,
FALSE,
_("(New)"),
0,
@@ -827,7 +827,7 @@ static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
GSList * prefs_filtering;
gchar *cond_str;
GtkListStore *list_store;
-
+
list_store = GTK_LIST_STORE(gtk_tree_view_get_model(list_view));
prefs_filtering_clear_list(list_store);
@@ -849,13 +849,13 @@ static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
cond_str = filteringprop_to_string(prop);
subst_char(cond_str, '\t', ':');
- prefs_filtering_list_view_insert_rule(list_store, -1,
+ prefs_filtering_list_view_insert_rule(list_store, -1,
prop->enabled,
prop->name,
prop->account_id,
account_name,
cond_str, TRUE);
-
+
g_free(cond_str);
}
@@ -866,11 +866,11 @@ static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
gchar *match_str;
quoted_key = matcher_quote_str(key);
-
+
match_str = g_strconcat(header, " ", get_matchparser_tab_str(MATCHTYPE_MATCHCASE),
" \"", quoted_key, "\"", NULL);
g_free(quoted_key);
-
+
gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), match_str);
g_free(match_str);
}
@@ -884,8 +884,8 @@ static void prefs_filtering_reset_dialog(void)
gtk_entry_set_text(GTK_ENTRY(filtering.action_entry), "");
}
-static gboolean prefs_filtering_search_func_cb (GtkTreeModel *model, gint column, const gchar *key,
- GtkTreeIter *iter, gpointer search_data)
+static gboolean prefs_filtering_search_func_cb (GtkTreeModel *model, gint column, const gchar *key,
+ GtkTreeIter *iter, gpointer search_data)
{
gchar *store_string;
gboolean retval;
@@ -920,7 +920,7 @@ static void prefs_filtering_set_list(void)
filteringprop_free((FilteringProp *) cur->data);
g_slist_free(prefs_filtering);
prefs_filtering = NULL;
-
+
while (NULL != (filtering_str = prefs_filtering_list_view_get_rule
(filtering.cond_list_view, row))) {
@@ -941,15 +941,15 @@ static void prefs_filtering_set_list(void)
g_free(prop->name);
prop->name = name;
prop->account_id = account_id;
- prefs_filtering =
+ prefs_filtering =
g_slist_append(prefs_filtering, prop);
}
}
g_free(filtering_str);
row++;
- }
-
+ }
+
*p_processing_list = prefs_filtering;
}
@@ -1019,7 +1019,7 @@ static void prefs_filtering_condition_define(gpointer action, gpointer data)
if (matchers == NULL)
alertpanel_error(_("Condition string is not valid."));
}
-
+
g_free(cond_str);
prefs_matcher_open(matchers, prefs_filtering_condition_define_done);
@@ -1055,7 +1055,7 @@ static void prefs_filtering_action_define(gpointer action, gpointer data)
if (action_list == NULL)
alertpanel_error(_("Action string is not valid."));
}
-
+
g_free(action_str);
prefs_filtering_action_open(action_list,
@@ -1085,7 +1085,7 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(gboolean alert)
GSList * action_list;
name = gtk_editable_get_chars(GTK_EDITABLE(filtering.name_entry), 0, -1);
-
+
account_id = combobox_get_active_data(GTK_COMBO_BOX(filtering.account_combobox));
cond_str = gtk_editable_get_chars(GTK_EDITABLE(filtering.cond_entry), 0, -1);
@@ -1093,7 +1093,7 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(gboolean alert)
if(alert == TRUE) alertpanel_error(_("Condition string is empty."));
goto fail;
}
-
+
action_str = gtk_editable_get_chars(GTK_EDITABLE(filtering.action_entry), 0, -1);
if (*action_str == '\0') {
if(alert == TRUE) alertpanel_error(_("Action string is empty."));
@@ -1106,9 +1106,9 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(gboolean alert)
if(alert == TRUE) alertpanel_error(_("Condition string is not valid."));
goto fail;
}
-
+
action_list = matcher_parser_get_action_list(action_str);
-
+
if (action_list == NULL) {
if(alert == TRUE) alertpanel_error(_("Action string is not valid."));
@@ -1127,12 +1127,12 @@ fail:
static void prefs_filtering_register_cb(gpointer action, gpointer data)
{
FilteringProp *prop;
-
+
prop = prefs_filtering_dialog_to_filtering(TRUE);
if (prop == NULL)
return;
prefs_filtering_list_view_set_row(-1, prop);
-
+
filteringprop_free(prop);
prefs_filtering_reset_dialog();
@@ -1147,16 +1147,16 @@ static void prefs_filtering_substitute_cb(gpointer action, gpointer data)
gboolean enabled;
gchar *name;
gint account_id;
-
+
if (selected_row <= 0)
return;
prop = prefs_filtering_dialog_to_filtering(TRUE);
- if (prop == NULL)
+ if (prop == NULL)
return;
- /* prop->emabled is always TRUE here, re-use the value from the selected row
+ /* prop->emabled is always TRUE here, re-use the value from the selected row
as we don't substitute this value from dialog */
prefs_filtering_list_view_get_rule_info(
filtering.cond_list_view, selected_row,
@@ -1180,10 +1180,10 @@ static void prefs_filtering_delete_cb(gpointer action, gpointer data)
GtkTreeModel *model;
GtkTreeIter iter;
gint selected_row;
-
+
selected_row = gtkut_list_view_get_selected_row(filtering.cond_list_view);
- if (selected_row <= 0)
- return;
+ if (selected_row <= 0)
+ return;
if (alertpanel(_("Delete rule"),
_("Do you really want to delete this rule?"),
@@ -1191,7 +1191,7 @@ static void prefs_filtering_delete_cb(gpointer action, gpointer data)
ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
return;
- model = gtk_tree_view_get_model(list_view);
+ model = gtk_tree_view_get_model(list_view);
if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, selected_row))
return;
@@ -1204,7 +1204,7 @@ static void prefs_filtering_delete_cb(gpointer action, gpointer data)
static void prefs_filtering_delete_all_cb(gpointer action, gpointer data)
{
GtkListStore *list_store;
-
+
if (alertpanel(_("Delete all rules"),
_("Do you really want to delete all the rules?"),
NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
@@ -1226,20 +1226,20 @@ static void prefs_filtering_clear_cb(gpointer action, gpointer data)
static void prefs_filtering_duplicate_cb(gpointer action, gpointer data)
{
gint selected_row = gtkut_list_view_get_selected_row
- (filtering.cond_list_view);
+ (filtering.cond_list_view);
FilteringProp *prop;
gboolean enabled;
gchar *name;
gint account_id;
- if (selected_row <= 0)
- return;
-
+ if (selected_row <= 0)
+ return;
+
prop = prefs_filtering_dialog_to_filtering(TRUE);
if (prop == NULL)
return;
- /* prop->emabled is always TRUE here, re-use the value from the selected row
+ /* prop->emabled is always TRUE here, re-use the value from the selected row
as we don't substitute this value from dialog */
prefs_filtering_list_view_get_rule_info(
filtering.cond_list_view, selected_row,
@@ -1248,7 +1248,7 @@ static void prefs_filtering_duplicate_cb(gpointer action, gpointer data)
prop->enabled = enabled;
prefs_filtering_list_view_set_row(-selected_row-2, prop);
-
+
filteringprop_free(prop);
prefs_filtering_reset_dialog();
@@ -1262,11 +1262,11 @@ static void prefs_filtering_top(gpointer action, gpointer data)
GtkTreeModel *model;
row = gtkut_list_view_get_selected_row(filtering.cond_list_view);
- if (row <= 1)
+ if (row <= 1)
return;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
-
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
+
if (!gtk_tree_model_iter_nth_child(model, &top, NULL, 0)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, row))
return;
@@ -1284,7 +1284,7 @@ static void prefs_filtering_page_up(gpointer action, gpointer data)
GtkTreePath *path;
GdkRectangle cell_rect, view_rect;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
row = gtkut_list_view_get_selected_row(filtering.cond_list_view);
if (row <= 1)
return;
@@ -1314,10 +1314,10 @@ static void prefs_filtering_up(gpointer action, gpointer data)
GtkTreeModel *model;
row = gtkut_list_view_get_selected_row(filtering.cond_list_view);
- if (row <= 1)
+ if (row <= 1)
return;
-
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
+
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row - 1)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, row))
@@ -1334,7 +1334,7 @@ static void prefs_filtering_down(gpointer action, gpointer data)
GtkTreeIter top, sel;
GtkTreeModel *model;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
n_rows = gtk_tree_model_iter_n_children(model, NULL);
row = gtkut_list_view_get_selected_row(filtering.cond_list_view);
if (row < 1 || row >= n_rows - 1)
@@ -1343,7 +1343,7 @@ static void prefs_filtering_down(gpointer action, gpointer data)
if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, row + 1))
return;
-
+
gtk_list_store_swap(GTK_LIST_STORE(model), &top, &sel);
gtkut_list_view_select_row(filtering.cond_list_view, row + 1);
modified = TRUE;
@@ -1357,7 +1357,7 @@ static void prefs_filtering_page_down(gpointer action, gpointer data)
GtkTreePath *path;
GdkRectangle cell_rect, view_rect;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
n_rows = gtk_tree_model_iter_n_children(model, NULL);
row = gtkut_list_view_get_selected_row(filtering.cond_list_view);
if (row < 1 || row >= n_rows -1)
@@ -1388,7 +1388,7 @@ static void prefs_filtering_bottom(gpointer action, gpointer data)
GtkTreeIter top, sel;
GtkTreeModel *model;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
n_rows = gtk_tree_model_iter_n_children(model, NULL);
row = gtkut_list_view_get_selected_row(filtering.cond_list_view);
if (row < 1 || row >= n_rows - 1)
@@ -1398,7 +1398,7 @@ static void prefs_filtering_bottom(gpointer action, gpointer data)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, n_rows - 1))
return;
- gtk_list_store_move_after(GTK_LIST_STORE(model), &top, &sel);
+ gtk_list_store_move_after(GTK_LIST_STORE(model), &top, &sel);
gtkut_list_view_select_row(filtering.cond_list_view, n_rows - 1);
modified = TRUE;
}
@@ -1414,12 +1414,12 @@ static void prefs_filtering_select_set(FilteringProp *prop)
if (matcher_str == NULL) {
return;
}
-
+
if (prop->name != NULL)
gtk_entry_set_text(GTK_ENTRY(filtering.name_entry), prop->name);
combobox_select_by_data(GTK_COMBO_BOX(filtering.account_combobox), prop->account_id);
-
+
gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), matcher_str);
action_str = filteringaction_list_to_string(prop->action_list);
@@ -1442,7 +1442,7 @@ static gboolean prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *even
{
if (event && event->keyval == GDK_KEY_Escape) {
prefs_filtering_cancel(NULL, NULL);
- return TRUE;
+ return TRUE;
}
return FALSE;
}
@@ -1454,9 +1454,9 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
gchar * filtering_str;
gint row = 1;
AlertValue val;
-
+
prop = prefs_filtering_dialog_to_filtering(FALSE);
-
+
if (check_changed_list) {
if (modified && alertpanel(_("Filtering rules not saved"),
_("The list of filtering rules have been modified. Close anyway?"),
@@ -1467,7 +1467,7 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
return TRUE;
}
}
-
+
/* check if a rule is being edited */
if (prop != NULL) {
str = filteringprop_to_string(prop);
@@ -1479,7 +1479,7 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
break;
row++;
g_free(filtering_str);
- }
+ }
if (!filtering_str) {
val = alertpanel(_("Entry not saved"),
@@ -1492,7 +1492,7 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
filteringprop_free(prop);
return TRUE;
}
- }
+ }
g_free(filtering_str);
g_free(str);
@@ -1502,8 +1502,8 @@ static gboolean prefs_filtering_check_mod(gboolean check_changed_list)
name = gtk_editable_get_chars(GTK_EDITABLE(filtering.name_entry), 0, -1);
condition = gtk_editable_get_chars(GTK_EDITABLE(filtering.cond_entry), 0, -1);
action = gtk_editable_get_chars(GTK_EDITABLE(filtering.action_entry), 0, -1);
- if (strlen(name) ||
- strlen(condition) ||
+ if (strlen(name) ||
+ strlen(condition) ||
strlen(action)) {
val = alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
@@ -1580,7 +1580,7 @@ static gint prefs_filtering_list_view_insert_rule(GtkListStore *list_store,
gint account_id,
const gchar *account_name,
const gchar *rule,
- gboolean prop)
+ gboolean prop)
{
GtkTreeIter iter;
GtkTreeIter sibling;
@@ -1593,13 +1593,13 @@ static gint prefs_filtering_list_view_insert_rule(GtkListStore *list_store,
} else if (row < -1) {
if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(list_store),
&sibling, NULL, -row-2))
- row = -1;
+ row = -1;
}
if (row == -1 ) {
/* append new */
gtk_list_store_append(list_store, &iter);
- gtk_list_store_set(list_store, &iter,
+ gtk_list_store_set(list_store, &iter,
PREFS_FILTERING_ENABLED, enabled,
PREFS_FILTERING_NAME, name,
PREFS_FILTERING_ACCOUNT_ID, account_id,
@@ -1612,7 +1612,7 @@ static gint prefs_filtering_list_view_insert_rule(GtkListStore *list_store,
} else if (row < -1) {
/* duplicate */
gtk_list_store_insert_after(list_store, &iter, &sibling);
- gtk_list_store_set(list_store, &iter,
+ gtk_list_store_set(list_store, &iter,
PREFS_FILTERING_ENABLED, enabled,
PREFS_FILTERING_NAME, name,
PREFS_FILTERING_ACCOUNT_ID, account_id,
@@ -1624,14 +1624,14 @@ static gint prefs_filtering_list_view_insert_rule(GtkListStore *list_store,
NULL) - 1;
} else {
/* change existing */
- gtk_list_store_set(list_store, &iter,
+ gtk_list_store_set(list_store, &iter,
PREFS_FILTERING_ENABLED, enabled,
PREFS_FILTERING_NAME, name,
PREFS_FILTERING_ACCOUNT_ID, account_id,
PREFS_FILTERING_ACCOUNT_NAME, account_name,
PREFS_FILTERING_RULE, rule,
-1);
- return row;
+ return row;
}
}
@@ -1639,7 +1639,7 @@ static gint prefs_filtering_list_view_insert_rule(GtkListStore *list_store,
*\return gchar * Rule at specified row - should be freed.
*/
static gchar *prefs_filtering_list_view_get_rule(GtkWidget *list, gint row)
-{
+{
GtkTreeView *list_view = GTK_TREE_VIEW(list);
GtkTreeModel *model = gtk_tree_view_get_model(list_view);
GtkTreeIter iter;
@@ -1647,17 +1647,17 @@ static gchar *prefs_filtering_list_view_get_rule(GtkWidget *list, gint row)
if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, row))
return NULL;
-
- gtk_tree_model_get(model, &iter,
+
+ gtk_tree_model_get(model, &iter,
PREFS_FILTERING_RULE, &result,
-1);
-
+
return result;
}
static void prefs_filtering_list_view_get_rule_info(GtkWidget *list, gint row,
gboolean *enabled, gchar **name, gint *account_id)
-{
+{
GtkTreeView *list_view = GTK_TREE_VIEW(list);
GtkTreeModel *model = gtk_tree_view_get_model(list_view);
GtkTreeIter iter;
@@ -1666,7 +1666,7 @@ static void prefs_filtering_list_view_get_rule_info(GtkWidget *list, gint row,
*name = NULL;
if (gtk_tree_model_iter_nth_child(model, &iter, NULL, row)) {
- gtk_tree_model_get(model, &iter,
+ gtk_tree_model_get(model, &iter,
PREFS_FILTERING_ENABLED, enabled,
PREFS_FILTERING_NAME, name,
PREFS_FILTERING_ACCOUNT_ID, account_id,
@@ -1691,10 +1691,10 @@ static void prefs_filtering_row_selected(GtkTreeSelection *selection,
GtkTreePath *path;
GtkTreeIter iter;
GtkTreeModel *model;
-
+
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
-
+
path = gtk_tree_model_get_path(model, &iter);
prefs_filtering_select_row(list_view, path);
gtk_tree_path_free(path);
@@ -1756,10 +1756,10 @@ static gboolean prefs_filtering_list_popup_menu(GtkWidget *widget, gpointer data
{
GtkTreeView *list_view = (GtkTreeView *)data;
GdkEventButton event;
-
+
event.button = 3;
event.time = gtk_get_current_event_time();
-
+
prefs_filtering_list_btn_pressed(NULL, &event, list_view);
return TRUE;
@@ -1784,7 +1784,7 @@ static GtkWidget *prefs_filtering_list_view_create(void)
G_CALLBACK(prefs_filtering_list_btn_pressed), list_view);
gtk_tree_view_set_reorderable(list_view, TRUE);
-
+
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
g_signal_connect(G_OBJECT(selector), "changed",
@@ -1856,7 +1856,7 @@ static void prefs_filtering_create_list_view_columns(GtkWidget *list_view)
gtk_tree_view_column_set_resizable(column, TRUE);
filtering.account_name_column = column;
-
+
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(_("Rule"),
@@ -1866,8 +1866,8 @@ static void prefs_filtering_create_list_view_columns(GtkWidget *list_view)
gtk_tree_view_set_search_column(GTK_TREE_VIEW(list_view), PREFS_FILTERING_NAME);
gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(list_view), prefs_filtering_search_func_cb , NULL, NULL);
-
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
}
/*!
@@ -1912,7 +1912,7 @@ static void prefs_filtering_select_row(GtkTreeView *list_view, GtkTreePath *path
prop->account_id = account_id;
prefs_filtering_select_set(prop);
filteringprop_free(prop);
- }
+ }
g_free(name);
g_free(filtering_str);
} else
diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c
@@ -117,28 +117,28 @@ static void prefs_folder_column_insert_column (GtkListStore *store,
gint row,
const gchar *name,
FolderColumnType type);
-
-static FolderColumnType prefs_folder_column_get_column (GtkWidget *list,
+
+static FolderColumnType prefs_folder_column_get_column (GtkWidget *list,
gint row);
static GtkWidget *prefs_folder_column_list_view_create (const gchar *name);
-static void prefs_filtering_create_list_view_columns (GtkWidget *list_view,
+static void prefs_filtering_create_list_view_columns (GtkWidget *list_view,
const gchar *name);
-static void drag_data_get (GtkTreeView *tree_view,
- GdkDragContext *context,
- GtkSelectionData *data,
- guint info,
- guint time,
+static void drag_data_get (GtkTreeView *tree_view,
+ GdkDragContext *context,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
GtkTreeModel *model);
-
-static void drag_data_received (GtkTreeView *tree_view,
+
+static void drag_data_received (GtkTreeView *tree_view,
GdkDragContext *context,
- gint x, gint y,
+ gint x, gint y,
GtkSelectionData *data,
- guint info,
- guint time,
+ guint info,
+ guint time,
GtkTreeModel *model);
static void prefs_folder_column_shown_set_btn_sensitivity(void);
@@ -359,7 +359,7 @@ static void prefs_folder_column_create(void)
folder_col.cancel_btn = cancel_btn;
folder_col.stock_list_view = stock_list_view;
folder_col.shown_list_view = shown_list_view;
-
+
prefs_folder_column_shown_set_active(FALSE);
prefs_folder_column_stock_set_active(FALSE);
}
@@ -477,12 +477,12 @@ static void prefs_folder_column_add(void)
gboolean shown_sel_valid;
gchar *name;
FolderColumnType type;
-
+
stock_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(folder_col.stock_list_view)));
shown_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(folder_col.shown_list_view)));
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(folder_col.stock_list_view)),
@@ -495,23 +495,23 @@ static void prefs_folder_column_add(void)
(GTK_TREE_VIEW(folder_col.shown_list_view)),
NULL,
&shown_sel);
-
+
gtk_tree_model_get(GTK_TREE_MODEL(stock_store), &stock_sel,
SUMCOL_TYPE, &type,
-1);
-
+
gtk_list_store_remove(stock_store, &stock_sel);
- gtk_list_store_insert_after(shown_store, &shown_add,
+ gtk_list_store_insert_after(shown_store, &shown_add,
shown_sel_valid ? &shown_sel : NULL);
- name = gettext(col_name[type]);
-
+ name = gettext(col_name[type]);
+
gtk_list_store_set(shown_store, &shown_add,
SUMCOL_NAME, name,
SUMCOL_TYPE, type,
-1);
-
+
gtk_tree_selection_select_iter(gtk_tree_view_get_selection
(GTK_TREE_VIEW(folder_col.shown_list_view)),
&shown_add);
@@ -526,12 +526,12 @@ static void prefs_folder_column_remove(void)
gboolean stock_sel_valid;
gchar *name;
FolderColumnType type;
-
+
stock_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(folder_col.stock_list_view)));
shown_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(folder_col.shown_list_view)));
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(folder_col.shown_list_view)),
@@ -544,23 +544,23 @@ static void prefs_folder_column_remove(void)
(GTK_TREE_VIEW(folder_col.stock_list_view)),
NULL,
&stock_sel);
-
+
gtk_tree_model_get(GTK_TREE_MODEL(shown_store), &shown_sel,
SUMCOL_TYPE, &type,
-1);
-
+
gtk_list_store_remove(shown_store, &shown_sel);
- gtk_list_store_insert_after(stock_store, &stock_add,
+ gtk_list_store_insert_after(stock_store, &stock_add,
stock_sel_valid ? &stock_sel : NULL);
- name = gettext(col_name[type]);
-
+ name = gettext(col_name[type]);
+
gtk_list_store_set(stock_store, &stock_add,
SUMCOL_NAME, name,
SUMCOL_TYPE, type,
-1);
-
+
gtk_tree_selection_select_iter(gtk_tree_view_get_selection
(GTK_TREE_VIEW(folder_col.stock_list_view)),
&stock_add);
@@ -574,7 +574,7 @@ static void prefs_folder_column_up(void)
GtkTreeIter isel;
GtkListStore *shown_store;
GtkTreeIter iprev;
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(folder_col.shown_list_view)),
@@ -585,12 +585,12 @@ static void prefs_folder_column_up(void)
shown_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(folder_col.shown_list_view)));
- sel = gtk_tree_model_get_path(GTK_TREE_MODEL(shown_store),
+ sel = gtk_tree_model_get_path(GTK_TREE_MODEL(shown_store),
&isel);
if (!sel)
return;
- prev = gtk_tree_path_copy(sel);
+ prev = gtk_tree_path_copy(sel);
if (!gtk_tree_path_prev(prev)) {
gtk_tree_path_free(prev);
gtk_tree_path_free(sel);
@@ -610,7 +610,7 @@ static void prefs_folder_column_down(void)
{
GtkListStore *shown_store;
GtkTreeIter next, sel;
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(folder_col.shown_list_view)),
@@ -622,11 +622,11 @@ static void prefs_folder_column_down(void)
(GTK_TREE_VIEW(folder_col.shown_list_view)));
next = sel;
- if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(shown_store), &next))
+ if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(shown_store), &next))
return;
gtk_list_store_swap(shown_store, &next, &sel);
- prefs_folder_column_shown_set_btn_sensitivity();
+ prefs_folder_column_shown_set_btn_sensitivity();
}
static void prefs_folder_column_set_to_default(void)
@@ -684,7 +684,7 @@ static void prefs_folder_column_insert_column(GtkListStore *store,
if (row >= 0) {
if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store),
&iter, NULL, row))
- row = -1;
+ row = -1;
}
if (row < 0) {
/* add new */
@@ -696,7 +696,7 @@ static void prefs_folder_column_insert_column(GtkListStore *store,
return;
} else {
/* change existing */
- gtk_list_store_set(store, &iter,
+ gtk_list_store_set(store, &iter,
SUMCOL_NAME, name,
SUMCOL_TYPE, type,
-1);
@@ -707,7 +707,7 @@ static void prefs_folder_column_insert_column(GtkListStore *store,
*\brief Return the columnn type for a row
*/
static FolderColumnType prefs_folder_column_get_column(GtkWidget *list, gint row)
-{
+{
GtkTreeView *list_view = GTK_TREE_VIEW(list);
GtkTreeModel *model = gtk_tree_view_get_model(list_view);
GtkTreeIter iter;
@@ -716,7 +716,7 @@ static FolderColumnType prefs_folder_column_get_column(GtkWidget *list, gint row
if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, row))
return -1;
- gtk_tree_model_get(model, &iter,
+ gtk_tree_model_get(model, &iter,
SUMCOL_TYPE, &result,
-1);
@@ -741,12 +741,12 @@ static GtkWidget *prefs_folder_column_list_view_create(const gchar *name)
gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(list_view),
GDK_BUTTON1_MASK,
row_targets,
- G_N_ELEMENTS(row_targets),
+ G_N_ELEMENTS(row_targets),
GDK_ACTION_MOVE);
- gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(list_view),
- row_targets,
- G_N_ELEMENTS(row_targets),
+ gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(list_view),
+ row_targets,
+ G_N_ELEMENTS(row_targets),
GDK_ACTION_MOVE);
g_signal_connect(G_OBJECT(list_view), "drag_data_get",
@@ -760,7 +760,7 @@ static GtkWidget *prefs_folder_column_list_view_create(const gchar *name)
return list_view;
}
-static void prefs_filtering_create_list_view_columns(GtkWidget *list_view,
+static void prefs_filtering_create_list_view_columns(GtkWidget *list_view,
const gchar *name)
{
GtkTreeViewColumn *column;
@@ -769,26 +769,26 @@ static void prefs_filtering_create_list_view_columns(GtkWidget *list_view,
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(name, renderer, "text", SUMCOL_NAME, NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
}
-static void drag_data_get(GtkTreeView *tree_view, GdkDragContext *context,
- GtkSelectionData *data, guint info,
+static void drag_data_get(GtkTreeView *tree_view, GdkDragContext *context,
+ GtkSelectionData *data, guint info,
guint time, GtkTreeModel *model)
{
GtkTreeIter iter;
FolderColumnType type;
GtkTreeModel *source_model;
- if (info != TARGET_INFO_SUMCOL)
+ if (info != TARGET_INFO_SUMCOL)
return;
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection(tree_view),
- &source_model, &iter))
- return;
-
- gtk_tree_model_get(source_model, &iter,
+ &source_model, &iter))
+ return;
+
+ gtk_tree_model_get(source_model, &iter,
SUMCOL_TYPE, &type,
-1);
@@ -812,11 +812,11 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
source = gtk_drag_get_source_widget(context);
if (source == GTK_WIDGET(tree_view)) {
-
+
/*
* Same widget: re-order
*/
-
+
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(tree_view),
NULL, &isel)) {
sel = gtk_tree_model_get_path(model, &isel);
@@ -828,7 +828,7 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
if (dst)
gtk_tree_model_get_iter(model, &idst, dst);
- else
+ else
gtk_list_store_move_before(GTK_LIST_STORE(model),
&isel,
NULL);
@@ -846,15 +846,15 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
gtk_list_store_move_after(GTK_LIST_STORE(model),
&isel,
&idst);
- }
+ }
gtk_tree_path_free(dst);
gtk_tree_path_free(sel);
}
gtk_drag_finish(context, TRUE, FALSE, time);
- } else if (source == folder_col.stock_list_view
+ } else if (source == folder_col.stock_list_view
|| source == folder_col.shown_list_view) {
-
+
/*
* Other widget: change and update
*/
@@ -911,14 +911,14 @@ static void prefs_folder_column_shown_set_btn_sensitivity(void)
GTK_TREE_VIEW(folder_col.shown_list_view));
GtkTreeIter iter;
GtkTreePath *path;
-
+
if(!gtk_tree_selection_get_selected(selection, NULL, &iter)) {
gtk_widget_set_sensitive(folder_col.remove_btn, FALSE);
gtk_widget_set_sensitive(folder_col.up_btn, FALSE);
gtk_widget_set_sensitive(folder_col.down_btn, FALSE);
return;
}
-
+
path = gtk_tree_model_get_path(model, &iter);
gtk_widget_set_sensitive(folder_col.up_btn, gtk_tree_path_prev(path));
@@ -930,14 +930,14 @@ static void prefs_folder_column_shown_set_btn_sensitivity(void)
static void prefs_folder_column_shown_set_active(const gboolean active)
{
GtkTreeSelection *selection = NULL;
-
+
gtk_widget_set_sensitive(folder_col.remove_btn, active);
-
+
if(active == FALSE) {
selection = gtk_tree_view_get_selection(
GTK_TREE_VIEW(folder_col.shown_list_view));
gtk_tree_selection_unselect_all(selection);
-
+
gtk_widget_set_sensitive(folder_col.up_btn, FALSE);
gtk_widget_set_sensitive(folder_col.down_btn, FALSE);
} else {
@@ -948,9 +948,9 @@ static void prefs_folder_column_shown_set_active(const gboolean active)
static void prefs_folder_column_stock_set_active(const gboolean active)
{
GtkTreeSelection *selection = NULL;
-
+
gtk_widget_set_sensitive(folder_col.add_btn, active);
-
+
if(active == FALSE) {
selection = gtk_tree_view_get_selection(
GTK_TREE_VIEW(folder_col.stock_list_view));
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* alfons - all folder item specific settings should migrate into
- * folderlist.xml!!! the old folderitemrc file will only serve for a few
+/* alfons - all folder item specific settings should migrate into
+ * folderlist.xml!!! the old folderitemrc file will only serve for a few
* versions (for compatibility) */
#ifdef HAVE_CONFIG_H
@@ -239,7 +239,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
GtkWidget *hbox, *hbox2, *hbox_spc;
GtkWidget *box1, *box2;
GtkWidget *label;
-
+
GtkListStore *folder_type_menu;
GtkWidget *folder_type;
GtkTreeIter iter;
@@ -304,7 +304,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
gtk_grid_attach(GTK_GRID(table), no_save_warning, 0, rowcount, 1, 1);
rowcount++;
}
-
+
/* Apply to subfolders */
label = gtk_label_new(_("Apply to\nsubfolders"));
gtk_grid_attach(GTK_GRID(table), label, 2, rowcount, 1, 1);
@@ -368,7 +368,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
checkbtn_simplify_subject = gtk_check_button_new_with_label(_("Simplify Subject RegExp"));
gtk_box_pack_start(GTK_BOX(box2), checkbtn_simplify_subject, FALSE, FALSE, 0);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_simplify_subject),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_simplify_subject),
item->prefs->enable_simplify_subject);
g_signal_connect(G_OBJECT(checkbtn_simplify_subject), "toggled",
G_CALLBACK(folder_regexp_set_subject_example_cb), page);
@@ -376,7 +376,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
entry_simplify_subject = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(box2), entry_simplify_subject, TRUE, TRUE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, entry_simplify_subject);
- gtk_entry_set_text(GTK_ENTRY(entry_simplify_subject),
+ gtk_entry_set_text(GTK_ENTRY(entry_simplify_subject),
SAFE_STRING(item->prefs->simplify_subject_regexp));
g_signal_connect(G_OBJECT(entry_simplify_subject), "changed",
@@ -401,14 +401,14 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
entry_regexp_test_string = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(box2), entry_regexp_test_string, TRUE, TRUE, 0);
gtk_grid_attach(GTK_GRID(table), box1, 0, rowcount, 1, 1);
-
+
SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, entry_regexp_test_string);
g_signal_connect(G_OBJECT(entry_regexp_test_string), "changed",
G_CALLBACK(folder_regexp_test_cb), page);
rowcount++;
-
+
/* Test result */
box1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
box2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
@@ -435,7 +435,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
checkbtn_folder_chmod = gtk_check_button_new_with_label(_("Folder chmod"));
gtk_box_pack_start(GTK_BOX(box2), checkbtn_folder_chmod, FALSE, FALSE, 0);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_chmod),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_chmod),
item->prefs->enable_folder_chmod);
entry_folder_chmod = gtk_entry_new();
@@ -448,13 +448,13 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
gtk_entry_set_text(GTK_ENTRY(entry_folder_chmod), buf);
g_free(buf);
}
-
+
gtk_grid_attach(GTK_GRID(table), box1, 0, rowcount, 1, 1);
folder_chmod_rec_checkbtn = gtk_check_button_new();
gtk_grid_attach(GTK_GRID(table), folder_chmod_rec_checkbtn, 2, rowcount, 1, 1);
rowcount++;
-
+
/* Folder color */
box1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
box2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
@@ -489,12 +489,12 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
gtk_check_button_new_with_label(_("Run Processing rules at start-up"));
gtk_grid_attach(GTK_GRID(table), checkbtn_enable_processing, 0, rowcount, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_processing),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_processing),
item->prefs->enable_processing);
enable_processing_rec_checkbtn = gtk_check_button_new();
gtk_grid_attach(GTK_GRID(table), enable_processing_rec_checkbtn, 2, rowcount, 1, 1);
-
+
rowcount++;
/* Enable processing rules when opening folder */
@@ -502,7 +502,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
gtk_check_button_new_with_label(_("Run Processing rules when opening"));
gtk_grid_attach(GTK_GRID(table), checkbtn_enable_processing_when_opening, 0, rowcount, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_processing_when_opening),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_processing_when_opening),
item->prefs->enable_processing_when_opening);
enable_processing_when_opening_rec_checkbtn = gtk_check_button_new();
@@ -623,11 +623,11 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
gtk_grid_attach(GTK_GRID(table), skip_on_goto_unread_or_new_rec_checkbtn, 2, rowcount, 1, 1);
rowcount++;
-
+
/* Synchronise folder for offline use */
checkbtn_offlinesync = gtk_check_button_new_with_label(_("Synchronise for offline use"));
gtk_grid_attach(GTK_GRID(table), checkbtn_offlinesync, 0, rowcount, 1, 1);
-
+
offlinesync_rec_checkbtn = gtk_check_button_new();
gtk_grid_attach(GTK_GRID(table), offlinesync_rec_checkbtn, 2, rowcount, 1, 1);
@@ -672,7 +672,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
SET_TOGGLE_SENSITIVITY (checkbtn_offlinesync, hbox);
SET_TOGGLE_SENSITIVITY (checkbtn_offlinesync, hbox2);
-
+
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
clean_cache_btn = gtk_button_new_with_label(_("Discard folder cache"));
gtk_box_pack_start (GTK_BOX (hbox), clean_cache_btn, FALSE, FALSE, 0);
@@ -691,7 +691,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
gtk_widget_set_size_request(label_regexp_test, MAX(100, MAX(wreq1, wreq2)), -1);
gtk_widget_set_size_request(label_regexp_result, MAX(100, MAX(wreq1, wreq2)), -1);
- if (item->folder && (item->folder->klass->type != F_IMAP &&
+ if (item->folder && (item->folder->klass->type != F_IMAP &&
item->folder->klass->type != F_NEWS)) {
item->prefs->offlinesync = TRUE;
item->prefs->offlinesync_days = 0;
@@ -710,7 +710,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
gtk_widget_hide(GTK_WIDGET(label_end_offlinesync));
gtk_widget_hide(GTK_WIDGET(checkbtn_remove_old_offlinesync));
gtk_widget_hide(GTK_WIDGET(clean_cache_btn));
-
+
}
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_offlinesync),
item->prefs->offlinesync);
@@ -761,14 +761,14 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
folder_regexp_set_subject_example_cb(NULL, page);
}
-static void prefs_folder_item_general_destroy_widget_func(PrefsPage *page_)
+static void prefs_folder_item_general_destroy_widget_func(PrefsPage *page_)
{
/* FolderItemGeneralPage *page = (FolderItemGeneralPage *) page_; */
}
/** \brief Save the prefs in page to folder.
*
- * If the folder is not the one specified in page->item, then only those properties
+ * If the folder is not the one specified in page->item, then only those properties
* that have the relevant 'apply to sub folders' button checked are saved
*/
static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage *page)
@@ -787,7 +787,7 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
cm_return_if_fail(prefs != NULL);
- if (page->item == folder)
+ if (page->item == folder)
all = TRUE;
type = combobox_get_active_data(GTK_COMBO_BOX(page->folder_type));
@@ -824,7 +824,7 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_chmod_rec_checkbtn))) {
- prefs->enable_folder_chmod =
+ prefs->enable_folder_chmod =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_folder_chmod));
buf = gtk_editable_get_chars(GTK_EDITABLE(page->entry_folder_chmod), 0, -1);
prefs->folder_chmod = prefs_chmod_mode(buf);
@@ -835,36 +835,36 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
GdkRGBA old_color = prefs->color;
gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(page->folder_color_btn),
&prefs->color);
-
+
/* update folder view */
if (!gdk_rgba_equal(&prefs->color, &old_color))
folder_item_update(folder, F_ITEM_UPDATE_MSGCNT);
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable_processing_rec_checkbtn))) {
- prefs->enable_processing =
+ prefs->enable_processing =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_processing));
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable_processing_when_opening_rec_checkbtn))) {
- prefs->enable_processing_when_opening =
+ prefs->enable_processing_when_opening =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_processing_when_opening));
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->newmailcheck_rec_checkbtn))) {
- prefs->newmailcheck =
+ prefs->newmailcheck =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_newmailcheck));
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->skip_on_goto_unread_or_new_rec_checkbtn))) {
- prefs->skip_on_goto_unread_or_new =
+ prefs->skip_on_goto_unread_or_new =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_skip_on_goto_unread_or_new));
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->offlinesync_rec_checkbtn))) {
- prefs->offlinesync =
+ prefs->offlinesync =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_offlinesync));
- prefs->offlinesync_days =
+ prefs->offlinesync_days =
atoi(gtk_entry_get_text(GTK_ENTRY(page->entry_offlinesync)));
prefs->remove_old_bodies =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_remove_old_offlinesync));
@@ -875,8 +875,8 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
if (folder->opened && summary_update_needed) {
summary_set_prefs_from_folderitem(folderview->summaryview, folder);
summary_show(folderview->summaryview, folder, FALSE);
- }
-}
+ }
+}
static gboolean general_save_recurse_func(GNode *node, gpointer data)
{
@@ -906,17 +906,17 @@ static gboolean general_save_recurse_func(GNode *node, gpointer data)
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->promote_html_part_rec_checkbtn))
))
return TRUE;
- else
+ else
return FALSE;
}
-static void prefs_folder_item_general_save_func(PrefsPage *page_)
+static void prefs_folder_item_general_save_func(PrefsPage *page_)
{
FolderItemGeneralPage *page = (FolderItemGeneralPage *) page_;
g_node_traverse(page->item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
-1, general_save_recurse_func, page);
-
+
main_window_set_menu_sensitive(mainwindow_get_mainwindow());
}
@@ -945,7 +945,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
GtkWidget *table;
GtkWidget *hbox;
GtkWidget *label;
-
+
GtkWidget *no_save_warning = NULL;
GtkWidget *checkbtn_request_return_receipt = NULL;
GtkWidget *checkbtn_save_copy_to_folder = NULL;
@@ -1014,7 +1014,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
gtk_grid_attach(GTK_GRID(table), no_save_warning, 0, rowcount, 1, 1);
rowcount++;
}
-
+
/* Apply to subfolders */
label = gtk_label_new(_("Apply to\nsubfolders"));
gtk_grid_attach(GTK_GRID(table), label, 2, rowcount, 1, 1);
@@ -1049,7 +1049,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
text = g_strdup_printf(tr, prefs_common_translated_header_name("From:"));
checkbtn_default_from = gtk_check_button_new_with_label(text);
gtk_grid_attach(GTK_GRID(table), checkbtn_default_from, 0, rowcount, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_from),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_from),
item->prefs->enable_default_from);
g_free(text);
g_free(tr);
@@ -1074,7 +1074,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
text = g_strdup_printf(tr, prefs_common_translated_header_name("To:"));
checkbtn_default_to = gtk_check_button_new_with_label(text);
gtk_grid_attach(GTK_GRID(table), checkbtn_default_to, 0, rowcount, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to),
item->prefs->enable_default_to);
g_free(text);
g_free(tr);
@@ -1099,7 +1099,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
text = g_strdup_printf(tr, prefs_common_translated_header_name("To:"));
checkbtn_default_reply_to = gtk_check_button_new_with_label(text);
gtk_grid_attach(GTK_GRID(table), checkbtn_default_reply_to, 0, rowcount, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to),
item->prefs->enable_default_reply_to);
g_free(text);
g_free(tr);
@@ -1124,7 +1124,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
text = g_strdup_printf(tr, prefs_common_translated_header_name("Cc:"));
checkbtn_default_cc = gtk_check_button_new_with_label(text);
gtk_grid_attach(GTK_GRID(table), checkbtn_default_cc, 0, rowcount, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_cc),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_cc),
item->prefs->enable_default_cc);
g_free(text);
g_free(tr);
@@ -1149,7 +1149,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
text = g_strdup_printf(tr, prefs_common_translated_header_name("Bcc:"));
checkbtn_default_bcc = gtk_check_button_new_with_label(text);
gtk_grid_attach(GTK_GRID(table), checkbtn_default_bcc, 0, rowcount, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_bcc),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_bcc),
item->prefs->enable_default_bcc);
g_free(text);
g_free(tr);
@@ -1174,7 +1174,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
text = g_strdup_printf(tr, prefs_common_translated_header_name("Reply-To:"));
checkbtn_default_replyto = gtk_check_button_new_with_label(text);
gtk_grid_attach(GTK_GRID(table), checkbtn_default_replyto, 0, rowcount, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_replyto),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_replyto),
item->prefs->enable_default_replyto);
g_free(text);
g_free(tr);
@@ -1196,7 +1196,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
/* Default account */
checkbtn_enable_default_account = gtk_check_button_new_with_label(_("Default account"));
gtk_grid_attach(GTK_GRID(table), checkbtn_enable_default_account, 0, rowcount, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_account),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_account),
item->prefs->enable_default_account);
optmenu_default_account = gtkut_sc_combobox_create(NULL, FALSE);
@@ -1209,7 +1209,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
ac_prefs = (PrefsAccount *)cur_ac->data;
if (item->folder->account &&
( (item_protocol(item) == A_NNTP && ac_prefs->protocol != A_NNTP)
- ||(item_protocol(item) != A_NNTP && ac_prefs->protocol == A_NNTP)))
+ ||(item_protocol(item) != A_NNTP && ac_prefs->protocol == A_NNTP)))
continue;
if (item->folder->klass->type != F_NEWS && ac_prefs->protocol == A_NNTP)
@@ -1269,7 +1269,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
default_dictionary_rec_checkbtn = gtk_check_button_new();
gtk_grid_attach(GTK_GRID(table), default_dictionary_rec_checkbtn, 2, rowcount, 1, 1);
-
+
rowcount++;
/* Default alternate dictionary */
@@ -1300,7 +1300,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
default_alt_dictionary_rec_checkbtn = gtk_check_button_new();
gtk_grid_attach(GTK_GRID(table), default_alt_dictionary_rec_checkbtn, 2, rowcount, 1, 1);
-
+
rowcount++;
#endif
@@ -1415,7 +1415,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
page->page.widget = table;
}
-static void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_)
+static void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_)
{
FolderItemComposePage *page = (FolderItemComposePage *) page_;
@@ -1435,7 +1435,7 @@ static void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_)
/** \brief Save the prefs in page to folder.
*
- * If the folder is not the one specified in page->item, then only those properties
+ * If the folder is not the one specified in page->item, then only those properties
* that have the relevant 'apply to sub folders' button checked are saved
*/
static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page)
@@ -1447,40 +1447,40 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
if (folder->path == NULL)
return;
- if (page->item == folder)
+ if (page->item == folder)
all = TRUE;
cm_return_if_fail(prefs != NULL);
if (item_protocol(folder) != A_NNTP) {
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn))) {
- prefs->request_return_receipt =
+ prefs->request_return_receipt =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_request_return_receipt));
- /* MIGRATION */
+ /* MIGRATION */
folder->ret_rcpt = prefs->request_return_receipt;
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->save_copy_to_folder_rec_checkbtn))) {
- prefs->save_copy_to_folder =
+ prefs->save_copy_to_folder =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_save_copy_to_folder));
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_from_rec_checkbtn))) {
- prefs->enable_default_from =
+ prefs->enable_default_from =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_from));
ASSIGN_STRING(prefs->default_from,
gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_from), 0, -1));
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_to_rec_checkbtn))) {
- prefs->enable_default_to =
+ prefs->enable_default_to =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_to));
ASSIGN_STRING(prefs->default_to,
gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_to), 0, -1));
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))) {
- prefs->enable_default_reply_to =
+ prefs->enable_default_reply_to =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_reply_to));
ASSIGN_STRING(prefs->default_reply_to,
gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_reply_to), 0, -1));
@@ -1488,7 +1488,7 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_cc_rec_checkbtn))) {
- prefs->enable_default_cc =
+ prefs->enable_default_cc =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_cc));
ASSIGN_STRING(prefs->default_cc,
gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_cc), 0, -1));
@@ -1496,7 +1496,7 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_bcc_rec_checkbtn))) {
- prefs->enable_default_bcc =
+ prefs->enable_default_bcc =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_bcc));
ASSIGN_STRING(prefs->default_bcc,
gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_bcc), 0, -1));
@@ -1504,7 +1504,7 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_replyto_rec_checkbtn))) {
- prefs->enable_default_replyto =
+ prefs->enable_default_replyto =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_replyto));
ASSIGN_STRING(prefs->default_replyto,
gtk_editable_get_chars(GTK_EDITABLE(page->entry_default_replyto), 0, -1));
@@ -1523,7 +1523,7 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
if (all || gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn))) {
- prefs->enable_default_account =
+ prefs->enable_default_account =
gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_account));
prefs->default_account = combobox_get_active_data(
@@ -1547,16 +1547,16 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
}
#endif
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_sign_rec_checkbtn))) {
- prefs->always_sign =
+ prefs->always_sign =
combobox_get_active_data(GTK_COMBO_BOX(page->always_sign));
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_encrypt_rec_checkbtn))) {
- prefs->always_encrypt =
+ prefs->always_encrypt =
combobox_get_active_data(GTK_COMBO_BOX(page->always_encrypt));
}
folder_item_prefs_save_config(folder);
-}
+}
static gboolean compose_save_recurse_func(GNode *node, gpointer data)
{
@@ -1590,7 +1590,7 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
))
return TRUE;
else if ((node == page->item->node) && item_protocol(item) == A_NNTP &&
- !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn))
+ !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn))
#if USE_ENCHANT
|| gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))
|| gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn))
@@ -1599,11 +1599,11 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
|| gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->always_encrypt_rec_checkbtn))
))
return TRUE;
- else
+ else
return FALSE;
}
-static void prefs_folder_item_compose_save_func(PrefsPage *page_)
+static void prefs_folder_item_compose_save_func(PrefsPage *page_)
{
FolderItemComposePage *page = (FolderItemComposePage *) page_;
@@ -1628,13 +1628,13 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
GtkWidget *forward_format_rec_checkbtn;
GtkWidget *hbox;
GtkWidget *vbox_format;
-
+
page->item = item;
page_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (page_vbox), VBOX_BORDER);
gtk_widget_show (page_vbox);
-
+
if (!can_save) {
no_save_warning = prefs_folder_no_save_warning_create_widget();
gtk_box_pack_start(GTK_BOX(page_vbox),
@@ -1661,14 +1661,14 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
FALSE, FALSE);
address_completion_register_entry(GTK_ENTRY(page->compose_override_from_format),
TRUE);
-
+
vbox_format = gtk_widget_get_parent(
gtk_widget_get_parent(page->compose_body_format));
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end (GTK_BOX(vbox_format), hbox, FALSE, FALSE, 0);
quotefmt_add_info_button(window, hbox);
-
+
new_msg_format_rec_checkbtn = gtk_check_button_new_with_label(
_("Apply to subfolders"));
gtk_box_pack_end (GTK_BOX(hbox), new_msg_format_rec_checkbtn, FALSE, FALSE, 0);
@@ -1768,21 +1768,21 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
page->page.widget = page_vbox;
}
-static void prefs_folder_item_templates_destroy_widget_func(PrefsPage *page_)
+static void prefs_folder_item_templates_destroy_widget_func(PrefsPage *page_)
{
FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) page_;
if (page->compose_override_from_format)
- address_completion_unregister_entry(GTK_ENTRY(page->compose_override_from_format));
+ address_completion_unregister_entry(GTK_ENTRY(page->compose_override_from_format));
if (page->reply_override_from_format)
- address_completion_unregister_entry(GTK_ENTRY(page->reply_override_from_format));
+ address_completion_unregister_entry(GTK_ENTRY(page->reply_override_from_format));
if (page->forward_override_from_format)
- address_completion_unregister_entry(GTK_ENTRY(page->forward_override_from_format));
+ address_completion_unregister_entry(GTK_ENTRY(page->forward_override_from_format));
}
/** \brief Save the prefs in page to folder.
*
- * If the folder is not the one specified in page->item, then only those properties
+ * If the folder is not the one specified in page->item, then only those properties
* that have the relevant 'apply to sub folders' button checked are saved
*/
static void templates_save_folder_prefs(FolderItem *folder, FolderItemTemplatesPage *page)
@@ -1793,7 +1793,7 @@ static void templates_save_folder_prefs(FolderItem *folder, FolderItemTemplatesP
if (folder->path == NULL)
return;
- if (page->item == folder)
+ if (page->item == folder)
all = TRUE;
cm_return_if_fail(prefs != NULL);
@@ -1801,7 +1801,7 @@ static void templates_save_folder_prefs(FolderItem *folder, FolderItemTemplatesP
/* save and check formats */
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->new_msg_format_rec_checkbtn))) {
-
+
prefs->compose_with_format =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_compose_with_format));
prefs->compose_override_from_format = pref_get_pref_from_entry(
@@ -1847,7 +1847,7 @@ static void templates_save_folder_prefs(FolderItem *folder, FolderItemTemplatesP
}
folder_item_prefs_save_config(folder);
-}
+}
static gboolean templates_save_recurse_func(GNode *node, gpointer data)
{
@@ -1867,13 +1867,13 @@ static gboolean templates_save_recurse_func(GNode *node, gpointer data)
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->reply_format_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->forward_format_rec_checkbtn))))
return TRUE;
- else
+ else
return FALSE;
return FALSE;
}
-static void prefs_folder_item_templates_save_func(PrefsPage *page_)
+static void prefs_folder_item_templates_save_func(PrefsPage *page_)
{
FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) page_;
@@ -1889,14 +1889,14 @@ static void clean_cache_cb(GtkWidget *widget, gpointer data)
gboolean was_open = FALSE;
FolderView *folderview = NULL;
- if (alertpanel_full(_("Discard cache"),
+ if (alertpanel_full(_("Discard cache"),
_("Do you really want to discard the local cached "
"data for this folder?"),
NULL, _("_Cancel"), NULL, _("Discard"), NULL, NULL,
ALERTFOCUS_SECOND, FALSE, NULL, ALERT_WARNING)
!= G_ALERTALTERNATE)
return;
-
+
if (mainwindow_get_mainwindow())
folderview = mainwindow_get_mainwindow()->folderview;
@@ -1944,7 +1944,7 @@ static void folder_regexp_test_cb(GtkWidget *widget, gpointer data)
GTK_STATE_NORMAL, NULL);
if (test_string)
gtk_entry_set_text(GTK_ENTRY(page->entry_regexp_test_result), test_string);
-
+
g_free(test_string);
g_free(regexp);
return;
@@ -2012,7 +2012,7 @@ static void register_general_page()
folder_item_general_page.page.create_widget = prefs_folder_item_general_create_widget_func;
folder_item_general_page.page.destroy_widget = prefs_folder_item_general_destroy_widget_func;
folder_item_general_page.page.save_page = prefs_folder_item_general_save_func;
-
+
prefs_folder_item_register_page((PrefsPage *) &folder_item_general_page, NULL);
}
@@ -2029,7 +2029,7 @@ static void register_compose_page(void)
folder_item_compose_page.page.create_widget = prefs_folder_item_compose_create_widget_func;
folder_item_compose_page.page.destroy_widget = prefs_folder_item_compose_destroy_widget_func;
folder_item_compose_page.page.save_page = prefs_folder_item_compose_save_func;
-
+
prefs_folder_item_register_page((PrefsPage *) &folder_item_compose_page, NULL);
}
@@ -2045,7 +2045,7 @@ static void register_templates_page(void)
folder_item_templates_page.page.create_widget = prefs_folder_item_templates_create_widget_func;
folder_item_templates_page.page.destroy_widget = prefs_folder_item_templates_destroy_widget_func;
folder_item_templates_page.page.save_page = prefs_folder_item_templates_save_func;
-
+
prefs_folder_item_register_page((PrefsPage *) &folder_item_templates_page, NULL);
}
@@ -2079,7 +2079,7 @@ void prefs_folder_item_open(FolderItem *item)
id = g_strdup(item->name);
can_save = FALSE;
}
-
+
pages = g_slist_concat(
g_slist_copy(prefs_pages),
g_slist_copy(item->folder->klass->prefs_pages));
diff --git a/src/prefs_fonts.c b/src/prefs_fonts.c
@@ -51,7 +51,7 @@ typedef struct _FontsPage
GtkWidget *entry_messageprintfont;
} FontsPage;
-static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
+static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
FontsPage *prefs_fonts = (FontsPage *) _page;
@@ -83,8 +83,8 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
/* normal font button */
entry_folderview_normalfont = gtk_font_button_new_with_font (prefs_common.normalfont);
- g_object_set(G_OBJECT(entry_folderview_normalfont),
- "use-font", TRUE,
+ g_object_set(G_OBJECT(entry_folderview_normalfont),
+ "use-font", TRUE,
NULL);
gtk_widget_show (entry_folderview_normalfont);
gtk_grid_attach(GTK_GRID(table), entry_folderview_normalfont, 1, row, 1, 1);
@@ -101,8 +101,8 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
/* message font button */
entry_messageviewfont = gtk_font_button_new_with_font (prefs_common.textfont);
- g_object_set(G_OBJECT(entry_messageviewfont),
- "use-font", TRUE,
+ g_object_set(G_OBJECT(entry_messageviewfont),
+ "use-font", TRUE,
NULL);
gtk_widget_show (entry_messageviewfont);
gtk_grid_attach(GTK_GRID(table), entry_messageviewfont, 1, row, 1, 1);
@@ -114,7 +114,7 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_show(vbox);
gtk_grid_attach(GTK_GRID(table), vbox, 0, row, 1, 1);
row++;
-
+
/* derive from normal font check button */
derive_from_normalfont_checkbutton = gtk_check_button_new_with_label(_("Derive small and bold fonts from Folder and Message Lists font"));
gtk_widget_show(derive_from_normalfont_checkbutton);
@@ -133,8 +133,8 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
/* small font button */
entry_folderview_smallfont = gtk_font_button_new_with_font (prefs_common.smallfont);
- g_object_set(G_OBJECT(entry_folderview_smallfont),
- "use-font", TRUE,
+ g_object_set(G_OBJECT(entry_folderview_smallfont),
+ "use-font", TRUE,
NULL);
gtk_widget_show (entry_folderview_smallfont);
gtk_grid_attach(GTK_GRID(table), entry_folderview_smallfont, 1, row, 1, 1);
@@ -153,8 +153,8 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
/* bold font button */
entry_folderview_boldfont = gtk_font_button_new_with_font (prefs_common.boldfont);
- g_object_set(G_OBJECT(entry_folderview_boldfont),
- "use-font", TRUE,
+ g_object_set(G_OBJECT(entry_folderview_boldfont),
+ "use-font", TRUE,
NULL);
gtk_widget_show (entry_folderview_boldfont);
gtk_grid_attach(GTK_GRID(table), entry_folderview_boldfont, 1, row, 1, 1);
@@ -181,8 +181,8 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
/* print font button */
entry_messageprintfont = gtk_font_button_new_with_font (prefs_common.printfont);
- g_object_set(G_OBJECT(entry_messageprintfont),
- "use-font", TRUE,
+ g_object_set(G_OBJECT(entry_messageprintfont),
+ "use-font", TRUE,
NULL);
gtk_widget_show (entry_messageprintfont);
gtk_grid_attach(GTK_GRID(table), entry_messageprintfont, 1, row, 1, 1);
@@ -214,19 +214,19 @@ static void prefs_fonts_save(PrefsPage *_page)
g_free(prefs_common.normalfont);
prefs_common.normalfont = g_strdup(gtk_font_chooser_get_font
(GTK_FONT_CHOOSER(fonts->entry_folderview_normalfont)));
-
- g_free(prefs_common.smallfont);
+
+ g_free(prefs_common.smallfont);
prefs_common.smallfont = g_strdup(gtk_font_chooser_get_font
(GTK_FONT_CHOOSER(fonts->entry_folderview_smallfont)));
- g_free(prefs_common.textfont);
+ g_free(prefs_common.textfont);
prefs_common.textfont = g_strdup(gtk_font_chooser_get_font
(GTK_FONT_CHOOSER(fonts->entry_messageviewfont)));
prefs_common.derive_from_normal_font = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON(fonts->derive_from_normalfont_checkbutton));
- g_free(prefs_common.printfont);
+ g_free(prefs_common.printfont);
prefs_common.printfont = g_strdup(gtk_font_chooser_get_font
(GTK_FONT_CHOOSER(fonts->entry_messageprintfont)));
prefs_common.use_different_print_font = gtk_toggle_button_get_active
diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
@@ -415,7 +415,7 @@ void prefs_set_default(PrefParam *param)
g_strconcat(get_home_dir(),
param[i].defval + 1,
NULL);
- else
+ else
*((gchar **)param[i].data) =
g_strdup(param[i].defval);
} else
@@ -840,7 +840,7 @@ void prefs_set_data_from_toggle(PrefParam *pparam)
{
cm_return_if_fail(pparam->type == P_BOOL);
cm_return_if_fail(*pparam->widget != NULL);
-
+
*((gboolean *)pparam->data) =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(*pparam->widget));
}
@@ -923,13 +923,13 @@ void prefs_gtk_unregister_page(PrefsPage *page)
}
static void prefs_destroy_whole_cache(gpointer to_free)
-{
+{
GHashTable *table = (GHashTable *)to_free;
g_hash_table_destroy(table);
}
static void prefs_destroy_file_cache(gpointer to_free)
-{
+{
GHashTable *table = (GHashTable *)to_free;
g_hash_table_destroy(table);
}
@@ -946,7 +946,7 @@ static int prefs_cache_sections(GHashTable *file_cache, const gchar *rcfile)
debug_print("cache: %s: %s\n", rcfile?rcfile:"(null)", g_strerror(errno));
return -1;
}
-
+
while (claws_fgets(buf, sizeof(buf), fp) != NULL) {
strretchomp(buf);
if (buf[0] == '\0')
@@ -963,7 +963,7 @@ static int prefs_cache_sections(GHashTable *file_cache, const gchar *rcfile)
debug_print("new section '%s'\n", blockname);
section_cache = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, NULL);
- g_hash_table_insert(file_cache,
+ g_hash_table_insert(file_cache,
blockname, section_cache);
} else {
debug_print("section '%s' already done\n", blockname);
@@ -977,13 +977,13 @@ static int prefs_cache_sections(GHashTable *file_cache, const gchar *rcfile)
continue;
} else {
gchar *pref;
-
+
if (!strchr(buf, '=')) {
/* plugins do differently */
continue;
}
pref = g_strdup(buf);
-
+
//debug_print("new pref '%s'\n", pref);
g_hash_table_insert(section_cache, pref, GINT_TO_POINTER(1));
}
@@ -995,12 +995,12 @@ static int prefs_cache_sections(GHashTable *file_cache, const gchar *rcfile)
static int prefs_cache(const gchar *rcfile)
{
- GHashTable *file_cache = g_hash_table_new_full(g_str_hash, g_str_equal,
+ GHashTable *file_cache = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, prefs_destroy_file_cache);
-
+
debug_print("new file '%s'\n", rcfile?rcfile:"(null)");
g_hash_table_insert(whole_cache, g_strdup(rcfile), file_cache);
-
+
return prefs_cache_sections(file_cache, rcfile);
}
@@ -1010,7 +1010,7 @@ void prefs_prepare_cache(void)
gchar *folderitemrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, FOLDERITEM_RC, NULL);
gchar *accountrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
gchar *oauth2rc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, OAUTH2_RC, NULL);
-
+
if (whole_cache == NULL) {
whole_cache = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, prefs_destroy_whole_cache);
@@ -1051,23 +1051,23 @@ static void prefs_parse_cache(gpointer key, gpointer value, gpointer user_data)
gchar *pref = (gchar *)key;
PrefParam *param = (PrefParam *)user_data;
-
+
prefs_config_parse_one_line(param, pref);
}
static gboolean prefs_read_config_from_cache(PrefParam *param, const gchar *label,
- const gchar *rcfile)
+ const gchar *rcfile)
{
GHashTable *sections_table = NULL;
GHashTable *values_table = NULL;
sections_table = g_hash_table_lookup(whole_cache, rcfile);
-
+
if (sections_table == NULL) {
g_warning("can't find %s in the whole cache", rcfile?rcfile:"(null)");
return FALSE;
}
values_table = g_hash_table_lookup(sections_table, label);
-
+
if (values_table == NULL) {
debug_print("no '%s' section in '%s' cache\n", label?label:"(null)", rcfile?rcfile:"(null)");
return TRUE;
diff --git a/src/prefs_image_viewer.c b/src/prefs_image_viewer.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -38,7 +38,7 @@
typedef struct _ImageViewerPage
{
PrefsPage page;
-
+
GtkWidget *window; /* do not modify */
GtkWidget *autoload_img;
@@ -110,11 +110,11 @@ static void imageviewer_create_widget_func(PrefsPage * _page,
inline_img = gtk_check_button_new_with_label(_("Display images inline"));
gtk_widget_show(inline_img);
gtk_grid_attach(GTK_GRID(table), inline_img, 0, 3, 1, 1);
-
+
print_imgs = gtk_check_button_new_with_label(_("Print images"));
gtk_widget_show(print_imgs);
gtk_grid_attach(GTK_GRID(table), print_imgs, 0, 4, 1, 1);
-
+
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resize_img), prefs_common.resize_img);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(autoload_img), prefs_common.display_img);
if (prefs_common.fit_img_height)
@@ -123,7 +123,7 @@ static void imageviewer_create_widget_func(PrefsPage * _page,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fit_img_width_radiobtn), TRUE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(inline_img), prefs_common.inline_img);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(print_imgs), prefs_common.print_imgs);
-
+
SET_TOGGLE_SENSITIVITY(resize_img, vbox);
prefs_imageviewer->window = GTK_WIDGET(window);
@@ -144,7 +144,7 @@ static void imageviewer_destroy_widget_func(PrefsPage *_page)
static void imageviewer_save_func(PrefsPage * _page)
{
ImageViewerPage *imageviewer = (ImageViewerPage *) _page;
-
+
prefs_common.display_img =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
(imageviewer->autoload_img));
diff --git a/src/prefs_logging.c b/src/prefs_logging.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -73,21 +73,21 @@ static GtkWidget *prefs_logging_create_check_buttons(GtkWidget **checkbtn1,
hbox_checkbtn = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show(hbox_checkbtn);
-
- PACK_CHECK_BUTTON (hbox_checkbtn, *checkbtn1, label1);
+
+ PACK_CHECK_BUTTON (hbox_checkbtn, *checkbtn1, label1);
gtk_label_set_line_wrap(GTK_LABEL(gtk_bin_get_child(GTK_BIN((*checkbtn1)))), TRUE);
PACK_CHECK_BUTTON (hbox_checkbtn, *checkbtn2, label2);
gtk_label_set_line_wrap(GTK_LABEL(gtk_bin_get_child(GTK_BIN((*checkbtn2)))), TRUE);
-
+
return hbox_checkbtn;
}
-static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
+static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
LoggingPage *prefs_logging = (LoggingPage *) _page;
-
+
GtkWidget *vbox1;
GtkWidget *frame_logging;
@@ -126,7 +126,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *checkbtn_log_error;
GtkWidget *checkbtn_log_status;
GtkSizeGroup *log_size_group;
-
+
vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
@@ -140,7 +140,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON (hbox_clip_network_log, checkbtn_clip_network_log,
_("Restrict the log window to"));
-
+
spinbtn_network_log_length_adj = GTK_ADJUSTMENT(gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 0));
spinbtn_network_log_length = gtk_spin_button_new
(GTK_ADJUSTMENT (spinbtn_network_log_length_adj), 1, 0);
@@ -192,7 +192,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
&checkbtn_filtering_log_post_proc,
_("post-processing folders"));
gtk_box_pack_start(GTK_BOX(vbox2_filtering_log), hbox_checkbtn, FALSE, FALSE, 0);
-
+
hbox_checkbtn = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VBOX_BORDER);
gtk_widget_show(hbox_checkbtn);
gtk_box_pack_start(GTK_BOX(vbox2_filtering_log), hbox_checkbtn, FALSE, FALSE, 0);
@@ -219,7 +219,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
optmenu_filtering_log_level = gtkut_sc_combobox_create(NULL, FALSE);
gtk_widget_show (optmenu_filtering_log_level);
-
+
menu = GTK_LIST_STORE(gtk_combo_box_get_model(
GTK_COMBO_BOX(optmenu_filtering_log_level)));
COMBOBOX_ADD (menu, _("Low"), 0);
@@ -246,7 +246,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_show (hbox_clip_filtering_log);
PACK_CHECK_BUTTON (hbox_clip_filtering_log, checkbtn_clip_filtering_log,
_("Restrict the log window to"));
-
+
spinbtn_filtering_log_length_adj = GTK_ADJUSTMENT(gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 0));
spinbtn_filtering_log_length = gtk_spin_button_new
(GTK_ADJUSTMENT (spinbtn_filtering_log_length_adj), 1, 0);
@@ -284,39 +284,39 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
_("Network protocol messages"));
gtk_box_pack_start(GTK_BOX(vbox_disk_log), hbox_checkbtn, FALSE, FALSE, 0);
- hbox_checkbtn = prefs_logging_create_check_buttons(&checkbtn_log_error,
+ hbox_checkbtn = prefs_logging_create_check_buttons(&checkbtn_log_error,
_("Error messages"), &checkbtn_log_status,
_("Status messages for filtering/processing log"));
gtk_box_pack_start(GTK_BOX(vbox_disk_log), hbox_checkbtn, FALSE, FALSE, 0);
-
+
log_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
gtk_size_group_add_widget(log_size_group, checkbtn_log_warning);
gtk_size_group_add_widget(log_size_group, checkbtn_log_error);
g_object_unref(G_OBJECT(log_size_group));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_clip_network_log),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_clip_network_log),
prefs_common.cliplog);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_clip_filtering_log),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_clip_filtering_log),
prefs_common.filtering_debug_cliplog);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_standard),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_standard),
prefs_common.enable_log_standard);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_warning),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_warning),
prefs_common.enable_log_warning);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_error),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_error),
prefs_common.enable_log_error);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_status),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_log_status),
prefs_common.enable_log_status);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log),
prefs_common.enable_filtering_debug);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_inc),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_inc),
prefs_common.enable_filtering_debug_inc);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_manual),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_manual),
prefs_common.enable_filtering_debug_manual);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_folder_proc),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_folder_proc),
prefs_common.enable_filtering_debug_folder_proc);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_pre_proc),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_pre_proc),
prefs_common.enable_filtering_debug_pre_proc);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_post_proc),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_filtering_log_post_proc),
prefs_common.enable_filtering_debug_post_proc);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_network_log_length),
diff --git a/src/prefs_proxy.c b/src/prefs_proxy.c
@@ -137,7 +137,7 @@ static void prefs_proxy_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_set_size_request(proxy_pass_entry, DEFAULT_ENTRY_WIDTH, -1);
gtk_entry_set_visibility(GTK_ENTRY(proxy_pass_entry), FALSE);
gtk_entry_set_icon_from_icon_name(GTK_ENTRY(proxy_pass_entry),
- GTK_ENTRY_ICON_SECONDARY,
+ GTK_ENTRY_ICON_SECONDARY,
"view-reveal-symbolic");
gtk_entry_set_icon_activatable(GTK_ENTRY(proxy_pass_entry),
GTK_ENTRY_ICON_SECONDARY, TRUE);
@@ -145,7 +145,7 @@ static void prefs_proxy_create_widget(PrefsPage *_page, GtkWindow *window,
GTK_ENTRY_ICON_SECONDARY, _("Show password"));
g_signal_connect(proxy_pass_entry, "icon-press",
G_CALLBACK(showpwd_toggled), NULL);
-
+
gtk_grid_attach(GTK_GRID(table), proxy_pass_entry, 3, 0, 1, 1);
gtk_widget_set_hexpand(proxy_pass_entry, TRUE);
gtk_widget_set_halign(proxy_pass_entry, GTK_ALIGN_FILL);
diff --git a/src/prefs_quote.c b/src/prefs_quote.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -87,11 +87,11 @@ static void prefs_quote_set_default_forward_fmt(void)
"?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"));
}
-static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
+static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
QuotePage *prefs_quote = (QuotePage *) _page;
-
+
GtkWidget *vbox;
GtkWidget *vbox2;
GtkWidget *notebook;
@@ -107,7 +107,7 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
-
+
quotefmt_create_new_msg_fmt_widgets(
window,
vbox2,
@@ -122,7 +122,7 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
-
+
quotefmt_create_reply_fmt_widgets(
window,
vbox2,
@@ -137,7 +137,7 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
gtk_widget_show (vbox2);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
-
+
quotefmt_create_forward_fmt_widgets(
window,
vbox2,
@@ -158,7 +158,7 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
else
prefs_quote_set_default_new_msg_fmt();
- gtk_entry_set_text(GTK_ENTRY(prefs_quote->entry_quotemark),
+ gtk_entry_set_text(GTK_ENTRY(prefs_quote->entry_quotemark),
prefs_common.quotemark?prefs_common.quotemark:"");
if (prefs_common.quotefmt)
pref_set_textview_from_pref(GTK_TEXT_VIEW(prefs_quote->text_quotefmt),
@@ -166,7 +166,7 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
else
prefs_quote_set_default_reply_fmt();
- gtk_entry_set_text(GTK_ENTRY(prefs_quote->entry_fw_quotemark),
+ gtk_entry_set_text(GTK_ENTRY(prefs_quote->entry_fw_quotemark),
prefs_common.fw_quotemark?prefs_common.fw_quotemark:"");
if (prefs_common.fw_quotefmt)
pref_set_textview_from_pref(GTK_TEXT_VIEW(prefs_quote->text_fw_quotefmt),
@@ -181,20 +181,20 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
static void prefs_quote_save(PrefsPage *_page)
{
QuotePage *page = (QuotePage *) _page;
-
- g_free(prefs_common.compose_subject_format);
+
+ g_free(prefs_common.compose_subject_format);
prefs_common.compose_subject_format = NULL;
- g_free(prefs_common.compose_body_format);
+ g_free(prefs_common.compose_body_format);
prefs_common.compose_body_format = NULL;
- g_free(prefs_common.quotefmt);
+ g_free(prefs_common.quotefmt);
prefs_common.quotefmt = NULL;
- g_free(prefs_common.fw_quotefmt);
+ g_free(prefs_common.fw_quotefmt);
prefs_common.fw_quotefmt = NULL;
- g_free(prefs_common.quotemark);
+ g_free(prefs_common.quotemark);
prefs_common.quotemark = NULL;
- g_free(prefs_common.fw_quotemark);
+ g_free(prefs_common.fw_quotemark);
prefs_common.fw_quotemark = NULL;
-
+
prefs_common.compose_with_format =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_compose_with_format));
prefs_common.compose_subject_format = pref_get_pref_from_entry(
diff --git a/src/prefs_receive.c b/src/prefs_receive.c
@@ -96,11 +96,11 @@ static void prefs_receive_itv_spinbutton_value_changed_cb(GtkWidget *w, gpointer
}
}
-static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
+static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
ReceivePage *prefs_receive = (ReceivePage *) _page;
-
+
GtkWidget *vbox1;
GtkWidget *vbox2;
GtkWidget *checkbtn_incext;
@@ -161,8 +161,8 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_box_pack_start (GTK_BOX (hbox), entry_incext, TRUE, TRUE, 0);
/* Auto-checking */
- vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Automatic checking"));
-
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Automatic checking"));
+
hbox_autochk = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox_autochk);
gtk_box_pack_start (GTK_BOX (vbox2), hbox_autochk, FALSE, FALSE, 0);
@@ -216,7 +216,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
/* receive dialog */
vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Dialogs"));
-
+
label_recvdialog = gtk_label_new (_("Show receive dialog"));
gtk_label_set_xalign(GTK_LABEL(label_recvdialog), 0.0);
gtk_widget_show (label_recvdialog);
@@ -234,16 +234,16 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(hbox), label_recvdialog, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), optmenu_recvdialog, FALSE, FALSE, 0);
-
+
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
-
+
PACK_CHECK_BUTTON (vbox2, checkbtn_close_recv_dialog,
_("Close receive dialog when finished"));
PACK_CHECK_BUTTON (vbox2, checkbtn_show_recv_err_dialog,
_("Show error dialog on receive error"));
- vbox2 = gtkut_get_options_frame(vbox1, &frame,
+ vbox2 = gtkut_get_options_frame(vbox1, &frame,
_("After receiving new mail"));
PACK_CHECK_BUTTON (vbox2, checkbtn_openinbox, _("Go to Inbox"));
@@ -251,7 +251,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
_("Update all local folders"));
vbox3 = gtkut_get_options_frame(vbox2, &frame, _("Run command"));
-
+
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox);
PACK_CHECK_BUTTON (hbox, checkbtn_newmail_auto,
@@ -262,14 +262,14 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
hbox_newmail_notify = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox_newmail_notify);
- gtk_box_pack_start (GTK_BOX (vbox3), hbox_newmail_notify, FALSE,
+ gtk_box_pack_start (GTK_BOX (vbox3), hbox_newmail_notify, FALSE,
FALSE, 0);
label_newmail_notify_cmd = gtk_label_new (_("Command to execute"));
gtk_label_set_justify(GTK_LABEL(label_newmail_notify_cmd),
GTK_JUSTIFY_RIGHT);
gtk_widget_show (label_newmail_notify_cmd);
- gtk_box_pack_start (GTK_BOX (hbox_newmail_notify),
+ gtk_box_pack_start (GTK_BOX (hbox_newmail_notify),
label_newmail_notify_cmd, FALSE, FALSE, 0);
entry_newmail_notify_cmd = gtk_entry_new ();
@@ -283,15 +283,15 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_box_pack_start (GTK_BOX (hbox_newmail_notify),
label_newmail_notify_cmd_syntax, FALSE, FALSE, 0);
- gtk_widget_set_sensitive(hbox_newmail_notify,
- prefs_common.newmail_notify_auto ||
+ gtk_widget_set_sensitive(hbox_newmail_notify,
+ prefs_common.newmail_notify_auto ||
prefs_common.newmail_notify_manu);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_newmail_auto),
prefs_common.newmail_notify_auto);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_newmail_manu),
prefs_common.newmail_notify_manu);
- gtk_entry_set_text(GTK_ENTRY(entry_newmail_notify_cmd),
+ gtk_entry_set_text(GTK_ENTRY(entry_newmail_notify_cmd),
prefs_common.newmail_notify_cmd);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_autochk),
prefs_common.autochk_newmail);
@@ -308,7 +308,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_scan_after_inc),
prefs_common.scan_all_after_inc);
- gtk_entry_set_text(GTK_ENTRY(entry_incext),
+ gtk_entry_set_text(GTK_ENTRY(entry_incext),
prefs_common.extinc_cmd);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_autochk_hour),
prefs_common.autochk_itv / 3600);
@@ -391,7 +391,7 @@ static void prefs_receive_save(PrefsPage *_page)
tmp = gtk_editable_get_chars(GTK_EDITABLE(page->entry_incext), 0, -1);
g_free(prefs_common.extinc_cmd);
prefs_common.extinc_cmd = tmp;
-
+
tmp = gtk_editable_get_chars(GTK_EDITABLE(page->entry_newmail_notify_cmd), 0, -1);
g_free(prefs_common.newmail_notify_cmd);
prefs_common.newmail_notify_cmd = tmp;
diff --git a/src/prefs_send.c b/src/prefs_send.c
@@ -86,7 +86,7 @@ static gboolean _select_by_data_func(GtkTreeModel *model, GtkTreePath *path,
{
GtkComboBox *combobox = ctx->combobox;
gchar *data = ctx->data;
- gchar *curdata;
+ gchar *curdata;
gtk_tree_model_get(GTK_TREE_MODEL(model), iter, COMBOBOX_DATA, &curdata, -1);
if ( data != NULL && curdata != NULL && !strcmp(data, curdata) ) {
@@ -142,7 +142,7 @@ static void checkbtn_warn_multiple_recipients_toggled(GtkToggleButton *button,
gtk_widget_set_sensitive(spin, active);
}
-static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
+static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
SendPage *prefs_send = (SendPage *) _page;
@@ -349,7 +349,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
else
gtk_widget_set_sensitive(spinbtn_warn_multiple_recipients, FALSE);
- prefs_common_charset_set_optmenu(combobox_charset,
+ prefs_common_charset_set_optmenu(combobox_charset,
prefs_common.outgoing_charset);
combobox_select_by_data(GTK_COMBO_BOX(combobox_encoding),
prefs_common.encoding_method);
diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c
@@ -49,7 +49,7 @@ typedef struct _SpellingPage
GtkWidget *automatic_frame;
GtkWidget *dictionary_frame;
-
+
GtkWidget *enable_aspell_checkbtn;
GtkWidget *recheck_when_changing_dict_checkbtn;
GtkWidget *check_while_typing_checkbtn;
@@ -121,11 +121,11 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp
gtk_widget_show(use_alternate_checkbtn);
gtk_box_pack_start(GTK_BOX(vbox2), use_alternate_checkbtn, TRUE, TRUE, 0);
- CLAWS_SET_TIP(use_alternate_checkbtn,
+ CLAWS_SET_TIP(use_alternate_checkbtn,
_("Faster switching with last used dictionary"));
vbox2 = gtkut_get_options_frame(vbox1, &automatic_frame, _("Automatic spell checking"));
-
+
check_while_typing_checkbtn = gtk_check_button_new_with_label(
_("Check while typing"));
gtk_widget_show(check_while_typing_checkbtn);
@@ -135,9 +135,9 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp
_("Re-check message when changing dictionary"));
gtk_widget_show(recheck_when_changing_dict_checkbtn);
gtk_box_pack_start(GTK_BOX(vbox2), recheck_when_changing_dict_checkbtn, TRUE, TRUE, 0);
-
+
vbox2 = gtkut_get_options_frame(vbox1, &dictionary_frame, _("Dictionary"));
-
+
table = gtk_grid_new();
gtk_widget_show(table);
gtk_container_set_border_width(GTK_CONTAINER(table), 0);
@@ -151,7 +151,7 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp
gtk_label_set_justify(GTK_LABEL(default_dict_label), GTK_JUSTIFY_RIGHT);
gtk_label_set_xalign(GTK_LABEL(default_dict_label), 1.0);
gtk_grid_attach(GTK_GRID(table), default_dict_label, 0, 0, 1, 1);
-
+
default_dict_combo = gtkaspell_dictionary_combo_new(TRUE);
gtk_grid_attach(GTK_GRID(table), default_dict_combo, 1, 0, 1, 1);
@@ -160,7 +160,7 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp
gtk_label_set_justify(GTK_LABEL(default_alt_dict_label), GTK_JUSTIFY_RIGHT);
gtk_label_set_xalign(GTK_LABEL(default_alt_dict_label), 1.0);
gtk_grid_attach(GTK_GRID(table), default_alt_dict_label, 0, 1, 1, 1);
-
+
default_alt_dict_combo = gtkaspell_dictionary_combo_new(FALSE);
gtk_grid_attach(GTK_GRID(table), default_alt_dict_combo, 1, 1, 1, 1);
@@ -178,7 +178,7 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp
misspelled_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_widget_show(misspelled_hbox);
gtk_box_pack_start(GTK_BOX(vbox1), misspelled_hbox, FALSE, FALSE, 0);
-
+
misspelled_label = gtk_label_new(_("Misspelled word color"));
gtk_widget_show(misspelled_label);
gtk_box_pack_start(GTK_BOX(misspelled_hbox), misspelled_label,
@@ -216,7 +216,7 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp
prefs_common.recheck_when_changing_dict);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(use_alternate_checkbtn),
prefs_common.use_alternate);
- if (prefs_common.dictionary &&
+ if (prefs_common.dictionary &&
strrchr(prefs_common.dictionary, '/')) {
gchar *tmp = g_strdup(strrchr(prefs_common.dictionary, '/')+1);
g_free(prefs_common.dictionary);
@@ -278,12 +278,12 @@ static void prefs_spelling_save(PrefsPage *_page)
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spelling->both_dict_check));
g_free(prefs_common.dictionary);
- prefs_common.dictionary =
+ prefs_common.dictionary =
gtkaspell_get_dictionary_menu_active_item(
GTK_COMBO_BOX(spelling->default_dict_combo));
g_free(prefs_common.alt_dictionary);
- prefs_common.alt_dictionary =
+ prefs_common.alt_dictionary =
gtkaspell_get_dictionary_menu_active_item(
GTK_COMBO_BOX(spelling->default_alt_dict_combo));
@@ -304,7 +304,7 @@ void prefs_spelling_init(void)
SpellingPage *page;
static gchar *path[3];
const gchar* language = NULL;
-
+
path[0] = _("Write");
path[1] = _("Spell Checking");
path[2] = NULL;
@@ -318,11 +318,11 @@ void prefs_spelling_init(void)
prefs_gtk_register_page((PrefsPage *) page);
prefs_spelling = page;
-
+
language = g_getenv("LANG");
if (language == NULL || !strcmp(language, "POSIX") || !strcmp(language, "C"))
language = "en";
-
+
if (!prefs_common.dictionary)
prefs_common.dictionary = g_strdup_printf("%s", language);
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
@@ -141,7 +141,7 @@ static void foldersel_cb(GtkWidget *widget, gpointer data)
FolderItem *item;
gchar *item_id;
gint newpos = 0;
-
+
item = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL, FALSE, NULL);
if (item && (item_id = folder_item_get_identifier(item)) != NULL) {
gtk_editable_delete_text(GTK_EDITABLE(entry), 0, -1);
@@ -265,21 +265,21 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
(_("Specifier"), renderer, "text", DATEFMT_FMT,
NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(datefmt_list_view), column);
-
+
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(_("Description"), renderer, "text", DATEFMT_TXT,
NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(datefmt_list_view), column);
-
+
/* gtk_cmclist_set_column_width(GTK_CMCLIST(datefmt_clist), 0, 80); */
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(datefmt_list_view));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
- g_signal_connect(G_OBJECT(datefmt_list_view), "row_activated",
+ g_signal_connect(G_OBJECT(datefmt_list_view), "row_activated",
G_CALLBACK(date_format_select_row),
datefmt_win);
-
+
table = gtk_grid_new();
gtk_widget_show(table);
gtk_box_pack_start(GTK_BOX(vbox1), table, FALSE, FALSE, 0);
@@ -355,11 +355,11 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
return datefmt_win;
}
-static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
+static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
SummariesPage *prefs_summaries = (SummariesPage *) _page;
-
+
GtkWidget *notebook;
GtkWidget *hbox0, *hbox1, *hbox2;
GtkWidget *vbox1, *vbox2, *vbox3, *vbox4;
@@ -416,7 +416,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
gtk_label_new(_("Folder list")));
-
+
hbox0 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox0);
gtk_box_pack_start(GTK_BOX(vbox1), hbox0, FALSE, TRUE, 0);
@@ -443,7 +443,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
menu = GTK_LIST_STORE(gtk_combo_box_get_model(
GTK_COMBO_BOX(optmenu_folder_unread)));
gtk_widget_show (optmenu_folder_unread);
-
+
COMBOBOX_ADD (menu, _("No"), 0);
COMBOBOX_ADD (menu, _("Unread messages"), 1);
COMBOBOX_ADD (menu, _("Unread and Total messages"), 2);
@@ -514,7 +514,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
hbox0 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox0);
gtk_box_pack_start(GTK_BOX(vbox1), hbox0, FALSE, TRUE, 0);
-
+
label = gtk_label_new(_("Displayed columns"));
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(hbox0), label, FALSE, FALSE, 0);
@@ -634,7 +634,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
label = gtk_label_new (_("Show \"no unread (or new) message\" dialog"));
gtk_widget_show (label);
gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
-
+
optmenu_nextunreadmsgdialog = gtkut_sc_combobox_create(NULL, FALSE);
menu = GTK_LIST_STORE(gtk_combo_box_get_model(
GTK_COMBO_BOX(optmenu_nextunreadmsgdialog)));
@@ -667,7 +667,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON
(vbox1, checkbtn_ask_override_colorlabel,
_("Confirm when changing color labels"));
-
+
PACK_CHECK_BUTTON
(vbox1, checkbtn_show_tooltips,
_("Show tooltips"));
@@ -783,7 +783,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
spinbtn_mark_as_read_delay);
prefs_summaries->window = GTK_WIDGET(window);
-
+
combobox_select_by_data(GTK_COMBO_BOX(optmenu_folder_unread),
prefs_common.display_folder_unread);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_useaddrbook),
@@ -794,8 +794,8 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
prefs_common.thread_by_subject);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_ng_abbrev_len),
prefs_common.ng_abbrev_len);
- gtk_entry_set_text(GTK_ENTRY(entry_datefmt),
- prefs_common.date_format?prefs_common.date_format:"");
+ gtk_entry_set_text(GTK_ENTRY(entry_datefmt),
+ prefs_common.date_format?prefs_common.date_format:"");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_reopen_last_folder),
prefs_common.goto_last_folder_on_startup);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_startup_folder),
@@ -854,7 +854,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
prefs_common.summary_col_lock);
gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
-
+
prefs_summaries->page.widget = notebook;
}
@@ -873,10 +873,10 @@ static void prefs_summaries_save(PrefsPage *_page)
GTK_TOGGLE_BUTTON(page->checkbtn_threadsubj));
prefs_common.ng_abbrev_len = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(page->spinbtn_ng_abbrev_len));
-
- g_free(prefs_common.date_format);
+
+ g_free(prefs_common.date_format);
prefs_common.date_format = gtk_editable_get_chars(
- GTK_EDITABLE(page->entry_datefmt), 0, -1);
+ GTK_EDITABLE(page->entry_datefmt), 0, -1);
prefs_common.goto_last_folder_on_startup = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_reopen_last_folder));
@@ -1032,7 +1032,7 @@ static void date_format_entry_on_change(GtkEditable *editable,
buffer[0] = 0;
text = gtk_editable_get_chars(editable, 0, -1);
if (text)
- fast_strftime(buffer, sizeof buffer, text, cal_time);
+ fast_strftime(buffer, sizeof buffer, text, cal_time);
gtk_label_set_text(example, buffer);
@@ -1051,11 +1051,11 @@ static void date_format_select_row(GtkTreeView *list_view,
GtkWidget *datefmt_sample;
GtkTreeIter iter;
GtkTreeModel *model;
-
+
cm_return_if_fail(date_format != NULL);
/* only on double click */
- datefmt_sample = GTK_WIDGET(g_object_get_data(G_OBJECT(date_format),
+ datefmt_sample = GTK_WIDGET(g_object_get_data(G_OBJECT(date_format),
"datefmt_sample"));
cm_return_if_fail(datefmt_sample != NULL);
@@ -1066,8 +1066,8 @@ static void date_format_select_row(GtkTreeView *list_view,
if (!gtk_tree_model_get_iter(model, &iter, path))
return;
- gtk_tree_model_get(model, &iter, DATEFMT_FMT, &format, -1);
-
+ gtk_tree_model_get(model, &iter, DATEFMT_FMT, &format, -1);
+
cur_pos = gtk_editable_get_position(GTK_EDITABLE(datefmt_sample));
old_format = gtk_entry_get_text(GTK_ENTRY(datefmt_sample));
@@ -1108,4 +1108,4 @@ static void mark_as_read_toggled(GtkToggleButton *button, GtkWidget *spinbtn)
gtk_widget_set_sensitive(spinbtn,
gtk_toggle_button_get_active(button));
}
-
+
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
@@ -133,28 +133,28 @@ static void prefs_summary_column_insert_column (GtkListStore *store,
gint row,
const gchar *name,
SummaryColumnType type);
-
-static SummaryColumnType prefs_summary_column_get_column (GtkWidget *list,
+
+static SummaryColumnType prefs_summary_column_get_column (GtkWidget *list,
gint row);
static GtkWidget *prefs_summary_column_list_view_create (const gchar *name);
-static void prefs_filtering_create_list_view_columns (GtkWidget *list_view,
+static void prefs_filtering_create_list_view_columns (GtkWidget *list_view,
const gchar *name);
-static void drag_data_get (GtkTreeView *tree_view,
- GdkDragContext *context,
- GtkSelectionData *data,
- guint info,
- guint time,
+static void drag_data_get (GtkTreeView *tree_view,
+ GdkDragContext *context,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
GtkTreeModel *model);
-
-static void drag_data_received (GtkTreeView *tree_view,
+
+static void drag_data_received (GtkTreeView *tree_view,
GdkDragContext *context,
- gint x, gint y,
+ gint x, gint y,
GtkSelectionData *data,
- guint info,
- guint time,
+ guint info,
+ guint time,
GtkTreeModel *model);
static void prefs_summary_column_shown_set_btn_sensitivity(void);
@@ -374,7 +374,7 @@ static void prefs_summary_column_create(void)
summary_col.cancel_btn = cancel_btn;
summary_col.stock_list_view = stock_list_view;
summary_col.shown_list_view = shown_list_view;
-
+
prefs_summary_column_shown_set_active(FALSE);
prefs_summary_column_stock_set_active(FALSE);
}
@@ -492,12 +492,12 @@ static void prefs_summary_column_add(void)
gboolean shown_sel_valid;
gchar *name;
SummaryColumnType type;
-
+
stock_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(summary_col.stock_list_view)));
shown_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(summary_col.shown_list_view)));
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(summary_col.stock_list_view)),
@@ -510,23 +510,23 @@ static void prefs_summary_column_add(void)
(GTK_TREE_VIEW(summary_col.shown_list_view)),
NULL,
&shown_sel);
-
+
gtk_tree_model_get(GTK_TREE_MODEL(stock_store), &stock_sel,
SUMCOL_TYPE, &type,
-1);
-
+
gtk_list_store_remove(stock_store, &stock_sel);
- gtk_list_store_insert_after(shown_store, &shown_add,
+ gtk_list_store_insert_after(shown_store, &shown_add,
shown_sel_valid ? &shown_sel : NULL);
- name = gettext(col_name[type]);
-
+ name = gettext(col_name[type]);
+
gtk_list_store_set(shown_store, &shown_add,
SUMCOL_NAME, name,
SUMCOL_TYPE, type,
-1);
-
+
gtk_tree_selection_select_iter(gtk_tree_view_get_selection
(GTK_TREE_VIEW(summary_col.shown_list_view)),
&shown_add);
@@ -541,12 +541,12 @@ static void prefs_summary_column_remove(void)
gboolean stock_sel_valid;
gchar *name;
SummaryColumnType type;
-
+
stock_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(summary_col.stock_list_view)));
shown_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(summary_col.shown_list_view)));
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(summary_col.shown_list_view)),
@@ -559,23 +559,23 @@ static void prefs_summary_column_remove(void)
(GTK_TREE_VIEW(summary_col.stock_list_view)),
NULL,
&stock_sel);
-
+
gtk_tree_model_get(GTK_TREE_MODEL(shown_store), &shown_sel,
SUMCOL_TYPE, &type,
-1);
-
+
gtk_list_store_remove(shown_store, &shown_sel);
- gtk_list_store_insert_after(stock_store, &stock_add,
+ gtk_list_store_insert_after(stock_store, &stock_add,
stock_sel_valid ? &stock_sel : NULL);
- name = gettext(col_name[type]);
-
+ name = gettext(col_name[type]);
+
gtk_list_store_set(stock_store, &stock_add,
SUMCOL_NAME, name,
SUMCOL_TYPE, type,
-1);
-
+
gtk_tree_selection_select_iter(gtk_tree_view_get_selection
(GTK_TREE_VIEW(summary_col.stock_list_view)),
&stock_add);
@@ -589,7 +589,7 @@ static void prefs_summary_column_up(void)
GtkTreeIter isel;
GtkListStore *shown_store;
GtkTreeIter iprev;
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(summary_col.shown_list_view)),
@@ -600,12 +600,12 @@ static void prefs_summary_column_up(void)
shown_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(summary_col.shown_list_view)));
- sel = gtk_tree_model_get_path(GTK_TREE_MODEL(shown_store),
+ sel = gtk_tree_model_get_path(GTK_TREE_MODEL(shown_store),
&isel);
if (!sel)
return;
- prev = gtk_tree_path_copy(sel);
+ prev = gtk_tree_path_copy(sel);
if (!gtk_tree_path_prev(prev)) {
gtk_tree_path_free(prev);
gtk_tree_path_free(sel);
@@ -625,7 +625,7 @@ static void prefs_summary_column_down(void)
{
GtkListStore *shown_store;
GtkTreeIter next, sel;
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(summary_col.shown_list_view)),
@@ -637,7 +637,7 @@ static void prefs_summary_column_down(void)
(GTK_TREE_VIEW(summary_col.shown_list_view)));
next = sel;
- if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(shown_store), &next))
+ if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(shown_store), &next))
return;
gtk_list_store_swap(shown_store, &next, &sel);
@@ -699,7 +699,7 @@ static void prefs_summary_column_insert_column(GtkListStore *store,
if (row >= 0) {
if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store),
&iter, NULL, row))
- row = -1;
+ row = -1;
}
if (row < 0) {
/* add new */
@@ -711,7 +711,7 @@ static void prefs_summary_column_insert_column(GtkListStore *store,
return;
} else {
/* change existing */
- gtk_list_store_set(store, &iter,
+ gtk_list_store_set(store, &iter,
SUMCOL_NAME, name,
SUMCOL_TYPE, type,
-1);
@@ -722,7 +722,7 @@ static void prefs_summary_column_insert_column(GtkListStore *store,
*\brief Return the columnn type for a row
*/
static SummaryColumnType prefs_summary_column_get_column(GtkWidget *list, gint row)
-{
+{
GtkTreeView *list_view = GTK_TREE_VIEW(list);
GtkTreeModel *model = gtk_tree_view_get_model(list_view);
GtkTreeIter iter;
@@ -730,11 +730,11 @@ static SummaryColumnType prefs_summary_column_get_column(GtkWidget *list, gint r
if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, row))
return -1;
-
- gtk_tree_model_get(model, &iter,
+
+ gtk_tree_model_get(model, &iter,
SUMCOL_TYPE, &result,
-1);
-
+
return result;
}
@@ -756,14 +756,14 @@ static GtkWidget *prefs_summary_column_list_view_create(const gchar *name)
gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(list_view),
GDK_BUTTON1_MASK,
row_targets,
- G_N_ELEMENTS(row_targets),
+ G_N_ELEMENTS(row_targets),
GDK_ACTION_MOVE);
-
- gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(list_view),
- row_targets,
- G_N_ELEMENTS(row_targets),
+
+ gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(list_view),
+ row_targets,
+ G_N_ELEMENTS(row_targets),
GDK_ACTION_MOVE);
-
+
g_signal_connect(G_OBJECT(list_view), "drag_data_get",
G_CALLBACK(drag_data_get),
model);
@@ -775,7 +775,7 @@ static GtkWidget *prefs_summary_column_list_view_create(const gchar *name)
return list_view;
}
-static void prefs_filtering_create_list_view_columns(GtkWidget *list_view,
+static void prefs_filtering_create_list_view_columns(GtkWidget *list_view,
const gchar *name)
{
GtkTreeViewColumn *column;
@@ -784,26 +784,26 @@ static void prefs_filtering_create_list_view_columns(GtkWidget *list_view,
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(name, renderer, "text", SUMCOL_NAME, NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
}
-static void drag_data_get(GtkTreeView *tree_view, GdkDragContext *context,
- GtkSelectionData *data, guint info,
+static void drag_data_get(GtkTreeView *tree_view, GdkDragContext *context,
+ GtkSelectionData *data, guint info,
guint time, GtkTreeModel *model)
{
GtkTreeIter iter;
SummaryColumnType type;
GtkTreeModel *source_model;
- if (info != TARGET_INFO_SUMCOL)
+ if (info != TARGET_INFO_SUMCOL)
return;
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection(tree_view),
- &source_model, &iter))
- return;
-
- gtk_tree_model_get(source_model, &iter,
+ &source_model, &iter))
+ return;
+
+ gtk_tree_model_get(source_model, &iter,
SUMCOL_TYPE, &type,
-1);
@@ -827,7 +827,7 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
source = gtk_drag_get_source_widget(context);
if (source == GTK_WIDGET(tree_view)) {
-
+
/*
* Same widget: re-order
*/
@@ -843,7 +843,7 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
if (dst)
gtk_tree_model_get_iter(model, &idst, dst);
- else
+ else
gtk_list_store_move_before(GTK_LIST_STORE(model),
&isel,
NULL);
@@ -861,15 +861,15 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
gtk_list_store_move_after(GTK_LIST_STORE(model),
&isel,
&idst);
- }
+ }
gtk_tree_path_free(dst);
gtk_tree_path_free(sel);
}
gtk_drag_finish(context, TRUE, FALSE, time);
-
- } else if (source == summary_col.stock_list_view
+
+ } else if (source == summary_col.stock_list_view
|| source == summary_col.shown_list_view) {
-
+
/*
* Other widget: change and update
*/
@@ -885,7 +885,7 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
/* get insertion position */
gtk_tree_view_get_dest_row_at_pos(tree_view, x, y, &dst, &pos);
- /* NOTE: dst is invalid if insertion point beyond last row,
+ /* NOTE: dst is invalid if insertion point beyond last row,
* just append to list in that case (XXX_store_append()) */
if (dst) {
@@ -914,7 +914,7 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
prefs_summary_column_shown_set_active(FALSE);
prefs_summary_column_stock_set_active(FALSE);
-
+
/* XXXX: should we call gtk_drag_finish() for other code paths? */
}
@@ -926,14 +926,14 @@ static void prefs_summary_column_shown_set_btn_sensitivity(void)
GTK_TREE_VIEW(summary_col.shown_list_view));
GtkTreeIter iter;
GtkTreePath *path;
-
+
if(!gtk_tree_selection_get_selected(selection, NULL, &iter)) {
gtk_widget_set_sensitive(summary_col.remove_btn, FALSE);
gtk_widget_set_sensitive(summary_col.up_btn, FALSE);
gtk_widget_set_sensitive(summary_col.down_btn, FALSE);
return;
}
-
+
path = gtk_tree_model_get_path(model, &iter);
gtk_widget_set_sensitive(summary_col.up_btn, gtk_tree_path_prev(path));
@@ -945,14 +945,14 @@ static void prefs_summary_column_shown_set_btn_sensitivity(void)
static void prefs_summary_column_shown_set_active(const gboolean active)
{
GtkTreeSelection *selection = NULL;
-
+
gtk_widget_set_sensitive(summary_col.remove_btn, active);
-
+
if(active == FALSE) {
selection = gtk_tree_view_get_selection(
GTK_TREE_VIEW(summary_col.shown_list_view));
gtk_tree_selection_unselect_all(selection);
-
+
gtk_widget_set_sensitive(summary_col.up_btn, FALSE);
gtk_widget_set_sensitive(summary_col.down_btn, FALSE);
} else {
@@ -963,9 +963,9 @@ static void prefs_summary_column_shown_set_active(const gboolean active)
static void prefs_summary_column_stock_set_active(const gboolean active)
{
GtkTreeSelection *selection = NULL;
-
+
gtk_widget_set_sensitive(summary_col.add_btn, active);
-
+
if(active == FALSE) {
selection = gtk_tree_view_get_selection(
GTK_TREE_VIEW(summary_col.stock_list_view));
diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c
@@ -86,13 +86,13 @@ static void prefs_summary_open_insert_action (GtkListStore *store,
gchar *name,
gint act);
static GtkWidget *prefs_summary_open_list_view_create (const gchar *name);
-static void prefs_summary_open_create_list_view_columns (GtkWidget *list_view,
+static void prefs_summary_open_create_list_view_columns (GtkWidget *list_view,
const gchar *name);
-static void actions_list_model_row_changed (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
+static void actions_list_model_row_changed (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
GtkTreeView *list_view);
-
+
static void drag_begin (GtkTreeView *list_view,
GdkDragContext *context,
gpointer data);
@@ -103,7 +103,7 @@ static void drag_end (GtkTreeView *list_view,
static EntryAction saved_summary_select_prio[SUMMARY_OPEN_ACTIONS-1];
-static gchar *action_name[SUMMARY_OPEN_ACTIONS] =
+static gchar *action_name[SUMMARY_OPEN_ACTIONS] =
{ ("UNSET (!)"),
N_("oldest marked email"),
N_("oldest new email"),
@@ -128,7 +128,7 @@ void prefs_summary_open_open(void)
gtk_widget_grab_focus(summaryopen.ok_btn);
prefs_summary_open_set_dialog();
-
+
for (i = 0; i < SUMMARY_OPEN_ACTIONS-1; i++)
saved_summary_select_prio[i] = prefs_common.summary_select_prio[i];
@@ -161,7 +161,7 @@ static void prefs_summary_open_create(void)
GtkWidget *list_view_scrolledwin;
GtkWidget *possible_actions_list_view;
GtkWidget *actions_list_view;
-
+
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_summary_open");
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
@@ -273,14 +273,14 @@ static void prefs_summary_open_create(void)
actions_list_view);
gtk_tree_view_set_reorderable(GTK_TREE_VIEW(actions_list_view), TRUE);
- g_signal_connect(G_OBJECT(actions_list_view), "drag_begin",
+ g_signal_connect(G_OBJECT(actions_list_view), "drag_begin",
G_CALLBACK(drag_begin),
actions_list_view);
-
- g_signal_connect(G_OBJECT(actions_list_view), "drag_end",
+
+ g_signal_connect(G_OBJECT(actions_list_view), "drag_end",
G_CALLBACK(drag_end),
actions_list_view);
-
+
btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (list_view_hbox2), btn_vbox, FALSE, FALSE, 0);
@@ -363,13 +363,13 @@ fill:
for (i = 0; i < SUMMARY_OPEN_ACTIONS-1; i++) {
EntryAction act = prefs_common.summary_select_prio[i];
- if (act == ACTION_UNSET)
+ if (act == ACTION_UNSET)
continue;
-
+
set = TRUE;
used[act-1] = TRUE;
prefs_summary_open_insert_action(GTK_LIST_STORE
- (model_act), action_name[act], act);
+ (model_act), action_name[act], act);
}
if (!set) {
/* backward compat */
@@ -380,7 +380,7 @@ fill:
for (i = 1; i < SUMMARY_OPEN_ACTIONS; i++) {
if (!used[i-1]) {
prefs_summary_open_insert_action(GTK_LIST_STORE
- (model_poss), action_name[i], i);
+ (model_poss), action_name[i], i);
}
}
}
@@ -396,7 +396,7 @@ static void prefs_summary_open_set_list(void)
while (gtk_tree_model_iter_nth_child(model, &iter, NULL, row)) {
gtk_tree_model_get(model, &iter, PREFS_SUMMARY_OPEN_DATA, &data, -1);
prefs_common.summary_select_prio[row] = GPOINTER_TO_INT(data);
- row++;
+ row++;
}
for (; row < SUMMARY_OPEN_ACTIONS-1; row++) {
prefs_common.summary_select_prio[row] = ACTION_UNSET;
@@ -421,15 +421,15 @@ static void prefs_summary_open_delete_cb(GtkButton *btn, gpointer list_view_data
return;
gtk_tree_model_get(model, &iter, PREFS_SUMMARY_OPEN_DATA, &data, -1);
- if (!data)
+ if (!data)
return;
gtk_list_store_remove(store, &iter);
i = GPOINTER_TO_INT(data);
prefs_summary_open_insert_action(GTK_LIST_STORE
- (model_poss), action_name[i], i);
-
+ (model_poss), action_name[i], i);
+
prefs_summary_open_set_list();
}
@@ -451,15 +451,15 @@ static void prefs_summary_open_register_cb(GtkButton *btn, gpointer list_view_da
return;
gtk_tree_model_get(model_poss, &iter, PREFS_SUMMARY_OPEN_DATA, &data, -1);
- if (!data)
+ if (!data)
return;
gtk_list_store_remove(store, &iter);
i = GPOINTER_TO_INT(data);
prefs_summary_open_insert_action(GTK_LIST_STORE
- (model), action_name[i], i);
-
+ (model), action_name[i], i);
+
prefs_summary_open_set_list();
}
@@ -470,18 +470,18 @@ static void prefs_summary_open_up(void)
GtkListStore *store = NULL;
GtkTreeModel *model = NULL;
GtkTreeIter iprev;
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(summaryopen.actions_list_view)),
- &model,
+ &model,
&isel))
return;
store = (GtkListStore *)model;
sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
if (!sel)
return;
-
+
/* no move if we're at row 0... */
try = gtk_tree_path_copy(sel);
if (!gtk_tree_path_prev(try)) {
@@ -506,7 +506,7 @@ static void prefs_summary_open_down(void)
GtkTreeModel *model = NULL;
GtkTreeIter next, sel;
GtkTreePath *try;
-
+
if (!gtk_tree_selection_get_selected
(gtk_tree_view_get_selection
(GTK_TREE_VIEW(summaryopen.actions_list_view)),
@@ -515,13 +515,13 @@ static void prefs_summary_open_down(void)
return;
store = (GtkListStore *)model;
try = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &sel);
- if (!try)
+ if (!try)
return;
-
+
next = sel;
if (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &next))
gtk_list_store_swap(store, &next, &sel);
-
+
gtk_tree_path_free(try);
prefs_summary_open_set_list();
}
@@ -607,7 +607,7 @@ static GtkWidget *prefs_summary_open_list_view_create(const gchar *name)
return list_view;
}
-static void prefs_summary_open_create_list_view_columns(GtkWidget *list_view,
+static void prefs_summary_open_create_list_view_columns(GtkWidget *list_view,
const gchar *name)
{
GtkTreeViewColumn *column;
@@ -616,15 +616,15 @@ static void prefs_summary_open_create_list_view_columns(GtkWidget *list_view,
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(name, renderer, "text", PREFS_SUMMARY_OPEN_HEADER, NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
}
/*!
*\brief Called as a result of a drag & drop
*/
-static void actions_list_model_row_changed(GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
+static void actions_list_model_row_changed(GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
GtkTreeView *list_view)
{
}
@@ -636,7 +636,7 @@ static void drag_begin(GtkTreeView *list_view,
GdkDragContext *context,
gpointer data)
{
- /* XXX unfortunately a completed drag & drop does not emit
+ /* XXX unfortunately a completed drag & drop does not emit
* a "rows_reordered" signal, but a "row_changed" signal.
* So during drag and drop, listen to "row_changed", and
* update the account list accordingly */
diff --git a/src/prefs_template.c b/src/prefs_template.c
@@ -1,5 +1,5 @@
/*
- * Claws Mail templates subsystem
+ * Claws Mail templates subsystem
* Copyright (C) 2001 Alexander Barinov
* Copyright (C) 2001-2025 The Claws Mail team
*
@@ -58,7 +58,7 @@ static struct Templates {
GtkWidget *entry_subject;
GtkWidget *entry_from;
GtkWidget *entry_to;
- GtkWidget *entry_cc;
+ GtkWidget *entry_cc;
GtkWidget *entry_bcc;
GtkWidget *entry_replyto;
GtkWidget *text_value;
@@ -100,8 +100,8 @@ static gint prefs_template_deleted_cb (GtkWidget *widget,
static gboolean prefs_template_key_pressed_cb (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-static gboolean prefs_template_search_func_cb (GtkTreeModel *model, gint column,
- const gchar *key, GtkTreeIter *iter,
+static gboolean prefs_template_search_func_cb (GtkTreeModel *model, gint column,
+ const gchar *key, GtkTreeIter *iter,
gpointer search_data);
static void prefs_template_cancel_cb (gpointer action, gpointer data);
@@ -235,7 +235,7 @@ static void prefs_template_window_create(void)
gtk_widget_show(label);
gtk_label_set_xalign(GTK_LABEL(label), 1.0);
gtk_grid_attach(GTK_GRID(table), label, 0, i, 1, 1);
-
+
*(widgets_table[i].entry) = gtk_entry_new();
gtk_widget_show(*(widgets_table[i].entry));
gtk_grid_attach(GTK_GRID(table), *(widgets_table[i].entry), 1, i, 1, 1);
@@ -343,7 +343,7 @@ static void prefs_template_window_create(void)
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll1),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
-
+
vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show(vbox3);
gtk_box_pack_start(GTK_BOX(hbox4), vbox3, FALSE, FALSE, 0);
@@ -440,10 +440,10 @@ static void prefs_template_reset_dialog(void)
gtk_entry_set_text(GTK_ENTRY(templates.entry_from), "");
gtk_entry_set_text(GTK_ENTRY(templates.entry_to), "");
gtk_entry_set_text(GTK_ENTRY(templates.entry_cc), "");
- gtk_entry_set_text(GTK_ENTRY(templates.entry_bcc), "");
- gtk_entry_set_text(GTK_ENTRY(templates.entry_replyto), "");
+ gtk_entry_set_text(GTK_ENTRY(templates.entry_bcc), "");
+ gtk_entry_set_text(GTK_ENTRY(templates.entry_replyto), "");
gtk_entry_set_text(GTK_ENTRY(templates.entry_subject), "");
-
+
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(templates.text_value));
gtk_text_buffer_set_text(buffer, "", -1);
}
@@ -451,7 +451,7 @@ static void prefs_template_reset_dialog(void)
static void prefs_template_clear_list(void)
{
GtkListStore *store;
-
+
store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW
(templates.list_view)));
gtk_list_store_clear(store);
@@ -472,7 +472,7 @@ static void prefs_template_window_setup(void)
gtk_widget_grab_focus(templates.ok_btn);
prefs_template_clear_list();
-
+
tmpl_list = template_read_config();
address_completion_start(templates.window);
@@ -486,7 +486,7 @@ static void prefs_template_window_setup(void)
for (cur = tmpl_list; cur != NULL; cur = cur->next) {
tmpl = (Template *)cur->data;
prefs_template_list_view_insert_template(templates.list_view,
- -1, tmpl->name,
+ -1, tmpl->name,
tmpl);
}
@@ -517,8 +517,8 @@ static gboolean prefs_template_key_pressed_cb(GtkWidget *widget,
return FALSE;
}
-static gboolean prefs_template_search_func_cb (GtkTreeModel *model, gint column, const gchar *key,
- GtkTreeIter *iter, gpointer search_data)
+static gboolean prefs_template_search_func_cb (GtkTreeModel *model, gint column, const gchar *key,
+ GtkTreeIter *iter, gpointer search_data)
{
gchar *store_string;
gint key_len;
@@ -562,7 +562,7 @@ static void prefs_template_ok_cb(gpointer action, gpointer data)
"window-close", _("_Close"), NULL, _("_Continue editing"),
NULL, NULL, ALERTFOCUS_SECOND) != G_ALERTDEFAULT) {
return;
- }
+ }
prefs_template_address_completion_end();
@@ -624,17 +624,17 @@ static GSList *prefs_template_get_list(void)
gtk_tree_model_get(model, &iter,
TEMPL_DATA, &tmpl,
-1);
-
+
if (tmpl) {
Template *ntmpl;
-
+
ntmpl = g_new(Template, 1);
ntmpl->load_filename = NULL;
- ntmpl->name = tmpl->name && *(tmpl->name)
- ? g_strdup(tmpl->name)
+ ntmpl->name = tmpl->name && *(tmpl->name)
+ ? g_strdup(tmpl->name)
: NULL;
- ntmpl->subject = tmpl->subject && *(tmpl->subject)
- ? g_strdup(tmpl->subject)
+ ntmpl->subject = tmpl->subject && *(tmpl->subject)
+ ? g_strdup(tmpl->subject)
: NULL;
ntmpl->from = tmpl->from && *(tmpl->from)
? g_strdup(tmpl->from)
@@ -647,17 +647,17 @@ static GSList *prefs_template_get_list(void)
: NULL;
ntmpl->bcc = tmpl->bcc && *(tmpl->bcc)
? g_strdup(tmpl->bcc)
- : NULL;
+ : NULL;
ntmpl->replyto = tmpl->replyto && *(tmpl->replyto)
? g_strdup(tmpl->replyto)
- : NULL;
+ : NULL;
ntmpl->value = tmpl->value && *(tmpl->value)
? g_strdup(tmpl->value)
: NULL;
tmpl_list = g_slist_append(tmpl_list, ntmpl);
- }
-
- } while (gtk_tree_model_iter_next(model, &iter));
+ }
+
+ } while (gtk_tree_model_iter_next(model, &iter));
return tmpl_list;
}
@@ -688,8 +688,8 @@ gboolean prefs_template_string_is_valid(gchar *string, gint *line, gboolean esca
dummyinfo.inreplyto="<1234john@example.com>";
dummyinfo.newsgroups="alt.test";
dummyinfo.subject="subject";
-
-
+
+
#ifdef USE_ENCHANT
quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, account, FALSE, NULL);
#else
@@ -800,30 +800,30 @@ static gboolean prefs_template_list_view_set_row(gint row)
return FALSE;
}
if (!prefs_template_string_is_valid(cc, NULL, TRUE, TRUE)) {
- alertpanel_error(_("The \"Cc\" field of the template contains an invalid email address."));
+ alertpanel_error(_("The \"Cc\" field of the template contains an invalid email address."));
g_free(cc);
g_free(value);
return FALSE;
}
if (!prefs_template_string_is_valid(bcc, NULL, TRUE, TRUE)) {
- alertpanel_error(_("The \"Bcc\" field of the template contains an invalid email address."));
+ alertpanel_error(_("The \"Bcc\" field of the template contains an invalid email address."));
g_free(bcc);
g_free(value);
return FALSE;
}
if (!prefs_template_string_is_valid(replyto, NULL, TRUE, TRUE)) {
- alertpanel_error(_("The \"Reply-To\" field of the template contains an invalid email address."));
+ alertpanel_error(_("The \"Reply-To\" field of the template contains an invalid email address."));
g_free(replyto);
g_free(value);
return FALSE;
}
if (!prefs_template_string_is_valid(subject, NULL, TRUE, FALSE)) {
- alertpanel_error(_("The \"Subject\" field of the template is invalid."));
+ alertpanel_error(_("The \"Subject\" field of the template is invalid."));
g_free(subject);
g_free(value);
return FALSE;
}
-
+
tmpl = g_new(Template, 1);
tmpl->load_filename = NULL;
tmpl->name = name;
@@ -831,8 +831,8 @@ static gboolean prefs_template_list_view_set_row(gint row)
tmpl->from = from;
tmpl->to = to;
tmpl->cc = cc;
- tmpl->bcc = bcc;
- tmpl->replyto = replyto;
+ tmpl->bcc = bcc;
+ tmpl->replyto = replyto;
tmpl->value = value;
prefs_template_list_view_insert_template(templates.list_view,
@@ -897,7 +897,7 @@ static void prefs_template_delete_cb(gpointer action, gpointer data)
gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
prefs_template_reset_dialog();
- modified_list = TRUE;
+ modified_list = TRUE;
}
static void prefs_template_delete_all_cb(gpointer action, gpointer data)
@@ -921,7 +921,7 @@ static void prefs_template_duplicate_cb(gpointer action, gpointer data)
gint row;
GtkTreeIter iter;
GtkTreeModel *model;
-
+
row = gtkut_list_view_get_selected_row(templates.list_view);
if (row <= 0)
return;
@@ -949,11 +949,11 @@ static void prefs_template_top_cb(gpointer action, gpointer data)
GtkTreeModel *model;
row = gtkut_list_view_get_selected_row(templates.list_view);
- if (row <= 1)
+ if (row <= 1)
return;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
-
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
+
if (!gtk_tree_model_iter_nth_child(model, &top, NULL, 0)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, row))
return;
@@ -970,10 +970,10 @@ static void prefs_template_up_cb(gpointer action, gpointer data)
GtkTreeModel *model;
row = gtkut_list_view_get_selected_row(templates.list_view);
- if (row <= 1)
+ if (row <= 1)
return;
-
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
+
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row - 1)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, row))
@@ -990,7 +990,7 @@ static void prefs_template_down_cb(gpointer action, gpointer data)
GtkTreeIter top, sel;
GtkTreeModel *model;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
n_rows = gtk_tree_model_iter_n_children(model, NULL);
row = gtkut_list_view_get_selected_row(templates.list_view);
if (row < 1 || row >= n_rows - 1)
@@ -999,7 +999,7 @@ static void prefs_template_down_cb(gpointer action, gpointer data)
if (!gtk_tree_model_iter_nth_child(model, &top, NULL, row)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, row + 1))
return;
-
+
gtk_list_store_swap(GTK_LIST_STORE(model), &top, &sel);
gtkut_list_view_select_row(templates.list_view, row + 1);
modified_list = TRUE;
@@ -1011,7 +1011,7 @@ static void prefs_template_bottom_cb(gpointer action, gpointer data)
GtkTreeIter top, sel;
GtkTreeModel *model;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
n_rows = gtk_tree_model_iter_n_children(model, NULL);
row = gtkut_list_view_get_selected_row(templates.list_view);
if (row < 1 || row >= n_rows - 1)
@@ -1021,7 +1021,7 @@ static void prefs_template_bottom_cb(gpointer action, gpointer data)
|| !gtk_tree_model_iter_nth_child(model, &sel, NULL, n_rows - 1))
return;
- gtk_list_store_move_after(GTK_LIST_STORE(model), &top, &sel);
+ gtk_list_store_move_after(GTK_LIST_STORE(model), &top, &sel);
gtkut_list_view_select_row(templates.list_view, n_rows - 1);
modified_list = TRUE;
}
@@ -1029,7 +1029,7 @@ static void prefs_template_bottom_cb(gpointer action, gpointer data)
static GtkListStore* prefs_template_create_data_store(void)
{
return gtk_list_store_new(N_TEMPL_COLUMNS,
- G_TYPE_STRING,
+ G_TYPE_STRING,
G_TYPE_POINTER,
G_TYPE_AUTO_POINTER,
-1);
@@ -1057,7 +1057,7 @@ static void prefs_template_list_view_insert_template(GtkWidget *list_view,
} else if (row < -1 ) {
if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(list_store),
&sibling, NULL, -row-2))
- row = -1;
+ row = -1;
}
if (row == -1 ) {
@@ -1077,7 +1077,7 @@ static void prefs_template_list_view_insert_template(GtkWidget *list_view,
} else {
/* change existing */
GAuto *auto_data =
- g_auto_pointer_new_with_free(data, (GFreeFunc) template_free);
+ g_auto_pointer_new_with_free(data, (GFreeFunc) template_free);
/* if replacing data in an existing row, the auto pointer takes care
* of destroying the Template data */
@@ -1108,10 +1108,10 @@ static void prefs_template_row_selected(GtkTreeSelection *selection,
GtkTreePath *path;
GtkTreeIter iter;
GtkTreeModel *model;
-
+
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
-
+
path = gtk_tree_model_get_path(model, &iter);
prefs_template_select_row(list_view, path);
gtk_tree_path_free(path);
@@ -1172,10 +1172,10 @@ static gboolean prefs_template_list_popup_menu(GtkWidget *widget, gpointer data)
{
GtkTreeView *list_view = (GtkTreeView *)data;
GdkEventButton event;
-
+
event.button = 3;
event.time = gtk_get_current_event_time();
-
+
prefs_template_list_btn_pressed(NULL, &event, list_view);
return TRUE;
@@ -1189,7 +1189,7 @@ static GtkWidget *prefs_template_list_view_create(void)
model = GTK_TREE_MODEL(prefs_template_create_data_store());
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
- g_object_unref(model);
+ g_object_unref(model);
g_signal_connect(G_OBJECT(list_view), "popup-menu",
G_CALLBACK(prefs_template_list_popup_menu), list_view);
@@ -1220,7 +1220,7 @@ static void prefs_template_create_list_view_columns(GtkWidget *list_view)
renderer,
"text", TEMPL_TEXT,
NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(list_view), prefs_template_search_func_cb , NULL, NULL);
}
@@ -1249,8 +1249,8 @@ static void prefs_template_select_row(GtkTreeView *list_view, GtkTreePath *path)
tmpl_def.from = "";
tmpl_def.to = "";
tmpl_def.cc = "";
- tmpl_def.bcc = "";
- tmpl_def.replyto = "";
+ tmpl_def.bcc = "";
+ tmpl_def.replyto = "";
tmpl_def.value = "";
gtk_tree_model_get(model, &titer, TEMPL_DATA, &tmpl, -1);
@@ -1265,12 +1265,12 @@ static void prefs_template_select_row(GtkTreeView *list_view, GtkTreePath *path)
gtk_entry_set_text(GTK_ENTRY(templates.entry_cc),
tmpl->cc ? tmpl->cc : "");
gtk_entry_set_text(GTK_ENTRY(templates.entry_bcc),
- tmpl->bcc ? tmpl->bcc : "");
+ tmpl->bcc ? tmpl->bcc : "");
gtk_entry_set_text(GTK_ENTRY(templates.entry_replyto),
- tmpl->replyto ? tmpl->replyto : "");
+ tmpl->replyto ? tmpl->replyto : "");
gtk_entry_set_text(GTK_ENTRY(templates.entry_subject),
tmpl->subject ? tmpl->subject : "");
-
+
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(templates.text_value));
gtk_text_buffer_set_text(buffer, "", -1);
gtk_text_buffer_get_start_iter(buffer, &iter);
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
@@ -128,13 +128,13 @@ typedef struct _CopyInfo {
static ThemesData *prefs_themes_data;
-StockPixmap prefs_themes_icons[PREVIEW_ICONS] = {
+StockPixmap prefs_themes_icons[PREVIEW_ICONS] = {
STOCK_PIXMAP_DIR_CLOSE,
STOCK_PIXMAP_MAIL_SEND,
- STOCK_PIXMAP_MAIL_RECEIVE,
+ STOCK_PIXMAP_MAIL_RECEIVE,
STOCK_PIXMAP_MAIL_ATTACH,
- STOCK_PIXMAP_BOOK,
- STOCK_PIXMAP_MIME_TEXT_PLAIN,
+ STOCK_PIXMAP_BOOK,
+ STOCK_PIXMAP_MIME_TEXT_PLAIN,
STOCK_PIXMAP_REPLIED
};
@@ -234,7 +234,7 @@ static void prefs_themes_file_stats(const gchar *filename, gpointer data)
}
}
}
-
+
static void prefs_themes_file_remove(const gchar *filename, gpointer data)
{
gchar **status = (gchar **)data;
@@ -412,7 +412,7 @@ static void prefs_themes_get_themes_and_names(ThemesData *tdata)
tdata->displayed = (gchar *)tpaths->data;
}
tpaths = g_list_next(tpaths);
- g_free(sname);
+ g_free(sname);
}
}
@@ -484,7 +484,7 @@ void prefs_themes_done(void)
debug_print("Finished preferences for themes.\n");
stock_pixmap_themes_list_free(tdata->themes);
- prefs_themes_free_names(tdata);
+ prefs_themes_free_names(tdata);
g_free(tdata->page);
g_free(tdata);
}
@@ -511,7 +511,7 @@ static void prefs_themes_btn_remove_clicked_cb(GtkWidget *widget, gpointer data)
if (G_ALERTALTERNATE == val) {
gchar *status = NULL;
- prefs_themes_foreach_file(theme_str, prefs_themes_file_remove, &status);
+ prefs_themes_foreach_file(theme_str, prefs_themes_file_remove, &status);
if (0 != rmdir(theme_str)) {
if (status != NULL) {
alertpanel_error(_("File %s failed\nwhile removing theme."), status);
@@ -520,7 +520,7 @@ static void prefs_themes_btn_remove_clicked_cb(GtkWidget *widget, gpointer data)
else
alertpanel_error(_("Removing theme directory failed."));
}
- else {
+ else {
alertpanel_notice(_("Theme removed successfully"));
/* update interface back to first theme */
prefs_themes_get_themes_and_names(tdata);
@@ -542,7 +542,7 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
ThemesData *tdata = prefs_themes_data;
filename = filesel_select_file_open_folder(_("Select theme folder"), NULL);
- if (filename == NULL)
+ if (filename == NULL)
return;
if (filename[strlen(filename) - 1] != G_DIR_SEPARATOR)
@@ -868,10 +868,10 @@ static void prefs_themes_display_global_stats(const ThemesData *tdata)
while (tnames != NULL) {
ThemeName *tname = (ThemeName *)(tnames->data);
gchar *tpath = (gchar *)(tname->item->data);
-
- if (IS_SYSTEM_THEME(tpath))
+
+ if (IS_SYSTEM_THEME(tpath))
++sys;
- else if (!IS_INTERNAL_THEME(tpath))
+ else if (!IS_INTERNAL_THEME(tpath))
++usr;
++all;
tnames = g_list_next(tnames);
@@ -935,7 +935,7 @@ static void prefs_themes_get_theme_info(ThemesData *tdata)
info->author = g_strdup(line);
FGETS_INFOFILE_LINE()
info->url = g_strdup(line);
-
+
claws_fclose(finfo);
}
g_free(sinfo);
@@ -1285,7 +1285,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
#endif
prefs_themes->page.widget = vbox1;
-
+
prefs_themes_set_themes_menu(GTK_COMBO_BOX(menu_themes), tdata);
renderer = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(menu_themes), renderer, TRUE);
diff --git a/src/prefs_wrapping.c b/src/prefs_wrapping.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -53,11 +53,11 @@ typedef struct _WrappingPage
GtkWidget *checkbtn_autoindent;
} WrappingPage;
-static void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
+static void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
WrappingPage *prefs_wrapping = (WrappingPage *) _page;
-
+
GtkWidget *vbox1;
GtkWidget *vbox2;
GtkWidget *label_linewrap;
@@ -126,11 +126,11 @@ static void prefs_wrapping_save(PrefsPage *_page)
{
WrappingPage *page = (WrappingPage *) _page;
- prefs_common.linewrap_len =
+ prefs_common.linewrap_len =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->spinbtn_linewrap));
- prefs_common.linewrap_quote =
+ prefs_common.linewrap_quote =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_wrapquote));
- prefs_common.linewrap_pastes =
+ prefs_common.linewrap_pastes =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_wrappastes));
prefs_common.autowrap =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_autowrap));
diff --git a/src/printing.c b/src/printing.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -83,7 +83,7 @@ typedef struct {
/* callbacks */
static void printing_textview_cb_begin_print(GtkPrintOperation*,
GtkPrintContext*, gpointer);
-static void printing_textview_cb_draw_page(GtkPrintOperation*,
+static void printing_textview_cb_draw_page(GtkPrintOperation*,
GtkPrintContext*, gint,
gpointer);
static gboolean cb_preview(GtkPrintOperation*, GtkPrintOperationPreview*,
@@ -193,7 +193,7 @@ GtkPageSetup *printing_get_page_setup(void)
read_from_file = FALSE;
/* try reading the page setup from file */
- page_setup_filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+ page_setup_filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
PRINTING_PAGE_SETUP_STORAGE_FILE, NULL);
keyfile = g_key_file_new();
key_file_read = g_key_file_load_from_file(keyfile, page_setup_filename,
@@ -245,9 +245,9 @@ GtkPageSetup *printing_get_page_setup(void)
return page_setup;
}
-void printing_print_full(GtkWindow *parent, PrintRenderer *renderer, gpointer renderer_data,
+void printing_print_full(GtkWindow *parent, PrintRenderer *renderer, gpointer renderer_data,
gint sel_start, gint sel_end, GtkImage *avatar)
-{
+{
GtkPrintOperation *op;
GtkPrintOperationResult res;
PrintData *print_data;
@@ -338,14 +338,14 @@ static gpointer printing_textview_get_data_to_print(gpointer data, gint sel_star
void printing_print(GtkTextView *text_view, GtkWindow *parent, gint sel_start, gint sel_end, GtkImage *avatar)
{
PrintRenderer *textview_renderer = g_new0(PrintRenderer, 1);
-
+
textview_renderer->get_pango_context = printing_textview_get_pango_context;
textview_renderer->get_data_to_print = printing_textview_get_data_to_print;
textview_renderer->cb_begin_print = printing_textview_cb_begin_print;
textview_renderer->cb_draw_page = printing_textview_cb_draw_page;
printing_print_full(parent, textview_renderer, text_view, sel_start, sel_end, avatar);
-
+
g_free(textview_renderer);
}
@@ -371,7 +371,7 @@ void printing_page_setup(GtkWindow *parent)
gtk_page_setup_get_paper_size(page_setup)));
prefs_common.print_paper_orientation = gtk_page_setup_get_orientation(page_setup);
/* store 100th millimeters */
- prefs_common.print_margin_top = (int) (100*gtk_page_setup_get_top_margin(page_setup,
+ prefs_common.print_margin_top = (int) (100*gtk_page_setup_get_top_margin(page_setup,
PAGE_MARGIN_STORAGE_UNIT));
prefs_common.print_margin_bottom = (int) (100*gtk_page_setup_get_bottom_margin(page_setup,
PAGE_MARGIN_STORAGE_UNIT));
@@ -437,7 +437,7 @@ static gboolean cb_preview(GtkPrintOperation *operation,
/* vbox */
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(dialog), vbox);
-
+
/* toolbar */
toolbar = gtk_toolbar_new();
gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL);
@@ -453,7 +453,7 @@ static gboolean cb_preview(GtkPrintOperation *operation,
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ);
break;
case TOOLBAR_BOTH:
- default:
+ default:
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
}
gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE);
@@ -573,7 +573,7 @@ static gboolean cb_preview_close(GtkWidget *widget, GdkEventAny *event,
if (((GdkEventKey *)event)->keyval != GDK_KEY_Escape)
return FALSE;
if (preview_data->rendering)
- return FALSE;
+ return FALSE;
gtk_widget_destroy(widget);
return FALSE;
}
@@ -598,7 +598,7 @@ static void cb_preview_ready(GtkPrintOperationPreview *preview,
for (iPage = 0; iPage < (preview_data->print_data->npages); iPage++) {
if (gtk_print_operation_preview_is_selected(preview_data->preview, iPage)) {
- preview_data->pages_to_print =
+ preview_data->pages_to_print =
g_list_prepend(preview_data->pages_to_print,
GINT_TO_POINTER(iPage));
debug_print("want to print page %d\n",iPage+1);
@@ -628,7 +628,7 @@ static void cb_preview_got_page_size(GtkPrintOperationPreview *preview,
preview_data = (PreviewData*) data;
debug_print("got_page_size\n");
paper_size = gtk_page_setup_get_paper_size(page_setup);
- paper_width = (gint)(gtk_paper_size_get_width(paper_size, GTK_UNIT_INCH)
+ paper_width = (gint)(gtk_paper_size_get_width(paper_size, GTK_UNIT_INCH)
* PREVIEW_SCALE);
paper_height = (gint)(gtk_paper_size_get_height(paper_size, GTK_UNIT_INCH)
* PREVIEW_SCALE);
@@ -637,7 +637,7 @@ static void cb_preview_got_page_size(GtkPrintOperationPreview *preview,
preview_data->page_height = paper_height;
debug_print("w/h %d/%d\n", paper_width, paper_height);
- gtk_widget_set_size_request(GTK_WIDGET(preview_data->area),
+ gtk_widget_set_size_request(GTK_WIDGET(preview_data->area),
paper_width, paper_height);
}
@@ -744,7 +744,7 @@ static void cb_preview_btn_close(GtkButton *button, gpointer data)
{
PreviewData *preview_data = (PreviewData *)data;
if (preview_data->rendering)
- return;
+ return;
gtk_widget_destroy(preview_data->dialog);
}
@@ -956,7 +956,7 @@ static void printing_textview_cb_begin_print(GtkPrintOperation *op, GtkPrintCont
pango_layout_iter_free(iter);
page_breaks = g_list_reverse(page_breaks);
- print_data->npages = g_list_length(page_breaks) + 1;
+ print_data->npages = g_list_length(page_breaks) + 1;
print_data->page_breaks = page_breaks;
gtk_print_operation_set_n_pages(op, print_data->npages);
@@ -984,9 +984,9 @@ static cairo_surface_t *pixbuf_to_surface(GdkPixbuf *pixbuf)
format = CAIRO_FORMAT_RGB24;
else
format = CAIRO_FORMAT_ARGB32;
- surface = cairo_image_surface_create_for_data (pixels,
+ surface = cairo_image_surface_create_for_data (pixels,
format, width, height, 4*width);
- cairo_surface_set_user_data (surface, &key,
+ cairo_surface_set_user_data (surface, &key,
pixels, (cairo_destroy_func_t)g_free);
for (j = height; j; j--) {
@@ -1038,7 +1038,7 @@ static cairo_surface_t *pixbuf_to_surface(GdkPixbuf *pixbuf)
src_pixels += stride;
pixels += 4 * width;
}
-
+
return surface;
}
@@ -1098,7 +1098,7 @@ static void printing_textview_cb_draw_page(GtkPrintOperation *op, GtkPrintContex
gtk_print_context_get_height(context)/print_data->zoom);
cairo_set_line_width(cr, .5);
cairo_set_source_surface(cr, surface,
- ((double)logical_rect.x) / PANGO_SCALE,
+ ((double)logical_rect.x) / PANGO_SCALE,
((double)baseline) / PANGO_SCALE - start_pos);
cairo_move_to(cr, ((double)logical_rect.x) / PANGO_SCALE,
(double)print_data->ypos_line / PANGO_SCALE);
@@ -1117,8 +1117,8 @@ static void printing_textview_cb_draw_page(GtkPrintOperation *op, GtkPrintContex
cairo_surface_t *surface;
surface = pixbuf_to_surface(GDK_PIXBUF(attr->data));
- cairo_set_source_surface (cr, surface,
- ((double)logical_rect.x) / PANGO_SCALE,
+ cairo_set_source_surface (cr, surface,
+ ((double)logical_rect.x) / PANGO_SCALE,
((double)baseline) / PANGO_SCALE - start_pos);
cairo_paint (cr);
cairo_surface_destroy (surface);
@@ -1133,10 +1133,10 @@ static void printing_textview_cb_draw_page(GtkPrintOperation *op, GtkPrintContex
cairo_surface_t *surface;
GdkPixbuf *pixbuf = gtk_image_get_pixbuf(print_data->avatar);
gdouble startx, starty;
-
+
if (pixbuf != NULL) {
startx = gtk_print_context_get_width(context)/print_data->zoom;
-
+
startx -= ((double)gdk_pixbuf_get_width(pixbuf));
starty = start_pos;
@@ -1197,7 +1197,7 @@ static void printing_layout_set_text_attributes(PrintData *print_data,
rect.y = 0;
rect.width = r_w * PANGO_SCALE;
rect.height = r_h * PANGO_SCALE;
-
+
scaled = gdk_pixbuf_scale_simple(image, r_w, r_h, GDK_INTERP_BILINEAR);
attr = pango_attr_shape_new_with_data (&rect, &rect,
scaled, NULL, NULL);
@@ -1234,7 +1234,7 @@ static void printing_layout_set_text_attributes(PrintData *print_data,
attr_color = (PangoAttrColor*) attr;
g_object_get(G_OBJECT(tag), "foreground-rgba",
&color, NULL);
- if (color &&
+ if (color &&
printing_is_pango_gdk_rgba_equal(&(attr_color->color),
color)) {
attr->end_index = printing_text_iter_get_offset_bytes(print_data, &iter);
@@ -1260,7 +1260,7 @@ static void printing_layout_set_text_attributes(PrintData *print_data,
attr_color = (PangoAttrColor*) attr;
g_object_get(G_OBJECT(tag), "background-rgba",
&color, NULL);
- if (color &&
+ if (color &&
printing_is_pango_gdk_rgba_equal(&(attr_color->color),
color)) {
attr->end_index = printing_text_iter_get_offset_bytes(print_data, &iter);
@@ -1379,20 +1379,20 @@ static void printing_layout_set_text_attributes(PrintData *print_data,
g_object_get(G_OBJECT(tag), "underline", &underline, NULL);
attr = pango_attr_underline_new(underline);
attr->start_index = printing_text_iter_get_offset_bytes(print_data, &iter);
- open_attrs = g_slist_prepend(open_attrs, attr);
+ open_attrs = g_slist_prepend(open_attrs, attr);
}
if (strike_set) {
g_object_get(G_OBJECT(tag), "strikethrough", &strikethrough, NULL);
attr = pango_attr_strikethrough_new(strikethrough);
attr->start_index = printing_text_iter_get_offset_bytes(print_data, &iter);
- open_attrs = g_slist_prepend(open_attrs, attr);
+ open_attrs = g_slist_prepend(open_attrs, attr);
}
if (weight_set && !weight_set_for_this_iter) {
weight_set_for_this_iter = TRUE;
g_object_get(G_OBJECT(tag), "weight", &weight, NULL);
attr = pango_attr_weight_new(weight);
attr->start_index = printing_text_iter_get_offset_bytes(print_data, &iter);
- open_attrs = g_slist_prepend(open_attrs, attr);
+ open_attrs = g_slist_prepend(open_attrs, attr);
/* Hack to see if the first char is bold -- indicates header */
if (attr->start_index == 0 && weight == PANGO_WEIGHT_BOLD) {
*has_headers = TRUE;
@@ -1401,9 +1401,9 @@ static void printing_layout_set_text_attributes(PrintData *print_data,
}
g_slist_free(tags);
}
-
+
} while(!gtk_text_iter_is_end(&iter) && gtk_text_iter_forward_to_tag_toggle(&iter, NULL));
-
+
/* close all open attributes */
for (attr_walk = open_attrs; attr_walk != NULL; attr_walk = attr_walk->next) {
attr = (PangoAttribute*) attr_walk->data;
@@ -1438,7 +1438,7 @@ static gboolean printing_is_pango_gdk_rgba_equal(PangoColor *p, GdkRGBA *g)
}
/* Pango has it's attribute in bytes, but GtkTextIter gets only an offset
- * in characters, so here we're returning an offset in bytes.
+ * in characters, so here we're returning an offset in bytes.
*/
static gint printing_text_iter_get_offset_bytes(PrintData *print_data, const GtkTextIter *iter)
{
diff --git a/src/privacy.c b/src/privacy.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#include "config.h"
@@ -102,7 +102,7 @@ void privacy_unregister_system(PrivacySystem *system)
void privacy_free_privacydata(PrivacyData *privacydata)
{
PrivacySystem *system = NULL;
-
+
cm_return_if_fail(privacydata != NULL);
system = privacy_data_get_system(privacydata);
@@ -145,7 +145,7 @@ gboolean privacy_mimeinfo_is_signed(MimeInfo *mimeinfo)
cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (mimeinfo->privacy != NULL) {
- PrivacySystem *system =
+ PrivacySystem *system =
privacy_data_get_system(mimeinfo->privacy);
if (system == NULL) {
@@ -179,7 +179,7 @@ static void msginfo_set_signed_flag(GNode *node, gpointer data)
struct SignedState *sstate = (struct SignedState *)data;
MsgInfo *msginfo = sstate->msginfo;
MimeInfo *mimeinfo = node->data;
-
+
if (privacy_mimeinfo_is_signed(mimeinfo)) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_SIGNED);
if (sstate->system && !*(sstate->system) && mimeinfo->privacy)
@@ -312,9 +312,9 @@ static gint decrypt(MimeInfo *mimeinfo, PrivacySystem *system)
{
MimeInfo *decryptedinfo, *parentinfo;
gint childnumber;
-
+
cm_return_val_if_fail(system->decrypt != NULL, -1);
-
+
decryptedinfo = system->decrypt(mimeinfo);
if (decryptedinfo == NULL)
return -1;
@@ -324,7 +324,7 @@ static gint decrypt(MimeInfo *mimeinfo, PrivacySystem *system)
return -1;
childnumber = g_node_child_index(parentinfo->node, mimeinfo);
-
+
procmime_mimeinfo_free_all(&mimeinfo);
g_node_insert(parentinfo->node, childnumber, decryptedinfo->node);
@@ -459,7 +459,7 @@ gchar *privacy_get_encrypt_data(const gchar *id, GSList *recp_names)
}
}
ret = system->get_encrypt_data(uniq_names);
-
+
g_slist_free(uniq_names);
return ret;
}
diff --git a/src/procmime.c b/src/procmime.c
@@ -80,11 +80,11 @@ MimeInfo *procmime_mimeinfo_new(void)
mimeinfo->typeparameters = g_hash_table_new(g_str_hash, g_str_equal);
mimeinfo->disposition = DISPOSITIONTYPE_UNKNOWN;
- mimeinfo->dispositionparameters
+ mimeinfo->dispositionparameters
= g_hash_table_new(g_str_hash, g_str_equal);
mimeinfo->node = g_node_new(mimeinfo);
-
+
return mimeinfo;
}
@@ -92,7 +92,7 @@ static gboolean procmime_mimeinfo_parameters_destroy(gpointer key, gpointer valu
{
g_free(key);
g_free(value);
-
+
return TRUE;
}
@@ -263,7 +263,7 @@ const gchar *procmime_mimeinfo_get_parameter(MimeInfo *mimeinfo, const gchar *na
value = g_hash_table_lookup(mimeinfo->dispositionparameters, name);
if (value == NULL)
value = g_hash_table_lookup(mimeinfo->typeparameters, name);
-
+
return value;
}
@@ -298,21 +298,21 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
GStatBuf statbuf;
gboolean tmp_file = FALSE;
gboolean flowed = FALSE;
- gboolean delsp = FALSE;
+ gboolean delsp = FALSE;
gboolean err = FALSE;
gint state = 0;
guint save = 0;
cm_return_val_if_fail(mimeinfo != NULL, FALSE);
- EncodingType encoding = forced_encoding
+ EncodingType encoding = forced_encoding
? forced_encoding
: mimeinfo->encoding_type;
gchar lastline[BUFFSIZE];
memset(lastline, 0, BUFFSIZE);
if (prefs_common.respect_flowed_format &&
- mimeinfo->type == MIMETYPE_TEXT &&
+ mimeinfo->type == MIMETYPE_TEXT &&
!strcasecmp(mimeinfo->subtype, "plain")) {
if (procmime_mimeinfo_get_parameter(mimeinfo, "format") != NULL &&
!strcasecmp(procmime_mimeinfo_get_parameter(mimeinfo, "format"),"flowed"))
@@ -322,7 +322,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
!strcasecmp(procmime_mimeinfo_get_parameter(mimeinfo, "delsp"),"yes"))
delsp = TRUE;
}
-
+
if (!flowed && (
encoding == ENC_UNKNOWN ||
encoding == ENC_BINARY ||
@@ -392,7 +392,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
tmpfp = my_tmpfile();
if (!tmpfp) {
perror("my_tmpfile");
- if (tmp_file)
+ if (tmp_file)
claws_fclose(outfp);
claws_fclose(infp);
g_free(tmpfilename);
@@ -420,7 +420,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
got_error = TRUE;
continue;
} else if (len >= 0) {
- /* print out the error message only once
+ /* print out the error message only once
* per block */
if (null_bytes) {
/* we won't uncanonicalize, output to outfp directly */
@@ -456,7 +456,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
if (flag) {
len = fromuutobits(outbuf, buf);
if (len <= 0) {
- if (len < 0)
+ if (len < 0)
g_warning("bad UUENCODE content (%ld)", len);
break;
}
@@ -625,9 +625,9 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
if (!strncmp("From ", outbuf, sizeof("From ")-1)) {
gchar *tmpbuf = outbuf;
-
+
tmpbuf += sizeof("From ")-1;
-
+
if (claws_fputs("=46rom ", outfp) == EOF)
err = TRUE;
if (claws_fputs(tmpbuf, outfp) == EOF)
@@ -654,7 +654,7 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
g_free(tmpfilename);
return FALSE;
}
-
+
if (mimeinfo->content == MIMECONTENT_FILE) {
if (mimeinfo->tmp && (mimeinfo->data.filename != NULL))
claws_unlink(mimeinfo->data.filename);
@@ -755,7 +755,7 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
gboolean (*scan_callback)(const gchar *str, gpointer cb_data),
- gpointer cb_data)
+ gpointer cb_data)
{
FILE *tmpfp;
const gchar *src_codeset;
@@ -784,7 +784,7 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
}
src_codeset = forced_charset
- ? forced_charset :
+ ? forced_charset :
procmime_mimeinfo_get_parameter(mimeinfo, "charset");
/* use supersets transparently when possible */
@@ -852,7 +852,7 @@ static gboolean scan_fputs_cb(const gchar *str, gpointer fp)
{
if (claws_fputs(str, (FILE *)fp) == EOF)
return TRUE;
-
+
return FALSE;
}
@@ -929,7 +929,7 @@ scan_again:
goto scan_again;
} else if (!empty_ok && !short_scan) {
/* if full scan didn't find a non-empty part, rescan
- * accepting empty parts
+ * accepting empty parts
*/
empty_ok = TRUE;
procmime_mimeinfo_free_all(&mimeinfo);
@@ -945,12 +945,12 @@ static gboolean find_encrypted_func(GNode *node, gpointer data)
{
MimeInfo *mimeinfo = (MimeInfo *) node->data;
MimeInfo **encinfo = (MimeInfo **) data;
-
+
if (privacy_mimeinfo_is_encrypted(mimeinfo)) {
*encinfo = mimeinfo;
return TRUE;
}
-
+
return FALSE;
}
@@ -960,7 +960,7 @@ static MimeInfo *find_encrypted_part(MimeInfo *rootinfo)
g_node_traverse(rootinfo->node, G_IN_ORDER, G_TRAVERSE_ALL, -1,
find_encrypted_func, &encinfo);
-
+
return encinfo;
}
@@ -1057,7 +1057,7 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
f_prefix, base, NULL);
g_free(base);
-
+
return filename;
}
@@ -1095,7 +1095,7 @@ gchar *procmime_get_mime_type(const gchar *filename)
#ifndef G_OS_WIN32
mime_type = g_hash_table_lookup(mime_type_table, ext);
-
+
if (mime_type) {
str = g_strconcat(mime_type->type, "/", mime_type->sub_type,
NULL);
@@ -1182,20 +1182,20 @@ GList *procmime_get_mime_type_list(void)
MimeType *mime_type;
gboolean fp_is_glob_file = TRUE;
- if (mime_type_list)
+ if (mime_type_list)
return mime_type_list;
-
+
#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- if ((fp = claws_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL)
+ if ((fp = claws_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL)
#else
- if ((fp = claws_fopen("/usr/share/mime/globs", "rb")) == NULL)
+ if ((fp = claws_fopen("/usr/share/mime/globs", "rb")) == NULL)
#endif
{
fp_is_glob_file = FALSE;
if ((fp = claws_fopen("/etc/mime.types", "rb")) == NULL) {
- if ((fp = claws_fopen(SYSCONFDIR "/mime.types", "rb"))
+ if ((fp = claws_fopen(SYSCONFDIR "/mime.types", "rb"))
== NULL) {
- FILE_OP_ERROR(SYSCONFDIR "/mime.types",
+ FILE_OP_ERROR(SYSCONFDIR "/mime.types",
"claws_fopen");
return NULL;
}
@@ -1208,7 +1208,7 @@ GList *procmime_get_mime_type_list(void)
g_strstrip(buf);
p = buf;
-
+
if (fp_is_glob_file) {
while (*p && !g_ascii_isspace(*p) && (*p!=':')) p++;
} else {
@@ -1266,7 +1266,7 @@ EncodingType procmime_get_encoding_for_charset(const gchar *charset)
return ENC_QUOTED_PRINTABLE;
else if (!g_ascii_strncasecmp(charset, "UTF-8", 5))
return ENC_QUOTED_PRINTABLE;
- else
+ else
return ENC_8BIT;
}
@@ -1301,7 +1301,7 @@ EncodingType procmime_get_encoding_for_text_file(const gchar *file, gboolean *ha
}
claws_fclose(fp);
-
+
if (total_len > 0)
octet_percentage = (gfloat)octet_chars / (gfloat)total_len;
else
@@ -1323,7 +1323,7 @@ EncodingType procmime_get_encoding_for_text_file(const gchar *file, gboolean *ha
}
}
-struct EncodingTable
+struct EncodingTable
{
gchar *str;
EncodingType enc_type;
@@ -1342,7 +1342,7 @@ struct EncodingTable encoding_table[] = {
const gchar *procmime_get_encoding_str(EncodingType encoding)
{
struct EncodingTable *enc_table;
-
+
for (enc_table = encoding_table; enc_table->str != NULL; enc_table++) {
if (enc_table->enc_type == encoding)
return enc_table->str;
@@ -1374,7 +1374,7 @@ static struct TypeTable mime_type_table[] = {
const gchar *procmime_get_media_type_str(MimeMediaType type)
{
struct TypeTable *type_table;
-
+
for (type_table = mime_type_table; type_table->str != NULL; type_table++) {
if (type_table->type == type)
return type_table->str;
@@ -1396,7 +1396,7 @@ MimeMediaType procmime_get_media_type(const gchar *str)
/*!
*\brief Safe wrapper for content type string.
*
- *\return const gchar * Pointer to content type string.
+ *\return const gchar * Pointer to content type string.
*/
gchar *procmime_get_content_type_str(MimeMediaType type,
const char *subtype)
@@ -1465,22 +1465,22 @@ static void procmime_parse_message_rfc822(MimeInfo *mimeinfo, gboolean short_sca
tmp = conv_unmime_header(hentry[0].body, NULL, FALSE);
g_free(hentry[0].body);
hentry[0].body = tmp;
- }
+ }
if (hentry[2].body != NULL) {
tmp = conv_unmime_header(hentry[2].body, NULL, FALSE);
g_free(hentry[2].body);
hentry[2].body = tmp;
- }
+ }
if (hentry[4].body != NULL) {
tmp = conv_unmime_header(hentry[4].body, NULL, FALSE);
g_free(hentry[4].body);
hentry[4].body = tmp;
- }
+ }
if (hentry[5].body != NULL) {
tmp = conv_unmime_header(hentry[5].body, NULL, FALSE);
g_free(hentry[5].body);
hentry[5].body = tmp;
- }
+ }
if (hentry[7].body != NULL) {
tmp = conv_unmime_header(hentry[7].body, NULL, FALSE);
g_free(hentry[7].body);
@@ -1491,10 +1491,10 @@ static void procmime_parse_message_rfc822(MimeInfo *mimeinfo, gboolean short_sca
g_free(hentry[8].body);
hentry[8].body = tmp;
}
-
+
content_start = ftell(fp);
claws_fclose(fp);
-
+
len = mimeinfo->length - (content_start - mimeinfo->offset);
if (len < 0)
len = 0;
@@ -1502,17 +1502,17 @@ static void procmime_parse_message_rfc822(MimeInfo *mimeinfo, gboolean short_sca
hentry[0].body, hentry[1].body,
hentry[2].body, hentry[3].body,
hentry[4].body, hentry[5].body,
- hentry[7].body, hentry[8].body,
+ hentry[7].body, hentry[8].body,
mimeinfo->data.filename, content_start,
len, short_scan);
-
+
for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
g_free(hentry[i].body);
hentry[i].body = NULL;
}
}
-static void procmime_parse_disposition_notification(MimeInfo *mimeinfo,
+static void procmime_parse_disposition_notification(MimeInfo *mimeinfo,
const gchar *original_msgid, const gchar *disposition_notification_hdr,
gboolean short_scan)
{
@@ -1544,7 +1544,7 @@ static void procmime_parse_disposition_notification(MimeInfo *mimeinfo,
} else {
procheader_get_header_fields(fp, hentry);
}
-
+
claws_fclose(fp);
if (!hentry[0].body || !hentry[1].body) {
@@ -1559,7 +1559,7 @@ static void procmime_parse_disposition_notification(MimeInfo *mimeinfo,
extract_parenthesis(orig_msg_id, '<', '>');
remove_space(orig_msg_id);
-
+
if (strstr(disp, "displayed")) {
/* find sent message, if possible */
MsgInfo *info = NULL;
@@ -1683,16 +1683,16 @@ static void procmime_parse_multipart(MimeInfo *mimeinfo, gboolean short_scan)
len = 0;
result = procmime_parse_mimepart(mimeinfo,
hentry[0].body, hentry[1].body,
- hentry[2].body, hentry[3].body,
+ hentry[2].body, hentry[3].body,
hentry[4].body, hentry[5].body,
hentry[6].body, hentry[7].body,
mimeinfo->data.filename, lastoffset,
len, short_scan);
if (result == 1 && short_scan)
break;
-
- }
-
+
+ }
+
if (buf[2 + boundary_len] == '-' &&
buf[2 + boundary_len + 1] == '-') {
end_found = TRUE;
@@ -1706,14 +1706,14 @@ static void procmime_parse_multipart(MimeInfo *mimeinfo, gboolean short_scan)
lastoffset = ftell(fp);
}
}
-
+
if (start_found && !end_found && lastoffset != -1) {
glong len = (ftell(fp) - strlen(buf)) - lastoffset - 1;
if (len >= 0) {
result = procmime_parse_mimepart(mimeinfo,
hentry[0].body, hentry[1].body,
- hentry[2].body, hentry[3].body,
+ hentry[2].body, hentry[3].body,
hentry[4].body, hentry[5].body,
hentry[6].body, hentry[7].body,
mimeinfo->data.filename, lastoffset,
@@ -1721,7 +1721,7 @@ static void procmime_parse_multipart(MimeInfo *mimeinfo, gboolean short_scan)
}
mimeinfo->broken = TRUE;
}
-
+
for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
g_free(hentry[i].body);
hentry[i].body = NULL;
@@ -1762,7 +1762,7 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
down_attr = g_utf8_strdown(attribute, -1);
orig_down_attr = down_attr;
-
+
len = down_attr ? strlen(down_attr):0;
if (len > 0 && down_attr[len - 1] == '*') {
gchar *srcpos, *dstpos, *endpos;
@@ -1801,13 +1801,13 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
if (down_attr) {
while (down_attr[0] == ' ')
down_attr++;
- while (down_attr[strlen(down_attr)-1] == ' ')
+ while (down_attr[strlen(down_attr)-1] == ' ')
down_attr[strlen(down_attr)-1] = '\0';
- }
+ }
while (value[0] != '\0' && value[0] == ' ')
value++;
- while (value[strlen(value)-1] == ' ')
+ while (value[strlen(value)-1] == ' ')
value[strlen(value)-1] = '\0';
if (down_attr && strrchr(down_attr, '*') != NULL) {
@@ -1817,7 +1817,7 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
tmp = strrchr(tmpattr, '*');
tmp[0] = '\0';
- if ((tmp[1] == '0') && (tmp[2] == '\0') &&
+ if ((tmp[1] == '0') && (tmp[2] == '\0') &&
(g_slist_find_custom(concatlist, down_attr, (GCompareFunc)g_strcmp0) == NULL))
concatlist = g_slist_prepend(concatlist, g_strdup(tmpattr));
@@ -1893,7 +1893,7 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
slist_free_strings_full(convlist);
g_free(params);
-}
+}
static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mimeinfo)
{
@@ -1945,16 +1945,16 @@ static void procmime_parse_content_disposition(const gchar *content_disposition,
if ((params = strchr(tmp, ';')) != NULL) {
params[0] = '\0';
params++;
- }
+ }
g_strstrip(tmp);
- if (!g_ascii_strcasecmp(tmp, "inline"))
+ if (!g_ascii_strcasecmp(tmp, "inline"))
mimeinfo->disposition = DISPOSITIONTYPE_INLINE;
else if (!g_ascii_strcasecmp(tmp, "attachment"))
mimeinfo->disposition = DISPOSITIONTYPE_ATTACHMENT;
else
mimeinfo->disposition = DISPOSITIONTYPE_ATTACHMENT;
-
+
if (params != NULL)
parse_parameters(params, mimeinfo->dispositionparameters);
@@ -1965,7 +1965,7 @@ static void procmime_parse_content_disposition(const gchar *content_disposition,
static void procmime_parse_content_encoding(const gchar *content_encoding, MimeInfo *mimeinfo)
{
struct EncodingTable *enc_table;
-
+
for (enc_table = encoding_table; enc_table->str != NULL; enc_table++) {
if (g_ascii_strcasecmp(enc_table->str, content_encoding) == 0) {
mimeinfo->encoding_type = enc_table->enc_type;
@@ -1996,7 +1996,7 @@ void procmime_mimeparser_register(MimeParser *parser)
}
-void procmime_mimeparser_unregister(MimeParser *parser)
+void procmime_mimeparser_unregister(MimeParser *parser)
{
registered_parsers = g_slist_remove(registered_parsers, parser);
}
@@ -2004,7 +2004,7 @@ void procmime_mimeparser_unregister(MimeParser *parser)
static gboolean procmime_mimeparser_parse(MimeParser *parser, MimeInfo *mimeinfo)
{
cm_return_val_if_fail(parser->parse != NULL, FALSE);
- return parser->parse(parser, mimeinfo);
+ return parser->parse(parser, mimeinfo);
}
static int procmime_parse_mimepart(MimeInfo *parent,
@@ -2033,11 +2033,11 @@ static int procmime_parse_mimepart(MimeInfo *parent,
if (parent != NULL) {
if (g_node_depth(parent->node) > 32) {
/* 32 is an arbitrary value
- * this avoids DOSsing ourselves
+ * this avoids DOSsing ourselves
* with enormous messages
*/
procmime_mimeinfo_free_all(&mimeinfo);
- return -1;
+ return -1;
}
g_node_append(parent->node, mimeinfo->node);
}
@@ -2091,7 +2091,7 @@ static int procmime_parse_mimepart(MimeInfo *parent,
/* Call parser for mime type */
if ((parser = procmime_get_mimeparser_for_type(mimeinfo->type, mimeinfo->subtype)) != NULL) {
parsed = procmime_mimeparser_parse(parser, mimeinfo);
- }
+ }
if (!parsed) {
switch (mimeinfo->type) {
case MIMETYPE_TEXT:
@@ -2105,20 +2105,20 @@ static int procmime_parse_mimepart(MimeInfo *parent,
procmime_parse_message_rfc822(mimeinfo, short_scan);
}
if (g_ascii_strcasecmp(mimeinfo->subtype, "disposition-notification") == 0) {
- procmime_parse_disposition_notification(mimeinfo,
+ procmime_parse_disposition_notification(mimeinfo,
original_msgid, disposition_notification_hdr, short_scan);
}
break;
-
+
case MIMETYPE_MULTIPART:
procmime_parse_multipart(mimeinfo, short_scan);
break;
-
+
case MIMETYPE_APPLICATION:
if (g_ascii_strcasecmp(mimeinfo->subtype, "octet-stream") == 0
- && original_msgid && *original_msgid
+ && original_msgid && *original_msgid
&& disposition_notification_hdr && *disposition_notification_hdr) {
- procmime_parse_disposition_notification(mimeinfo,
+ procmime_parse_disposition_notification(mimeinfo,
original_msgid, disposition_notification_hdr, short_scan);
}
break;
@@ -2152,8 +2152,8 @@ static gboolean output_func(GNode *node, gpointer data)
depth = g_node_depth(node);
for (i = 0; i < depth; i++)
g_print(" ");
- g_print("%s/%s (offset:%ld length:%ld encoding: %d)\n",
- (mimeinfo->type <= MIMETYPE_UNKNOWN)? typenames[mimeinfo->type] : "unknown",
+ g_print("%s/%s (offset:%ld length:%ld encoding: %d)\n",
+ (mimeinfo->type <= MIMETYPE_UNKNOWN)? typenames[mimeinfo->type] : "unknown",
mimeinfo->subtype, mimeinfo->offset, mimeinfo->length, mimeinfo->encoding_type);
return FALSE;
@@ -2288,7 +2288,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
encas = ENC_AS_ENCWORD;
break;
}
-
+
/* CTLs */
if (((*valpos >= 0) && (*valpos < 037)) || (*valpos == 0177)) {
encas = ENC_AS_QUOTED_STRING;
@@ -2298,7 +2298,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
/* tspecials + SPACE */
switch (*valpos) {
case ' ':
- case '(':
+ case '(':
case ')':
case '<':
case '>':
@@ -2317,7 +2317,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
continue;
}
}
-
+
switch (encas) {
case ENC_AS_TOKEN:
g_string_append_printf(buf, "%s=%s", param, val);
@@ -2378,7 +2378,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
break;
}
-
+
if (buf->str && strlen(buf->str)) {
tmp = strstr(buf->str, "\n");
if (tmp)
@@ -2409,7 +2409,7 @@ int procmime_write_mime_header(MimeInfo *mimeinfo, FILE *fp)
struct TypeTable *type_table;
ParametersData *pdata = g_new0(ParametersData, 1);
debug_print("procmime_write_mime_header\n");
-
+
pdata->fp = fp;
pdata->error = FALSE;
for (type_table = mime_type_table; type_table->str != NULL; type_table++)
@@ -2476,7 +2476,7 @@ int procmime_write_mime_header(MimeInfo *mimeinfo, FILE *fp)
}
TRY(fprintf(fp, "\n") >= 0);
-
+
return 0;
}
@@ -2620,7 +2620,7 @@ static gint procmime_write_multipart(MimeInfo *mimeinfo, FILE *fp)
firstboundary = FALSE;
else
TRY(fprintf(fp, "\n") >= 0);
-
+
TRY(fprintf(fp, "--%s\n", boundary) >= 0);
if (procmime_write_mime_header(child, fp) < 0)
@@ -2629,7 +2629,7 @@ static gint procmime_write_multipart(MimeInfo *mimeinfo, FILE *fp)
return -1;
childnode = g_node_next_sibling(childnode);
- }
+ }
TRY(fprintf(fp, "\n--%s--\n", boundary) >= 0);
return 0;
@@ -2669,10 +2669,10 @@ gint procmime_write_mimeinfo(MimeInfo *mimeinfo, FILE *fp)
return procmime_write_message_rfc822(mimeinfo, fp);
}
break;
-
+
case MIMETYPE_MULTIPART:
return procmime_write_multipart(mimeinfo, fp);
-
+
default:
break;
}
@@ -2707,7 +2707,7 @@ gchar *procmime_get_part_file_name(MimeInfo *mimeinfo)
g_free(basename);
subst_for_shellsafe_filename(base);
}
-
+
return base;
}
diff --git a/src/procmsg.c b/src/procmsg.c
@@ -115,8 +115,8 @@ struct MarkSum {
};
/* CLAWS subject threading:
-
- in the first round it inserts subject lines in a
+
+ in the first round it inserts subject lines in a
hashtable (subject <-> node)
the second round finishes the threads by attaching
@@ -124,7 +124,7 @@ struct MarkSum {
hashtable. will use the oldest node with the same
subject that is not more then thread_by_subject_max_age
days old (see subject_hashtable_lookup)
-*/
+*/
static void subject_hashtable_insert(GHashTable *hashtable, GNode *node)
{
@@ -156,7 +156,7 @@ static GNode *subject_hashtable_lookup(GHashTable *hashtable, MsgInfo *msginfo)
gint prefix_length;
MsgInfo *hashtable_msginfo = NULL, *best_msginfo = NULL;
gboolean match;
-
+
cm_return_val_if_fail(hashtable != NULL, NULL);
subject = msginfo->subject;
@@ -166,7 +166,7 @@ static GNode *subject_hashtable_lookup(GHashTable *hashtable, MsgInfo *msginfo)
if (prefix_length <= 0)
return NULL;
subject += prefix_length;
-
+
list = g_hash_table_lookup(hashtable, subject);
if (list == NULL)
return NULL;
@@ -219,7 +219,7 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
START_TIMING("");
root = g_node_new(NULL);
msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
-
+
if (prefs_common.thread_by_subject) {
subject_hashtable = g_hash_table_new(g_str_hash, g_str_equal);
}
@@ -251,7 +251,7 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
next = node->next;
msginfo = (MsgInfo *)node->data;
parent = NULL;
-
+
if (msginfo->inreplyto)
parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
@@ -262,8 +262,8 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
if ((parent = g_hash_table_lookup
(msgid_table, reflist->data)) != NULL)
break;
- }
-
+ }
+
/* node should not be the parent, and node should not
be an ancestor of parent (circular reference) */
if (parent && parent != node &&
@@ -272,7 +272,7 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
g_node_insert_before
(parent, parent->children, node);
}
-
+
node = next;
}
@@ -281,11 +281,11 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
for (node = root->children; node && node != NULL;) {
next = node->next;
msginfo = (MsgInfo *) node->data;
-
+
parent = subject_hashtable_lookup(subject_hashtable, msginfo);
-
- /* the node may already be threaded by IN-REPLY-TO, so go up
- * in the tree to
+
+ /* the node may already be threaded by IN-REPLY-TO, so go up
+ * in the tree to
find the parent node */
if (parent != NULL) {
if (g_node_is_ancestor(node, parent))
@@ -293,17 +293,17 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
if (parent == node)
parent = NULL;
}
-
+
if (parent) {
g_node_unlink(node);
g_node_append(parent, node);
}
node = next;
- }
+ }
END_TIMING();
}
-
+
if (prefs_common.thread_by_subject)
{
g_hash_table_foreach(subject_hashtable, subject_hashtable_free, NULL);
@@ -487,7 +487,7 @@ FILE *procmsg_open_message(MsgInfo *msginfo, gboolean skip_special_headers)
gchar *file;
cm_return_val_if_fail(msginfo != NULL, NULL);
-
+
file = procmsg_get_message_file_path(msginfo);
cm_return_val_if_fail(file != NULL, NULL);
@@ -678,7 +678,7 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
g_free(hentry[H_LIST_ID].body);
hentry[H_LIST_ID].body = NULL;
g_free(hentry[H_SENDER].body);
- hentry[H_SENDER].body = NULL;
+ hentry[H_SENDER].body = NULL;
#undef SET_FILTER_KEY
break;
@@ -691,8 +691,8 @@ static void procmsg_empty_trash(FolderItem *trash)
{
GNode *node, *next;
- if (!trash ||
- (trash->stype != F_TRASH &&
+ if (!trash ||
+ (trash->stype != F_TRASH &&
!folder_has_parent_of_type(trash, F_TRASH)))
return;
@@ -705,7 +705,7 @@ static void procmsg_empty_trash(FolderItem *trash)
procmsg_msginfo_free(&msginfo);
continue;
}
- if (msginfo->total_size != 0 &&
+ if (msginfo->total_size != 0 &&
msginfo->size != (off_t)msginfo->total_size)
partial_mark_for_delete(msginfo);
@@ -735,7 +735,7 @@ void procmsg_empty_all_trash(void)
Folder *folder = FOLDER(cur->data);
trash = folder->trash;
procmsg_empty_trash(trash);
- if (folder->account && folder->account->set_trash_folder &&
+ if (folder->account && folder->account->set_trash_folder &&
folder_find_item_from_identifier(folder->account->trash_folder))
procmsg_empty_trash(
folder_find_item_from_identifier(folder->account->trash_folder));
@@ -765,7 +765,7 @@ static PrefsAccount *procmsg_get_account_from_file(const gchar *file)
{"X-Sylpheed-Encrypt:", NULL, FALSE},
{"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
{NULL, NULL, FALSE}};
-
+
cm_return_val_if_fail(file != NULL, NULL);
if ((fp = claws_fopen(file, "rb")) == NULL) {
@@ -878,15 +878,15 @@ static GSList *procmsg_list_sort_by_account(FolderItem *queue, GSList *list)
return NULL;
orig = g_slist_copy(list);
-
+
msg = (MsgInfo *)orig->data;
-
+
for (cur = orig; cur; cur = cur->next)
debug_print("sort before %s\n", ((MsgInfo *)cur->data)->from);
-
+
debug_print("\n");
-parse_again:
+parse_again:
nothing_to_sort = TRUE;
cur = orig;
while (cur) {
@@ -906,7 +906,7 @@ parse_again:
}
cur = cur->next;
}
-
+
if (orig && g_slist_length(orig)) {
if (!last_account && nothing_to_sort) {
/* can't find an account for the rest of the list */
@@ -920,9 +920,9 @@ parse_again:
goto parse_again;
}
}
-
+
g_slist_free(orig);
-
+
for (cur = result; cur; cur = cur->next)
debug_print("sort after %s\n", ((MsgInfo *)cur->data)->from);
@@ -940,14 +940,14 @@ static gboolean procmsg_is_last_for_account(FolderItem *queue, MsgInfo *msginfo,
for (cur = elem; cur; cur = cur->next) {
MsgInfo *cur_msginfo = (MsgInfo *)cur->data;
file = folder_item_fetch_msg(queue, cur_msginfo->msgnum);
-
+
if (cur_msginfo != msginfo && !MSG_IS_LOCKED(cur_msginfo->flags)) {
if (procmsg_get_account_from_file(file) == ac) {
g_free(file);
return FALSE;
}
}
-
+
g_free(file);
}
return TRUE;
@@ -988,7 +988,7 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
GSList *list, *elem;
GSList *sorted_list = NULL;
GNode *node, *next;
-
+
if (!procmsg_queue_lock(errstr)) {
main_window_set_menu_sensitive(mainwindow_get_mainwindow());
toolbar_main_set_sensitive(mainwindow_get_mainwindow());
@@ -997,7 +997,7 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
inc_lock();
if (!queue)
queue = folder_get_default_queue();
-
+
if (queue == NULL) {
procmsg_queue_unlock();
inc_unlock();
@@ -1012,24 +1012,24 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
/* sort the list per sender account; this helps reusing the same SMTP server */
sorted_list = procmsg_list_sort_by_account(queue, list);
-
+
for (elem = sorted_list; elem != NULL; elem = elem->next) {
gchar *file;
MsgInfo *msginfo;
-
+
msginfo = (MsgInfo *)(elem->data);
if (!MSG_IS_LOCKED(msginfo->flags) && !MSG_IS_DELETED(msginfo->flags)) {
file = folder_item_fetch_msg(queue, msginfo->msgnum);
if (file) {
gboolean queued_removed = FALSE;
- if (procmsg_send_message_queue_full(file,
+ if (procmsg_send_message_queue_full(file,
!procmsg_is_last_for_account(queue, msginfo, elem),
errstr, queue, msginfo->msgnum, &queued_removed) < 0) {
g_warning("sending queued message %d failed",
msginfo->msgnum);
err++;
} else {
- sent++;
+ sent++;
if (!queued_removed)
folder_item_remove_msg(queue, msginfo->msgnum);
}
@@ -1037,7 +1037,7 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
}
}
/* FIXME: supposedly if only one message is locked, and queue
- * is being flushed, the following free says something like
+ * is being flushed, the following free says something like
* "freeing msg ## in folder (nil)". */
procmsg_msginfo_free(&msginfo);
}
@@ -1053,7 +1053,7 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
send_queue_lock = FALSE;
res = procmsg_send_queue(FOLDER_ITEM(node->data), save_msgs, errstr);
send_queue_lock = TRUE;
- if (res < 0)
+ if (res < 0)
err = -res;
else
sent += res;
@@ -1112,7 +1112,7 @@ gint procmsg_remove_special_headers(const gchar *in, const gchar *out)
{
FILE *fp, *outfp;
gchar buf[BUFFSIZE];
-
+
if ((fp = claws_fopen(in, "rb")) == NULL) {
FILE_OP_ERROR(in, "claws_fopen");
return -1;
@@ -1175,7 +1175,7 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file)
g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.out.%08x",
get_rc_dir(), G_DIR_SEPARATOR, (guint) rand());
-
+
if (procmsg_remove_special_headers(file, tmp) !=0)
return -1;
@@ -1198,16 +1198,16 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file)
}
msginfo = folder_item_get_msginfo(outbox, num); /* refcnt++ */
- tmp_msginfo = procmsg_msginfo_get_full_info(msginfo); /* refcnt++ */
+ tmp_msginfo = procmsg_msginfo_get_full_info(msginfo); /* refcnt++ */
if (msginfo != NULL) {
procmsg_msginfo_unset_flags(msginfo, ~0, 0);
procmsg_msginfo_free(&msginfo); /* refcnt-- */
/* tmp_msginfo == msginfo */
- if (tmp_msginfo && msginfo->extradata &&
- (msginfo->extradata->dispositionnotificationto ||
+ if (tmp_msginfo && msginfo->extradata &&
+ (msginfo->extradata->dispositionnotificationto ||
msginfo->extradata->returnreceiptto)) {
- procmsg_msginfo_set_flags(msginfo, MSG_RETRCPT_SENT, 0);
- }
+ procmsg_msginfo_set_flags(msginfo, MSG_RETRCPT_SENT, 0);
+ }
procmsg_msginfo_free(&tmp_msginfo); /* refcnt-- */
}
@@ -1218,7 +1218,7 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file)
MsgInfo *procmsg_msginfo_new_ref(MsgInfo *msginfo)
{
msginfo->refcnt++;
-
+
return msginfo;
}
@@ -1228,7 +1228,7 @@ MsgInfo *procmsg_msginfo_new(void)
newmsginfo = g_new0(MsgInfo, 1);
newmsginfo->refcnt = 1;
-
+
return newmsginfo;
}
@@ -1314,7 +1314,7 @@ MsgInfo *procmsg_msginfo_copy(MsgInfo *msginfo)
refs = msginfo->references;
for (refs = msginfo->references; refs != NULL; refs = refs->next) {
newmsginfo->references = g_slist_prepend
- (newmsginfo->references, g_strdup(refs->data));
+ (newmsginfo->references, g_strdup(refs->data));
}
newmsginfo->references = g_slist_reverse(newmsginfo->references);
@@ -1360,7 +1360,7 @@ MsgInfo *procmsg_msginfo_get_full_info_from_file(MsgInfo *msginfo, const gchar *
msginfo->extradata->avatars = g_slist_copy_deep(full_msginfo->extradata->avatars,
(GCopyFunc) procmsg_msginfoavatar_copy, NULL);
if (!msginfo->extradata->dispositionnotificationto)
- msginfo->extradata->dispositionnotificationto =
+ msginfo->extradata->dispositionnotificationto =
g_strdup(full_msginfo->extradata->dispositionnotificationto);
if (!msginfo->extradata->returnreceiptto)
msginfo->extradata->returnreceiptto = g_strdup
@@ -1473,7 +1473,7 @@ guint procmsg_msginfo_memusage(MsgInfo *msginfo)
{
guint memusage = 0;
GSList *tmp;
-
+
memusage += sizeof(MsgInfo);
if (msginfo->fromname)
memusage += strlen(msginfo->fromname);
@@ -1597,11 +1597,11 @@ static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_ses
switch (hnum) {
case Q_SENDER:
- if (from == NULL)
+ if (from == NULL)
from = g_strdup(p);
break;
case Q_SMTPSERVER:
- if (smtpserver == NULL)
+ if (smtpserver == NULL)
smtpserver = g_strdup(p);
break;
case Q_RECIPIENTS:
@@ -1617,20 +1617,20 @@ static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_ses
newsac = account_find_from_id(atoi(p));
break;
case Q_SAVE_COPY_FOLDER:
- if (savecopyfolder == NULL)
+ if (savecopyfolder == NULL)
savecopyfolder = g_strdup(p);
break;
case Q_REPLY_MESSAGE_ID:
- if (replymessageid == NULL)
+ if (replymessageid == NULL)
replymessageid = g_strdup(p);
break;
case Q_FWD_MESSAGE_ID:
- if (fwdmessageid == NULL)
+ if (fwdmessageid == NULL)
fwdmessageid = g_strdup(p);
break;
case Q_ENCRYPT:
case Q_ENCRYPT_OLD:
- if (p[0] == '1')
+ if (p[0] == '1')
encrypt = TRUE;
break;
case Q_CLAWS_HDRS:
@@ -1814,7 +1814,7 @@ send_mail:
if (replymessageid != NULL || fwdmessageid != NULL) {
gchar **tokens;
FolderItem *item;
-
+
if (replymessageid != NULL)
tokens = g_strsplit(replymessageid, "\t", 0);
else
@@ -1824,21 +1824,21 @@ send_mail:
/* check if queued message has valid folder and message id */
if (item != NULL && tokens[2] != NULL) {
MsgInfo *msginfo;
-
+
msginfo = folder_item_get_msginfo(item, atoi(tokens[1]));
-
+
/* check if referring message exists and has a message id */
- if ((msginfo != NULL) &&
+ if ((msginfo != NULL) &&
(msginfo->msgid != NULL) &&
(strcmp(msginfo->msgid, tokens[2]) != 0)) {
procmsg_msginfo_free(&msginfo);
msginfo = NULL;
}
-
+
if (msginfo == NULL) {
msginfo = folder_item_get_msginfo_by_msgid(item, tokens[2]);
}
-
+
if (msginfo != NULL) {
if (replymessageid != NULL) {
MsgPermFlags to_unset = 0;
@@ -1912,7 +1912,7 @@ static void update_folder_msg_counts(FolderItem *item, MsgInfo *msginfo, MsgPerm
if (procmsg_msg_has_marked_parent(msginfo))
item->unreadmarked_msgs--;
}
-
+
/* MARK flag */
if (!(old_flags & MSG_MARKED) && (new_flags & MSG_MARKED)) {
procmsg_update_unread_children(msginfo, TRUE);
@@ -1975,7 +1975,7 @@ void procmsg_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmp
cm_return_if_fail(msginfo != NULL);
item = msginfo->folder;
cm_return_if_fail(item != NULL);
-
+
debug_print("Setting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
/* Perm Flags handling */
@@ -2018,13 +2018,13 @@ void procmsg_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgT
cm_return_if_fail(msginfo != NULL);
item = msginfo->folder;
cm_return_if_fail(item != NULL);
-
+
debug_print("Unsetting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
/* Perm Flags handling */
perm_flags_old = msginfo->flags.perm_flags;
perm_flags_new = msginfo->flags.perm_flags & ~perm_flags;
-
+
if (perm_flags_old != perm_flags_new) {
folder_item_change_msg_flags(msginfo->folder, msginfo, perm_flags_new);
@@ -2044,7 +2044,7 @@ void procmsg_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgT
}
}
-void procmsg_msginfo_change_flags(MsgInfo *msginfo,
+void procmsg_msginfo_change_flags(MsgInfo *msginfo,
MsgPermFlags add_perm_flags, MsgTmpFlags add_tmp_flags,
MsgPermFlags rem_perm_flags, MsgTmpFlags rem_tmp_flags)
{
@@ -2056,7 +2056,7 @@ void procmsg_msginfo_change_flags(MsgInfo *msginfo,
cm_return_if_fail(msginfo != NULL);
item = msginfo->folder;
cm_return_if_fail(item != NULL);
-
+
debug_print("Changing flags for message %d in folder %s\n", msginfo->msgnum, item->path);
/* Perm Flags handling */
@@ -2151,9 +2151,9 @@ gboolean procmsg_msg_has_flagged_parent(MsgInfo *info, MsgPermFlags perm_flags)
{
gboolean result;
static GHashTable *parentmsgs = NULL;
-
+
if (parentmsgs == NULL)
- parentmsgs = g_hash_table_new(NULL, NULL);
+ parentmsgs = g_hash_table_new(NULL, NULL);
result = procmsg_msg_has_flagged_parent_real(info, perm_flags, parentmsgs);
g_hash_table_foreach_remove(parentmsgs, parentmsgs_hash_remove, NULL);
@@ -2171,7 +2171,7 @@ gboolean procmsg_msg_has_marked_parent(MsgInfo *info)
}
-static GSList *procmsg_find_children_func(MsgInfo *info,
+static GSList *procmsg_find_children_func(MsgInfo *info,
GSList *children, GSList *all)
{
GSList *cur;
@@ -2184,12 +2184,12 @@ static GSList *procmsg_find_children_func(MsgInfo *info,
MsgInfo *tmp = (MsgInfo *)cur->data;
if (tmp->inreplyto && !strcmp(tmp->inreplyto, info->msgid)) {
/* Check if message is already in the list */
- if ((children == NULL) ||
+ if ((children == NULL) ||
(g_slist_index(children, tmp) == -1)) {
children = g_slist_prepend(children,
procmsg_msginfo_new_ref(tmp));
- children = procmsg_find_children_func(tmp,
- children,
+ children = procmsg_find_children_func(tmp,
+ children,
all);
}
}
@@ -2224,7 +2224,7 @@ static void procmsg_update_unread_children(MsgInfo *info, gboolean newly_marked)
for (cur = children; cur != NULL; cur = g_slist_next(cur)) {
MsgInfo *tmp = (MsgInfo *)cur->data;
if(MSG_IS_UNREAD(tmp->flags) && !MSG_IS_IGNORE_THREAD(tmp->flags)) {
- if(newly_marked)
+ if(newly_marked)
info->folder->unreadmarked_msgs++;
else
info->folder->unreadmarked_msgs--;
@@ -2264,12 +2264,12 @@ void procmsg_msginfo_set_to_folder(MsgInfo *msginfo, FolderItem *to_folder)
static gboolean procmsg_msginfo_filter(MsgInfo *msginfo, PrefsAccount* ac_prefs)
{
MailFilteringData mail_filtering_data;
-
- mail_filtering_data.msginfo = msginfo;
- mail_filtering_data.msglist = NULL;
- mail_filtering_data.filtered = NULL;
+
+ mail_filtering_data.msginfo = msginfo;
+ mail_filtering_data.msglist = NULL;
+ mail_filtering_data.filtered = NULL;
mail_filtering_data.unfiltered = NULL;
- mail_filtering_data.account = ac_prefs;
+ mail_filtering_data.account = ac_prefs;
if (!ac_prefs || ac_prefs->filterhook_on_recv)
if (hooks_invoke(MAIL_FILTERING_HOOKLIST, &mail_filtering_data))
@@ -2281,24 +2281,24 @@ static gboolean procmsg_msginfo_filter(MsgInfo *msginfo, PrefsAccount* ac_prefs)
FILTERING_INCORPORATION, NULL)) {
return TRUE;
}
-
+
return FALSE;
}
-void procmsg_msglist_filter(GSList *list, PrefsAccount *ac,
+void procmsg_msglist_filter(GSList *list, PrefsAccount *ac,
GSList **filtered, GSList **unfiltered,
gboolean do_filter)
{
GSList *cur, *to_do = NULL;
gint total = 0, curnum = 0;
MailFilteringData mail_filtering_data;
-
+
cm_return_if_fail(filtered != NULL);
cm_return_if_fail(unfiltered != NULL);
*filtered = NULL;
*unfiltered = NULL;
-
+
if (list == NULL)
return;
@@ -2312,21 +2312,21 @@ void procmsg_msglist_filter(GSList *list, PrefsAccount *ac,
statusbar_print_all(_("Filtering messages...\n"));
- mail_filtering_data.msginfo = NULL;
- mail_filtering_data.msglist = list;
- mail_filtering_data.filtered = NULL;
- mail_filtering_data.unfiltered = NULL;
- mail_filtering_data.account = ac;
-
+ mail_filtering_data.msginfo = NULL;
+ mail_filtering_data.msglist = list;
+ mail_filtering_data.filtered = NULL;
+ mail_filtering_data.unfiltered = NULL;
+ mail_filtering_data.account = ac;
+
if (!ac || ac->filterhook_on_recv)
hooks_invoke(MAIL_LISTFILTERING_HOOKLIST, &mail_filtering_data);
-
+
if (mail_filtering_data.filtered == NULL &&
mail_filtering_data.unfiltered == NULL) {
/* nothing happened */
debug_print(MAIL_LISTFILTERING_HOOKLIST " did nothing. filtering whole list normally.\n");
to_do = list;
- }
+ }
if (mail_filtering_data.filtered != NULL) {
/* keep track of what's been filtered by the hooks */
debug_print(MAIL_LISTFILTERING_HOOKLIST " filtered some stuff. total %d filtered %d unfilt %d.\n",
@@ -2337,14 +2337,14 @@ void procmsg_msglist_filter(GSList *list, PrefsAccount *ac,
*filtered = g_slist_copy(mail_filtering_data.filtered);
}
if (mail_filtering_data.unfiltered != NULL) {
- /* what the hooks didn't handle will go in filtered or
+ /* what the hooks didn't handle will go in filtered or
* unfiltered in the next loop */
debug_print(MAIL_LISTFILTERING_HOOKLIST " left unfiltered stuff. total %d filtered %d unfilt %d.\n",
g_slist_length(list),
g_slist_length(mail_filtering_data.filtered),
g_slist_length(mail_filtering_data.unfiltered));
to_do = mail_filtering_data.unfiltered;
- }
+ }
for (cur = to_do; cur; cur = cur->next) {
MsgInfo *info = (MsgInfo *)cur->data;
@@ -2357,7 +2357,7 @@ void procmsg_msglist_filter(GSList *list, PrefsAccount *ac,
g_slist_free(mail_filtering_data.filtered);
g_slist_free(mail_filtering_data.unfiltered);
-
+
*filtered = g_slist_reverse(*filtered);
*unfiltered = g_slist_reverse(*unfiltered);
@@ -2371,21 +2371,21 @@ MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimei
MsgFlags flags = {0, 0};
gchar *tmpfile = get_tmp_file();
FILE *fp = claws_fopen(tmpfile, "wb");
-
+
if (!mimeinfo || mimeinfo->type != MIMETYPE_MESSAGE ||
g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
g_warning("procmsg_msginfo_new_from_mimeinfo(): unsuitable mimeinfo");
- if (fp)
+ if (fp)
claws_fclose(fp);
g_free(tmpfile);
return NULL;
}
-
+
if (fp && procmime_write_mimeinfo(mimeinfo, fp) >= 0) {
claws_safe_fclose(fp);
fp = NULL;
tmp_msginfo = procheader_parse_file(
- tmpfile, flags,
+ tmpfile, flags,
TRUE, FALSE);
}
if (fp)
@@ -2463,8 +2463,8 @@ void procmsg_spam_set_folder (const char *item_identifier, FolderItem *(*spam_ge
FolderItem *procmsg_spam_get_folder (MsgInfo *msginfo)
{
FolderItem *item = NULL;
-
- if (procmsg_spam_get_folder_func)
+
+ if (procmsg_spam_get_folder_func)
item = procmsg_spam_get_folder_func(msginfo);
if (item == NULL && spam_folder_item)
item = folder_find_item_from_identifier(spam_folder_item);
@@ -2524,7 +2524,7 @@ gchar *procmsg_msginfo_get_tags_str(MsgInfo *msginfo)
{
GSList *cur = NULL;
gchar *tags = NULL;
-
+
if (!msginfo)
return NULL;
@@ -2574,7 +2574,7 @@ void procmsg_msginfo_update_tags(MsgInfo *msginfo, gboolean set, gint id)
changed.next = NULL;
folder_item_commit_tags(msginfo->folder, msginfo, &changed, NULL);
}
-
+
}
void procmsg_msginfo_clear_tags(MsgInfo *msginfo)
diff --git a/src/quote_fmt.c b/src/quote_fmt.c
@@ -39,7 +39,7 @@
/*
* Strings describing quote format strings
- *
+ *
* When adding new lines, remember to put 2 strings for each line
*/
static gchar *quote_desc_strings[] = {
@@ -52,12 +52,12 @@ static gchar *quote_desc_strings[] = {
"%firstname (%F)", N_("first name of sender"), /* first name */
"%lastname (%L)", N_("last name of sender"), /* last name */
"%initials (%I)", N_("initials of sender"), /* initial of sender */
- "%subject (%s)", N_("Subject"), /* subject */
- "%to (%t)", N_("To"), /* to */
- "%cc (%c)", N_("Cc"), /* cc */
- "%newsgroups (%n)", N_("Newsgroups"), /* newsgroups */
- "%references (%r)", N_("References"), /* references */
- "%messageid (%i)", N_("Message-ID"), /* message-id */
+ "%subject (%s)", N_("Subject"), /* subject */
+ "%to (%t)", N_("To"), /* to */
+ "%cc (%c)", N_("Cc"), /* cc */
+ "%newsgroups (%n)", N_("Newsgroups"), /* newsgroups */
+ "%references (%r)", N_("References"), /* references */
+ "%messageid (%i)", N_("Message-ID"), /* message-id */
"%msg (%M)", N_("message body"), /* message */
"%quoted_msg (%Q)", N_("quoted message body"), /* quoted message */
"%msg_no_sig (%m)", N_("message body without signature"), /* message with no signature */
@@ -101,7 +101,7 @@ static gchar *quote_desc_strings[] = {
NULL,NULL
};
-static DescriptionWindow quote_desc_win = {
+static DescriptionWindow quote_desc_win = {
NULL,
NULL,
TRUE,
@@ -121,12 +121,12 @@ void quote_fmt_quote_description(GtkWidget *widget, GtkWidget *pref_window)
static void quote_fmt_add_buttons(GtkWindow* parent_window, GtkWidget *parent_box,
gboolean add_info_button, void(*set_defaults_func)(void)) {
GtkWidget *hbox_btns;
-
+
if (!add_info_button && !set_defaults_func)
return;
-
+
hbox_btns = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_end (GTK_BOX(parent_box), hbox_btns, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX(parent_box), hbox_btns, FALSE, TRUE, 0);
if (add_info_button)
quotefmt_add_info_button(parent_window, hbox_btns);
@@ -169,7 +169,7 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
if (checkbtn_compose_with_format)
- PACK_CHECK_BUTTON (parent_box, checkbtn_use_format,
+ PACK_CHECK_BUTTON (parent_box, checkbtn_use_format,
_("Use template when writing new messages"));
vbox_format = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
@@ -515,7 +515,7 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
if (override_from_format)
*override_from_format = entry_from;
*edit_fw_format = text_fw_quotefmt;
-
+
g_object_unref(G_OBJECT(size_group));
}
diff --git a/src/recv.c b/src/recv.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/remotefolder.c b/src/remotefolder.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#include "config.h"
diff --git a/src/send_message.c b/src/send_message.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -128,7 +128,7 @@ gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list)
return val;
} else {
val = send_message_smtp(ac_prefs, to_list, fp);
-
+
claws_fclose(fp);
inc_unlock();
return val;
@@ -355,8 +355,8 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
send_dialog->session = session;
smtp_session->dialog = send_dialog;
- progress_dialog_list_set(send_dialog->dialog, 0, NULL,
- ac_prefs->smtp_server,
+ progress_dialog_list_set(send_dialog->dialog, 0, NULL,
+ ac_prefs->smtp_server,
_("Connecting"));
if (ac_prefs->pop_before_smtp
@@ -382,7 +382,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
} else {
/* everything is ready to start at MAIL FROM:, just
- * reinit useful variables.
+ * reinit useful variables.
*/
session = SESSION(ac_prefs->session);
ac_prefs->session = NULL;
@@ -558,7 +558,7 @@ static gint send_send_data_progressive(Session *session, guint cur_len,
gchar buf[BUFFSIZE];
SendProgressDialog *dialog = (SendProgressDialog *)data;
MainWindow *mainwin = mainwindow_get_mainwindow();
-
+
cm_return_val_if_fail(dialog != NULL, -1);
if (SMTP_SESSION(session)->state != SMTP_SEND_DATA &&
@@ -572,7 +572,7 @@ static gint send_send_data_progressive(Session *session, guint cur_len,
(dialog->dialog, (total_len == 0) ? 0 : (gfloat)cur_len / (gfloat)total_len);
if (mainwin) {
- if (!gtk_widget_get_visible(mainwin->progressbar))
+ if (!gtk_widget_get_visible(mainwin->progressbar))
gtk_widget_show(mainwin->progressbar);
gtk_progress_bar_set_fraction
(GTK_PROGRESS_BAR(mainwin->progressbar),
@@ -645,7 +645,7 @@ static SendProgressDialog *send_progress_dialog_create(void)
if (!prefs_common.send_dialog_invisible) {
gtk_widget_show_now(progress->window);
}
-
+
dialog->dialog = progress;
return dialog;
diff --git a/src/sourcewindow.c b/src/sourcewindow.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#include "config.h"
@@ -58,7 +58,7 @@ SourceWindow *source_window_create(void)
static PangoFontDescription *font_desc = NULL;
static GdkGeometry geometry;
-
+
debug_print("Creating source window...\n");
sourcewin = g_new0(SourceWindow, 1);
@@ -66,7 +66,7 @@ SourceWindow *source_window_create(void)
gtk_window_set_title(GTK_WINDOW(window), _("Source of the message"));
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
-
+
if (!geometry.min_height) {
geometry.min_width = 400;
geometry.min_height = 320;
@@ -142,7 +142,7 @@ void source_window_show_msg(SourceWindow *sourcewin, MsgInfo *msginfo)
sourcewin->updating = TRUE;
file = procmsg_get_message_file(msginfo);
sourcewin->updating = FALSE;
-
+
if (sourcewin->deferred_destroy) {
g_free(file);
source_window_destroy(sourcewin);
diff --git a/src/ssl_manager.c b/src/ssl_manager.c
@@ -147,7 +147,7 @@ static GtkWidget *ssl_manager_list_view_create (void)
model = GTK_TREE_MODEL(ssl_manager_create_data_store());
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
-
+
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model),
0, GTK_SORT_ASCENDING);
g_object_unref(model);
@@ -269,9 +269,9 @@ void ssl_manager_create(void)
static void ssl_manager_list_view_insert_cert(GtkWidget *list_view,
GtkTreeIter *row_iter,
- gchar *host,
+ gchar *host,
gchar *port,
- SSLCertificate *cert)
+ SSLCertificate *cert)
{
char *sig_status, *exp_date;
char buf[100];
@@ -326,7 +326,7 @@ static void ssl_manager_list_view_insert_cert(GtkWidget *list_view,
g_free(exp_date);
}
-static void ssl_manager_load_certs (void)
+static void ssl_manager_load_certs (void)
{
GDir *dir;
const gchar *d;
@@ -340,7 +340,7 @@ static void ssl_manager_load_certs (void)
gtk_list_store_clear(store);
- path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+ path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
"certs", G_DIR_SEPARATOR_S, NULL);
if((dir = g_dir_open(path, 0, &error)) == NULL) {
@@ -350,12 +350,12 @@ static void ssl_manager_load_certs (void)
g_free(path);
return;
}
-
+
while ((d = g_dir_read_name(dir)) != NULL) {
gchar *server = NULL, *port = NULL, *fp = NULL;
SSLCertificate *cert;
- if(strstr(d, ".cert") != d + (strlen(d) - strlen(".cert")))
+ if(strstr(d, ".cert") != d + (strlen(d) - strlen(".cert")))
continue;
if (get_serverportfp_from_filename(d, &server, &port, &fp)) {
@@ -381,13 +381,13 @@ static void ssl_manager_load_certs (void)
g_free(path);
}
-static void ssl_manager_close(void)
+static void ssl_manager_close(void)
{
gtk_widget_hide(manager.window);
}
static void ssl_manager_close_cb(GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
ssl_manager_close();
}
@@ -417,7 +417,7 @@ static void ssl_manager_double_clicked(GtkTreeView *list_view,
if (!gtk_tree_model_get_iter(model, &iter, path))
return;
- gtk_tree_model_get(model, &iter,
+ gtk_tree_model_get(model, &iter,
SSL_MANAGER_CERT, &cert,
-1);
@@ -431,8 +431,8 @@ static void ssl_manager_double_clicked(GtkTreeView *list_view,
-static void ssl_manager_delete_cb(GtkWidget *widget,
- gpointer data)
+static void ssl_manager_delete_cb(GtkWidget *widget,
+ gpointer data)
{
SSLCertificate *cert;
int val;
@@ -451,17 +451,17 @@ static void ssl_manager_delete_cb(GtkWidget *widget,
NULL, _("_Cancel"), "edit-delete-symbolic", _("D_elete"), NULL, NULL,
ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING);
-
+
if (val != G_ALERTALTERNATE)
return;
-
+
ssl_certificate_delete_from_disk(cert);
ssl_certificate_destroy(cert);
gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
}
-static void ssl_manager_view_cb(GtkWidget *widget,
- gpointer data)
+static void ssl_manager_view_cb(GtkWidget *widget,
+ gpointer data)
{
SSLCertificate *cert;
diff --git a/src/statusbar.c b/src/statusbar.c
@@ -46,7 +46,7 @@ GtkWidget *statusbar_create(void)
GtkWidget *hbox;
statusbar = gtk_statusbar_new();
-
+
gtk_widget_set_margin_top(GTK_WIDGET(statusbar), 0);
gtk_widget_set_margin_bottom(GTK_WIDGET(statusbar), 0);
statusbar_list = g_list_append(statusbar_list, statusbar);
@@ -62,7 +62,7 @@ GtkWidget *statusbar_create(void)
gtk_container_add(GTK_CONTAINER(parent), hbox);
gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(hbox), child, TRUE, TRUE, 0);
- g_object_unref(child);
+ g_object_unref(child);
return statusbar;
}
diff --git a/src/summary_search.c b/src/summary_search.c
@@ -603,7 +603,7 @@ static gboolean summary_search_prepare_matcher()
if (search_window.advsearch == NULL) {
search_window.advsearch = advsearch_new();
advsearch_set_on_error_cb(search_window.advsearch, NULL, NULL); /* TODO */
- advsearch_set_on_progress_cb(search_window.advsearch,
+ advsearch_set_on_progress_cb(search_window.advsearch,
summary_search_progress_cb, NULL);
}
diff --git a/src/summaryview.h b/src/summaryview.h
@@ -284,8 +284,8 @@ void summary_msgs_lock (SummaryView *summaryview);
void summary_msgs_unlock (SummaryView *summaryview);
void summary_mark_all_read (SummaryView *summaryview, gboolean ask_if_needed);
void summary_mark_all_unread (SummaryView *summaryview, gboolean ask_if_needed);
-void summary_mark_as_spam (SummaryView *summaryview,
- guint action,
+void summary_mark_as_spam (SummaryView *summaryview,
+ guint action,
GtkWidget *widget);
void summary_ignore_thread (SummaryView *summaryview);
void summary_unignore_thread (SummaryView *summaryview);
diff --git a/src/undo.c b/src/undo.c
@@ -35,7 +35,7 @@
typedef struct _UndoInfo UndoInfo;
-struct _UndoInfo
+struct _UndoInfo
{
UndoAction action;
gchar *text;
@@ -86,10 +86,10 @@ void undo_undo (UndoMain *undostruct);
void undo_redo (UndoMain *undostruct);
-UndoMain *undo_init(GtkWidget *text)
+UndoMain *undo_init(GtkWidget *text)
{
UndoMain *undostruct;
- GtkTextView *textview = GTK_TEXT_VIEW(text);
+ GtkTextView *textview = GTK_TEXT_VIEW(text);
GtkTextBuffer *textbuf = gtk_text_view_get_buffer(textview);
cm_return_val_if_fail(text != NULL, NULL);
@@ -112,15 +112,15 @@ UndoMain *undo_init(GtkWidget *text)
return undostruct;
}
-void undo_destroy (UndoMain *undostruct)
+void undo_destroy (UndoMain *undostruct)
{
undo_free_list(&undostruct->undo);
undo_free_list(&undostruct->redo);
g_free(undostruct);
}
-static UndoInfo *undo_object_new(gchar *text, gint start_pos, gint end_pos,
- UndoAction action, gfloat window_position)
+static UndoInfo *undo_object_new(gchar *text, gint start_pos, gint end_pos,
+ UndoAction action, gfloat window_position)
{
UndoInfo *undoinfo;
undoinfo = g_new (UndoInfo, 1);
@@ -132,7 +132,7 @@ static UndoInfo *undo_object_new(gchar *text, gint start_pos, gint end_pos,
return undoinfo;
}
-static void undo_object_free(UndoInfo *undo)
+static void undo_object_free(UndoInfo *undo)
{
g_free (undo->text);
g_free (undo);
@@ -144,7 +144,7 @@ static void undo_object_free(UndoInfo *undo)
*
* frees and undo structure list
**/
-static void undo_free_list(GList **list_pointer)
+static void undo_free_list(GList **list_pointer)
{
UndoInfo *undo;
GList *cur, *list = *list_pointer;
@@ -177,7 +177,7 @@ void undo_set_change_state_func(UndoMain *undostruct, UndoChangeStateFunc func,
* frees any undo level above sett->undo_level.
*
**/
-static void undo_check_size(UndoMain *undostruct)
+static void undo_check_size(UndoMain *undostruct)
{
UndoInfo *last_undo;
guint length;
@@ -208,7 +208,7 @@ static void undo_check_size(UndoMain *undostruct)
* Return Value: TRUE is merge was sucessful, FALSE otherwise
**/
static gint undo_merge(GList *list, guint start_pos, guint end_pos,
- gint action, const guchar *text)
+ gint action, const guchar *text)
{
guchar *temp_string;
UndoInfo *last_undo;
@@ -288,9 +288,9 @@ static gint undo_merge(GList *list, guint start_pos, guint end_pos,
* of undo levels and deltes the redo list
**/
-static void undo_add(const gchar *text,
+static void undo_add(const gchar *text,
gint start_pos, gint end_pos,
- UndoAction action, UndoMain *undostruct)
+ UndoAction action, UndoMain *undostruct)
{
UndoInfo *undoinfo;
GtkAdjustment *vadj;
@@ -308,10 +308,10 @@ static void undo_add(const gchar *text,
if (undostruct->paste != 0) {
if (action == UNDO_ACTION_INSERT)
action = UNDO_ACTION_REPLACE_INSERT;
- else
+ else
action = UNDO_ACTION_REPLACE_DELETE;
undostruct->paste = undostruct->paste + 1;
- if (undostruct->paste == 3)
+ if (undostruct->paste == 3)
undostruct->paste = 0;
}
@@ -344,7 +344,7 @@ static void undo_add(const gchar *text,
*
* Executes an undo request on the current document
**/
-void undo_undo(UndoMain *undostruct)
+void undo_undo(UndoMain *undostruct)
{
UndoInfo *undoinfo;
GtkTextView *textview;
@@ -378,7 +378,7 @@ void undo_undo(UndoMain *undostruct)
gtk_adjustment_set_value
(GTK_ADJUSTMENT(gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(textview))),
undoinfo->window_position);
-
+
switch (undoinfo->action) {
case UNDO_ACTION_DELETE:
gtk_text_buffer_get_iter_at_offset(buffer, &iter, undoinfo->start_pos);
@@ -422,7 +422,7 @@ void undo_undo(UndoMain *undostruct)
g_assert_not_reached();
break;
}
-
+
undostruct->change_state_func(undostruct,
UNDO_STATE_UNCHANGED, UNDO_STATE_TRUE,
undostruct->change_state_data);
@@ -443,7 +443,7 @@ void undo_undo(UndoMain *undostruct)
*
* executes a redo request on the current document
**/
-void undo_redo(UndoMain *undostruct)
+void undo_redo(UndoMain *undostruct)
{
UndoInfo *redoinfo;
GtkTextView *textview;
@@ -471,7 +471,7 @@ void undo_redo(UndoMain *undostruct)
gtk_text_buffer_place_cursor(buffer, &iter);
/* Move the view to the right position. */
- gtk_adjustment_set_value(gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(textview)),
+ gtk_adjustment_set_value(gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(textview)),
redoinfo->window_position);
switch (redoinfo->action) {
@@ -518,7 +518,7 @@ void undo_redo(UndoMain *undostruct)
}
undostruct->change_state_func(undostruct,
- UNDO_STATE_TRUE, UNDO_STATE_UNCHANGED,
+ UNDO_STATE_TRUE, UNDO_STATE_UNCHANGED,
undostruct->change_state_data);
if (undostruct->redo == NULL)
@@ -652,7 +652,7 @@ cleanup:
undostruct->wrap_info = NULL;
}
-static void update_wrap_undo(UndoMain *undostruct, const gchar *text, int start,
+static void update_wrap_undo(UndoMain *undostruct, const gchar *text, int start,
int end, UndoAction action)
{
gint len = end - start;
@@ -708,7 +708,7 @@ void undo_wrapping(UndoMain *undostruct, gboolean wrap)
void undo_insert_text_cb(GtkTextBuffer *textbuf, GtkTextIter *iter,
gchar *new_text, gint new_text_length,
- UndoMain *undostruct)
+ UndoMain *undostruct)
{
gchar *text_to_insert;
gint pos;
@@ -721,7 +721,7 @@ void undo_insert_text_cb(GtkTextBuffer *textbuf, GtkTextIter *iter,
utf8_len = g_utf8_strlen(text_to_insert, -1);
if (undostruct->wrap_info != NULL) {
- update_wrap_undo(undostruct, text_to_insert,
+ update_wrap_undo(undostruct, text_to_insert,
pos, pos + utf8_len, UNDO_ACTION_INSERT);
return;
}
@@ -732,7 +732,7 @@ void undo_insert_text_cb(GtkTextBuffer *textbuf, GtkTextIter *iter,
}
void undo_delete_text_cb(GtkTextBuffer *textbuf, GtkTextIter *start,
- GtkTextIter *end, UndoMain *undostruct)
+ GtkTextIter *end, UndoMain *undostruct)
{
gchar *text_to_delete;
gint start_pos, end_pos;
@@ -748,7 +748,7 @@ void undo_delete_text_cb(GtkTextBuffer *textbuf, GtkTextIter *start,
if (undostruct->wrap_info != NULL) {
update_wrap_undo(undostruct, text_to_delete, start_pos, end_pos, UNDO_ACTION_DELETE);
return;
- }
+ }
debug_print("del:undo add %d-%d\n", start_pos, end_pos);
undo_add(text_to_delete, start_pos, end_pos, UNDO_ACTION_DELETE,
undostruct);
@@ -777,7 +777,7 @@ static void undo_paste_clipboard_cb(GtkTextView *textview, UndoMain *undostruct)
*
* Return Value: TRUE if there is a selection active, FALSE if not
**/
-static gint undo_get_selection(GtkTextView *textview, guint *start, guint *end)
+static gint undo_get_selection(GtkTextView *textview, guint *start, guint *end)
{
GtkTextBuffer *buffer;
GtkTextIter start_iter, end_iter;
@@ -799,7 +799,7 @@ static gint undo_get_selection(GtkTextView *textview, guint *start, guint *end)
if (start != NULL)
*start = start_pos;
-
+
if (end != NULL)
*end = end_pos;
diff --git a/src/uri_opener.c b/src/uri_opener.c
@@ -96,12 +96,12 @@ void uri_opener_open(MessageView *msgview, GSList *uris)
manage_window_set_transient(GTK_WINDOW(opener.window));
gtk_widget_grab_focus(opener.close_btn);
-
+
if (uris == NULL) {
alertpanel_notice(_("There are no URLs in this email."));
return;
}
-
+
opener.msgview = msgview;
opener.uris = g_slist_copy(uris);
uri_opener_load_uris();
@@ -130,7 +130,7 @@ static void uri_opener_create_list_view_columns(GtkWidget *list_view)
renderer,
"markup", URI_OPENER_URL,
NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
}
static GtkWidget *uri_opener_list_view_create(void)
@@ -141,7 +141,7 @@ static GtkWidget *uri_opener_list_view_create(void)
model = GTK_TREE_MODEL(uri_opener_create_data_store());
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
- g_object_unref(model);
+ g_object_unref(model);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_MULTIPLE);
@@ -172,10 +172,10 @@ static GtkWidget *uri_opener_scrolled_win_create(void)
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
+
gtk_widget_set_size_request(scrolledwin, 200, 250);
gtk_widget_show(scrolledwin);
-
+
return scrolledwin;
}
@@ -187,7 +187,7 @@ static void uri_opener_size_allocate_cb(GtkWidget *widget, GtkAllocation *alloca
&prefs_common.uriopenerwin_width, &prefs_common.uriopenerwin_height);
}
-static void uri_opener_create(void)
+static void uri_opener_create(void)
{
GtkWidget *window;
GtkWidget *hbox_scroll;
@@ -219,7 +219,7 @@ static void uri_opener_create(void)
MANAGE_WINDOW_SIGNALS_CONNECT (window);
vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
- gtkut_stock_button_set_create(&hbox1,
+ gtkut_stock_button_set_create(&hbox1,
&open_btn, NULL, _("Open in browser"),
&close_btn, NULL, _("Close"),
NULL, NULL, NULL);
@@ -231,18 +231,18 @@ static void uri_opener_create(void)
G_CALLBACK(uri_opener_close_cb), NULL);
urilist = uri_opener_list_view_create();
-
+
label = gtk_label_new(_("Any phishing URLs are shown in red, followed by the actual URL."));
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_box_pack_start(GTK_BOX(vbox1), label, FALSE, TRUE, 0);
-
+
scrolledwin = uri_opener_scrolled_win_create();
hbox_scroll = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(hbox_scroll), scrolledwin, TRUE, TRUE, 0);
-
+
select_all_btn = gtk_button_new_with_label(_("Select All"));
g_signal_connect(G_OBJECT(select_all_btn), "clicked",
- G_CALLBACK(uri_opener_select_all_cb), NULL);
+ G_CALLBACK(uri_opener_select_all_cb), NULL);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(hbox), select_all_btn, FALSE, FALSE, 0);
@@ -281,13 +281,13 @@ static void uri_opener_create(void)
static void uri_opener_list_view_insert_uri(GtkWidget *list_view,
GtkTreeIter *row_iter,
- ClickableText *uri)
+ ClickableText *uri)
{
GtkTreeIter iter;
GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(list_view)));
gchar *visible = textview_get_visible_uri(opener.msgview->mimeview->textview, uri);
-
+
gchar *label = NULL;
if (visible && strcmp(visible, uri->uri)) {
@@ -334,7 +334,7 @@ static void uri_opener_list_view_clear_uris(GtkWidget *list_view)
gtk_list_store_clear(list_store);
}
-static void uri_opener_load_uris(void)
+static void uri_opener_load_uris(void)
{
GSList *cur = opener.uris;
GtkTreeModel *model;
@@ -346,17 +346,17 @@ static void uri_opener_load_uris(void)
ClickableText *uri = (ClickableText *)cur->data;
uri_opener_list_view_insert_uri(opener.urilist, NULL, uri);
}
-
+
g_object_ref(opener.urilist);
gtk_container_remove(GTK_CONTAINER(opener.scrolledwin), opener.urilist);
gtk_widget_destroy(opener.scrolledwin);
-
+
opener.scrolledwin = uri_opener_scrolled_win_create();
gtk_container_add(GTK_CONTAINER(opener.scrolledwin), opener.urilist);
gtk_box_pack_start(GTK_BOX(opener.hbox_scroll),
opener.scrolledwin, TRUE, TRUE, 0);
g_object_unref(opener.urilist);
-
+
model = gtk_tree_view_get_model(GTK_TREE_VIEW(opener.urilist));
if (!gtk_tree_model_get_iter_first(model, &iter))
return;
@@ -364,7 +364,7 @@ static void uri_opener_load_uris(void)
gtk_tree_selection_select_iter(selection, &iter);
}
-static void uri_opener_close(void)
+static void uri_opener_close(void)
{
g_slist_free(opener.uris);
opener.uris = NULL;
@@ -373,7 +373,7 @@ static void uri_opener_close(void)
}
static void uri_opener_close_cb(GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
uri_opener_close();
}
@@ -406,7 +406,7 @@ static void uri_opener_double_clicked(GtkTreeView *list_view,
if (!gtk_tree_model_get_iter(model, &iter, path))
return;
- gtk_tree_model_get(model, &iter,
+ gtk_tree_model_get(model, &iter,
URI_OPENER_DATA, &uri,
-1);
@@ -414,13 +414,13 @@ static void uri_opener_double_clicked(GtkTreeView *list_view,
return;
if (textview_uri_security_check(opener.msgview->mimeview->textview, uri,
- FALSE) == TRUE)
+ FALSE) == TRUE)
open_uri(uri->uri,
prefs_common_get_uri_cmd());
}
-static void uri_opener_open_cb(GtkWidget *widget,
- gpointer data)
+static void uri_opener_open_cb(GtkWidget *widget,
+ gpointer data)
{
ClickableText *uri;
GtkTreeIter sel;
@@ -433,10 +433,10 @@ static void uri_opener_open_cb(GtkWidget *widget,
cm_return_if_fail(selected);
for(cur = selected; cur != NULL; cur = g_list_next(cur))
- {
+ {
if(!gtk_tree_model_get_iter(model, &sel, (GtkTreePath *)cur->data))
continue;
-
+
gtk_tree_model_get(model, &sel,
URI_OPENER_DATA, &uri,
-1);
@@ -444,16 +444,16 @@ static void uri_opener_open_cb(GtkWidget *widget,
continue;
if (textview_uri_security_check(opener.msgview->mimeview->textview, uri,
- FALSE) == TRUE)
+ FALSE) == TRUE)
open_uri(uri->uri,
prefs_common_get_uri_cmd());
}
-
+
g_list_foreach(selected, (GFunc)gtk_tree_path_free, NULL);
g_list_free(selected);
}
-static void uri_opener_select_all_cb(GtkWidget *widget,
+static void uri_opener_select_all_cb(GtkWidget *widget,
gpointer data)
{
GtkTreeSelection *selection = gtk_tree_view_get_selection(
@@ -475,7 +475,7 @@ static void uri_opener_list_copy_cb(gpointer action, gpointer data)
cm_return_if_fail(selected);
for(cur = selected; cur != NULL; cur = g_list_next(cur))
- {
+ {
if(!gtk_tree_model_get_iter(model, &sel, (GtkTreePath *)cur->data))
continue;
@@ -502,7 +502,7 @@ static void uri_opener_list_copy_cb(gpointer action, gpointer data)
}
g_string_free(uri_list_str, TRUE);
}
-
+
g_list_foreach(selected, (GFunc)gtk_tree_path_free, NULL);
g_list_free(selected);
}
@@ -539,10 +539,10 @@ static gboolean uri_opener_list_popup_menu(GtkWidget *widget, gpointer data)
{
GtkTreeView *list_view = (GtkTreeView *)data;
GdkEventButton event;
-
+
event.button = 3;
event.time = gtk_get_current_event_time();
-
+
uri_opener_list_btn_pressed(NULL, &event, list_view);
return TRUE;
