diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/email-custom-header/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/email-custom-header/email-custom-header.c | 5 | ||||
| -rw-r--r-- | plugins/templates/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/templates/templates.c | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog index 2c992a4fac..f69ba35622 100644 --- a/plugins/email-custom-header/ChangeLog +++ b/plugins/email-custom-header/ChangeLog @@ -1,3 +1,8 @@ +2008-09-01 Matthew Barnes <mbarnes@redhat.com> + + * email-custom-header.c: + Don't mix declarations and code. + 2008-08-14 Matthew Barnes <mbarnes@redhat.com> * gui/contact-editor/e-contact-editor.c: diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index ab882cc197..847c56d315 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -651,13 +651,13 @@ header_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIte valid = gtk_tree_model_get_iter_first (model, iter); while (valid && gtk_list_store_iter_is_valid (cd->store, iter)) { char *keyword = NULL; + char *value = NULL; gtk_tree_model_get (model, iter, HEADER_KEY_COLUMN, &keyword, -1); /* Check if the keyword is not empty and then emit the row-changed signal (if we delete the row, then the iter gets corrupted) */ if ((keyword) && !(g_utf8_strlen (g_strstrip (keyword), -1) > 0)) gtk_tree_model_row_changed (model, path, iter); - char *value = NULL; gtk_tree_model_get (model, iter, HEADER_VALUE_COLUMN, &value, -1); /* Check if the keyword is not empty and then emit the row-changed signal (if we delete the row, then the iter gets corrupted) */ @@ -919,9 +919,10 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL); for (list = header_list; list; list = g_slist_next (list)) { - gtk_list_store_append (cd->store, &iter); gchar **parse_header_list; + buffer = list->data; + gtk_list_store_append (cd->store, &iter); parse_header_list = g_strsplit_set (buffer, "=,", -1); str_colon = g_strconcat (parse_header_list[0], "", NULL); gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, str_colon, -1); diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog index e1157ef1d9..04e998ef82 100644 --- a/plugins/templates/ChangeLog +++ b/plugins/templates/ChangeLog @@ -1,3 +1,8 @@ +2008-09-01 Matthew Barnes <mbarnes@redhat.com> + + * templates.c: + Don't mix declarations and code. + 2008-08-12 Bharath Acharya <abharath@novell.com> * Makefile.am: Have a check for OS_WIN32 and handle the schema data diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index c72ae942a9..bb5630fc5d 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -586,6 +586,7 @@ static GSList char *path; EPopupItem *item; CamelMimeMessage *message; + UserData *user_data; const char *uid; uid = g_strdup (g_ptr_array_index (uids, i)); @@ -615,7 +616,6 @@ static GSList item->visible = EM_POPUP_SELECT_MANY | EM_POPUP_SELECT_ONE; /* Make some info available to the callback */ - UserData *user_data; user_data = g_slice_new(UserData); user_data->msg = message; user_data->t = t; |