[evolution-data-server/gnome-2-28] Coding style and whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-data-server/gnome-2-28] Coding style and whitespace cleanup.
- Date: Mon, 7 Sep 2009 12:58:24 +0000 (UTC)
commit 8a56bd9af8989b4b892b0cedd9ed98f137eb7e96
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Sep 6 19:36:46 2009 -0400
Coding style and whitespace cleanup.
camel/camel-db.c | 1 -
camel/camel-folder-summary.c | 3 +--
libedataserverui/e-name-selector-entry.c | 8 ++++----
3 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/camel/camel-db.c b/camel/camel-db.c
index 0c19e7c..a04d982 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -1258,7 +1258,6 @@ camel_db_reset_folder_version (CamelDB *cdb, const gchar *folder_name, gint rese
gchar *version_insert_query;
gchar *drop_folder_query;
-
drop_folder_query = sqlite3_mprintf ("DROP TABLE IF EXISTS '%q_version'", folder_name);
version_creation_query = sqlite3_mprintf ("CREATE TABLE IF NOT EXISTS '%q_version' ( version TEXT )", folder_name);
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 671f297..c5fda56 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1580,7 +1580,7 @@ camel_folder_summary_save_to_db (CamelFolderSummary *s, CamelException *ex)
s->flags |= CAMEL_SUMMARY_DIRTY;
return -1;
}
-
+
if (ex && camel_exception_is_set (ex) && strstr (camel_exception_get_description (ex), "26 columns but 28 values") != NULL) {
/* This is an error is previous migration. Let remigrate this folder alone. */
camel_db_abort_transaction (cdb, ex);
@@ -1598,7 +1598,6 @@ camel_folder_summary_save_to_db (CamelFolderSummary *s, CamelException *ex)
}
}
-
camel_db_end_transaction (cdb, ex);
record = (((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->summary_header_to_db (s, ex));
diff --git a/libedataserverui/e-name-selector-entry.c b/libedataserverui/e-name-selector-entry.c
index 0c77f3b..98554d3 100644
--- a/libedataserverui/e-name-selector-entry.c
+++ b/libedataserverui/e-name-selector-entry.c
@@ -1578,7 +1578,7 @@ sanitize_entry (ENameSelectorEntry *name_selector_entry)
static gboolean
user_focus_in (ENameSelectorEntry *name_selector_entry, GdkEventFocus *event_focus)
{
- int n;
+ gint n;
GList *l, *known;
GString *str = g_string_new ("");
EDestination *dest_dummy = e_destination_new ();
@@ -1591,7 +1591,7 @@ user_focus_in (ENameSelectorEntry *name_selector_entry, GdkEventFocus *event_foc
EDestination *dest = l->data;
if (dest) {
- char *text;
+ gchar *text;
text = get_destination_textrep (dest);
if (text) {
@@ -1604,14 +1604,14 @@ user_focus_in (ENameSelectorEntry *name_selector_entry, GdkEventFocus *event_foc
}
}
g_list_free (known);
-
+
/* Add a blank destination */
e_destination_store_append_destination (name_selector_entry->destination_store, dest_dummy);
if (str->str && str->str[0])
g_string_append (str, ", ");
gtk_entry_set_text (GTK_ENTRY (name_selector_entry), str->str);
-
+
g_string_free (str, TRUE);
g_signal_handlers_unblock_matched (name_selector_entry->destination_store, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, name_selector_entry);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]