From c85109fc322137596bf34cffc5445d568223c60d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 12 Jul 2012 08:02:18 -0400 Subject: Coding style and whitespace cleanup. --- plugins/attachment-reminder/attachment-reminder.c | 2 +- plugins/bbdb/bbdb.c | 2 +- plugins/bbdb/gaimbuddies.c | 26 +++++++++--------- plugins/dbx-import/dbx-importer.c | 32 +++++++++++------------ plugins/email-custom-header/email-custom-header.c | 4 +-- plugins/external-editor/external-editor.c | 12 ++++----- plugins/pst-import/pst-importer.c | 10 +++---- plugins/publish-calendar/publish-calendar.c | 2 +- plugins/publish-calendar/publish-location.c | 22 ++++++++-------- plugins/save-calendar/csv-format.c | 12 ++++----- plugins/save-calendar/rdf-format.c | 12 ++++----- plugins/templates/templates.c | 6 ++--- 12 files changed, 71 insertions(+), 71 deletions(-) (limited to 'plugins') diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index 5f3494175e..0079014c5b 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -176,7 +176,7 @@ get_next_word (GByteArray *msg_text, *from = (*from) + 1; } } else if (new_line && *from + 3 < msg_text->len && - strncmp ((const gchar *) (msg_text->data + (*from)), "-- \n", 4) == 0) { + strncmp ((const gchar *) (msg_text->data + (*from)), "-- \n", 4) == 0) { /* signature delimiter finishes message text */ *from = msg_text->len; return FALSE; diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index c78bdca1fd..e0d3ca3e91 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -93,7 +93,7 @@ e_plugin_lib_enable (EPlugin *ep, if (enable) { gint interval; - d(fprintf (stderr, "BBDB spinning up...\n")); + d (fprintf (stderr, "BBDB spinning up...\n")); g_idle_add (bbdb_timeout, ep); diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 9d01ccd6cb..99352787e9 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -125,7 +125,7 @@ bbdb_sync_buddy_list_check (void) /* Reprocess the buddy list if it's been updated. */ last_sync_str = g_settings_get_string (settings, CONF_KEY_GAIM_LAST_SYNC_TIME); - if (last_sync_str == NULL || !strcmp ((const gchar *)last_sync_str, "")) + if (last_sync_str == NULL || !strcmp ((const gchar *) last_sync_str, "")) last_sync_time = (time_t) 0; else last_sync_time = (time_t) g_ascii_strtoull (last_sync_str, NULL, 10); @@ -462,7 +462,7 @@ get_all_blocked (xmlNodePtr node, if (child->children) get_all_blocked (child, blocked); - if (!strcmp ((const gchar *)child->name, "block")) { + if (!strcmp ((const gchar *) child->name, "block")) { gchar *name = get_node_text (child); if (name) @@ -490,14 +490,14 @@ bbdb_get_gaim_buddy_list (void) } root = xmlDocGetRootElement (buddy_xml); - if (strcmp ((const gchar *)root->name, "purple")) { + if (strcmp ((const gchar *) root->name, "purple")) { fprintf (stderr, "bbdb: Could not parse Pidgin buddy list.\n"); xmlFreeDoc (buddy_xml); return NULL; } for (child = root->children; child != NULL; child = child->next) { - if (!strcmp ((const gchar *)child->name, "privacy")) { + if (!strcmp ((const gchar *) child->name, "privacy")) { get_all_blocked (child, &blocked); break; } @@ -505,7 +505,7 @@ bbdb_get_gaim_buddy_list (void) blist = NULL; for (child = root->children; child != NULL; child = child->next) { - if (!strcmp ((const gchar *)child->name, "blist")) { + if (!strcmp ((const gchar *) child->name, "blist")) { blist = child; break; } @@ -519,7 +519,7 @@ bbdb_get_gaim_buddy_list (void) } for (child = blist->children; child != NULL; child = child->next) { - if (!strcmp ((const gchar *)child->name, "group")) + if (!strcmp ((const gchar *) child->name, "group")) parse_buddy_group (child, &buddies, blocked); } @@ -555,7 +555,7 @@ static gchar * get_node_text (xmlNodePtr node) { if (node->children == NULL || node->children->content == NULL || - strcmp ((gchar *)node->children->name, "text")) + strcmp ((gchar *) node->children->name, "text")) return NULL; return g_strdup ((gchar *) node->children->content); @@ -589,7 +589,7 @@ parse_contact (xmlNodePtr contact, gboolean is_blocked = FALSE; for (child = contact->children; child != NULL; child = child->next) { - if (!strcmp ((const gchar *)child->name, "buddy")) { + if (!strcmp ((const gchar *) child->name, "buddy")) { buddy = child; break; } @@ -607,22 +607,22 @@ parse_contact (xmlNodePtr contact, gb->proto = e_xml_get_string_prop_by_name (buddy, (const guchar *)"proto"); for (child = buddy->children; child != NULL && !is_blocked; child = child->next) { - if (!strcmp ((const gchar *)child->name, "setting")) { + if (!strcmp ((const gchar *) child->name, "setting")) { gchar *setting_type; setting_type = e_xml_get_string_prop_by_name ( child, (const guchar *)"name"); - if (!strcmp ((const gchar *)setting_type, "buddy_icon")) + if (!strcmp ((const gchar *) setting_type, "buddy_icon")) gb->icon = get_buddy_icon_from_setting (child); g_free (setting_type); - } else if (!strcmp ((const gchar *)child->name, "name")) { + } else if (!strcmp ((const gchar *) child->name, "name")) { gb->account_name = get_node_text (child); is_blocked = g_slist_find_custom ( blocked, gb->account_name, (GCompareFunc) strcmp) != NULL; - } else if (!strcmp ((const gchar *)child->name, "alias")) + } else if (!strcmp ((const gchar *) child->name, "alias")) gb->alias = get_node_text (child); } @@ -641,7 +641,7 @@ parse_buddy_group (xmlNodePtr group, xmlNodePtr child; for (child = group->children; child != NULL; child = child->next) { - if (strcmp ((const gchar *)child->name, "contact")) + if (strcmp ((const gchar *) child->name, "contact")) continue; parse_contact (child, buddies, blocked); diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c index 02f5f63fd0..14799fb583 100644 --- a/plugins/dbx-import/dbx-importer.c +++ b/plugins/dbx-import/dbx-importer.c @@ -172,9 +172,9 @@ org_gnome_evolution_readdbx_supported (EPlugin *epl, if (!memcmp (signature, oe56_mbox_sig, sizeof (oe56_mbox_sig))) { ret = TRUE; } else if (!memcmp (signature, oe56_flist_sig, sizeof (oe56_flist_sig))) { - d(printf("Found DBX folder list file\n")); + d (printf ("Found DBX folder list file\n")); } else if (!memcmp (signature, oe4_mbox_sig, sizeof (oe4_mbox_sig))) { - d(printf("Found OE4 DBX file\n")); + d (printf ("Found OE4 DBX file\n")); } } close (fd); @@ -339,7 +339,7 @@ static gboolean dbx_load_index_table (DbxImporter *m, guint32 pos, guint32 *inde struct _dbx_indexstruct index; gint i; - d(printf("Loading index table at 0x%x\n", pos)); + d (printf ("Loading index table at 0x%x\n", pos)); if (dbx_pread (m->dbx_fd, &tindex, sizeof (tindex), pos) != sizeof (tindex)) { g_set_error ( @@ -359,7 +359,7 @@ static gboolean dbx_load_index_table (DbxImporter *m, guint32 pos, guint32 *inde return FALSE; } - d(printf("Index at %x: indexCount %x, anotherTablePtr %x\n", + d (printf ("Index at %x: indexCount %x, anotherTablePtr %x\n", pos, tindex.indexCount, tindex.anotherTablePtr)); if (tindex.indexCount > 0) { @@ -367,7 +367,7 @@ static gboolean dbx_load_index_table (DbxImporter *m, guint32 pos, guint32 *inde return FALSE; } - d(printf("Index at %x has ptrCount %d\n", pos, tindex.ptrCount)); + d (printf ("Index at %x has ptrCount %d\n", pos, tindex.ptrCount)); pos += sizeof (tindex); @@ -424,12 +424,12 @@ static gboolean dbx_load_indices (DbxImporter *m) m->index_count = itemcount = GUINT32_FROM_LE (itemcount); m->indices = g_malloc (itemcount * 4); - d(printf("indexptr %x, itemcount %d\n", indexptr, itemcount)); + d (printf ("indexptr %x, itemcount %d\n", indexptr, itemcount)); if (indexptr && !dbx_load_index_table (m, indexptr, &index_ofs)) return FALSE; - d(printf("Loaded %d of %d indices\n", index_ofs, m->index_count)); + d (printf ("Loaded %d of %d indices\n", index_ofs, m->index_count)); if (index_ofs < m->index_count) { g_set_error ( @@ -457,7 +457,7 @@ dbx_read_mail_body (DbxImporter *m, lseek (bodyfd, 0, SEEK_SET); while (offset) { - d(printf("Reading mail data chunk from %x\n", offset)); + d (printf ("Reading mail data chunk from %x\n", offset)); if (dbx_pread (m->dbx_fd, &hdr, sizeof (hdr), offset) != sizeof (hdr)) { g_set_error ( @@ -557,23 +557,23 @@ dbx_read_email (DbxImporter *m, switch (type) { case 0x01: *flags = buffer[hdr.count*4 + val]; - d(printf("Got type 0x01 flags %02x\n", *flags)); + d (printf ("Got type 0x01 flags %02x\n", *flags)); break; case 0x81: *flags = val; - d(printf("Got type 0x81 flags %02x\n", *flags)); + d (printf ("Got type 0x81 flags %02x\n", *flags)); break; case 0x04: dataptr = GUINT32_FROM_LE (*(guint32 *)(buffer + hdr.count *4 + val)); - d(printf("Got type 0x04 data pointer %x\n", dataptr)); + d (printf ("Got type 0x04 data pointer %x\n", dataptr)); break; case 0x84: dataptr = val; - d(printf("Got type 0x84 data pointer %x\n", dataptr)); + d (printf ("Got type 0x84 data pointer %x\n", dataptr)); break; default: /* We don't care about anything else */ - d(printf("Ignoring type %02x datum\n", type)); + d (printf ("Ignoring type %02x datum\n", type)); break; } } @@ -619,7 +619,7 @@ dbx_import_file (DbxImporter *m) cancellable, &m->base.error); if (!folder) return; - d(printf("importing to %s\n", camel_folder_get_full_name(folder))); + d (printf ("importing to %s\n", camel_folder_get_full_name (folder))); camel_folder_freeze (folder); @@ -638,7 +638,7 @@ dbx_import_file (DbxImporter *m) if (!dbx_load_indices (m)) goto out; - tmpfile = e_mkstemp("dbx-import-XXXXXX"); + tmpfile = e_mkstemp ("dbx-import-XXXXXX"); if (tmpfile == -1) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, @@ -658,7 +658,7 @@ dbx_import_file (DbxImporter *m) camel_operation_progress (cancellable, 100 * i / m->index_count); if (!dbx_read_email (m, m->indices[i], tmpfile, &dbx_flags)) { - d(printf("Cannot read email index %d at %x\n", + d (printf ("Cannot read email index %d at %x\n", i, m->indices[i])); if (m->base.error != NULL) goto out; diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index c683eb922c..07d0f280ae 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -252,13 +252,13 @@ epech_load_from_settings (GSettings *settings, memset (&temp_header_value_details, 0, sizeof (CustomSubHeader)); temp_header_details.sub_header_type_value = g_array_new (TRUE, TRUE, sizeof (CustomSubHeader)); parse_header_list = g_strsplit_set (headers[pos], "=;,", -1); - temp_header_details.header_type_value = g_string_new(""); + temp_header_details.header_type_value = g_string_new (""); if (temp_header_details.header_type_value) { g_string_assign (temp_header_details.header_type_value, parse_header_list[0]); } for (index = 0; parse_header_list[index + 1] ; ++index) { - temp_header_value_details.sub_header_string_value = g_string_new(""); + temp_header_value_details.sub_header_string_value = g_string_new (""); if (temp_header_value_details.sub_header_string_value) { g_string_assign (temp_header_value_details.sub_header_string_value, parse_header_list[index + 1]); diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 6b0d375f26..cac0a63ed5 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -78,7 +78,7 @@ ee_editor_command_changed (GtkWidget *textbox) GSettings *settings; editor = gtk_entry_get_text (GTK_ENTRY (textbox)); - d(printf ("\n\aeditor is : [%s] \n\a", editor)); + d (printf ("\n\aeditor is : [%s] \n\a", editor)); /* GSettings access for every key-press. Sucky ? */ settings = g_settings_new ("org.gnome.evolution.plugin.external-editor"); @@ -93,7 +93,7 @@ ee_editor_immediate_launch_changed (GtkWidget *checkbox) GSettings *settings; immediately = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)); - d(printf ("\n\aimmediate launch is : [%d] \n\a", immediately)); + d (printf ("\n\aimmediate launch is : [%d] \n\a", immediately)); settings = g_settings_new ("org.gnome.evolution.plugin.external-editor"); g_settings_set_boolean (settings, "launch-on-key-press", immediately); @@ -264,7 +264,7 @@ async_external_editor (EMsgComposer *composer) gsize length = 0; close (fd); - d(printf ("\n\aTemporary-file Name is : [%s] \n\a", filename)); + d (printf ("\n\aTemporary-file Name is : [%s] \n\a", filename)); /* Push the text (if there is one) from the composer to the file */ content = gtkhtml_editor_get_text_plain (GTKHTML_EDITOR (composer), &length); @@ -349,7 +349,7 @@ async_external_editor (EMsgComposer *composer) #else if (status) { #endif - d(printf ("\n\nsome problem here with external editor\n\n")); + d (printf ("\n\nsome problem here with external editor\n\n")); g_idle_add ((GSourceFunc) enable_composer, composer); return; } else { @@ -377,10 +377,10 @@ async_external_editor (EMsgComposer *composer) static void launch_editor (GtkAction *action, EMsgComposer *composer) { - d(printf ("\n\nexternal_editor plugin is launched \n\n")); + d (printf ("\n\nexternal_editor plugin is launched \n\n")); if (editor_running ()) { - d(printf("not opening editor, because it's still running\n")); + d (printf ("not opening editor, because it's still running\n")); return; } diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 319e7b71f4..205bfff333 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -1074,7 +1074,7 @@ pst_create_folder (PstImporter *m) pos = dest + strlen (parent); while (pos != NULL && pos < dest_end) { - pos = g_strstr_len (pos+1, dest_end-pos, "/"); + pos = g_strstr_len (pos + 1, dest_end - pos, "/"); if (pos != NULL) { CamelFolder *folder; @@ -1739,7 +1739,7 @@ set_cal_attachments (ECalClient *cal, orig_filename = camel_mime_part_get_filename (part); if (orig_filename == NULL) { - g_warning("Ignoring unnamed attachment"); + g_warning ("Ignoring unnamed attachment"); attach = attach->next; continue; /* Ignore unnamed attachments */ } @@ -1753,7 +1753,7 @@ set_cal_attachments (ECalClient *cal, dirname = g_path_get_dirname (path); if (g_mkdir_with_parents (dirname, 0777) == -1) { - g_warning("Could not create directory %s: %s", dirname, g_strerror(errno)); + g_warning ("Could not create directory %s: %s", dirname, g_strerror (errno)); g_free (dirname); attach = attach->next; continue; @@ -1762,14 +1762,14 @@ set_cal_attachments (ECalClient *cal, if (g_access (path, F_OK) == 0) { if (g_access (path, W_OK) != 0) { - g_warning("Could not write file %s - file exists", path); + g_warning ("Could not write file %s - file exists", path); attach = attach->next; continue; } } if (g_stat (path, &st) != -1 && !S_ISREG (st.st_mode)) { - g_warning("Could not write file %s - not a file", path); + g_warning ("Could not write file %s - not a file", path); attach = attach->next; continue; } diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 30f376036f..4193ae50d4 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -327,7 +327,7 @@ ask_password (GMountOperation *op, username = soup_uri_get_user (soup_uri); password = e_passwords_get_password (NULL, ms->uri->location); req_pass = ((username && *username) && !(ms->uri->service_type == TYPE_ANON_FTP && - !strcmp (username, "anonymous"))) ? TRUE:FALSE; + !strcmp (username, "anonymous"))) ? TRUE : FALSE; if (!password && req_pass) { gboolean remember = FALSE; diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c index 44217c04ee..465fff103c 100644 --- a/plugins/publish-calendar/publish-location.c +++ b/plugins/publish-calendar/publish-location.c @@ -85,7 +85,7 @@ migrateURI (const gchar *xml, for (p = root->children; p != NULL; p = p->next) { xmlChar *uid = xmlGetProp (p, (const guchar *)"uid"); - if (strcmp ((gchar *)p->name, "source") == 0) { + if (strcmp ((gchar *) p->name, "source") == 0) { events = g_slist_append (events, uid); } else { g_free (uid); @@ -145,7 +145,7 @@ e_publish_uri_from_xml (const gchar *xml) return NULL; root = doc->children; - if (strcmp ((gchar *)root->name, "uri") != 0) + if (strcmp ((gchar *) root->name, "uri") != 0) return NULL; if ((username = xmlGetProp (root, (const guchar *)"username"))) { @@ -185,9 +185,9 @@ e_publish_uri_from_xml (const gchar *xml) else if (uri->fb_duration_value > 100) uri->fb_duration_value = 100; - if (fb_duration_type && g_str_equal ((gchar *)fb_duration_type, "days")) + if (fb_duration_type && g_str_equal ((gchar *) fb_duration_type, "days")) uri->fb_duration_type = FB_DURATION_DAYS; - else if (fb_duration_type && g_str_equal ((gchar *)fb_duration_type, "months")) + else if (fb_duration_type && g_str_equal ((gchar *) fb_duration_type, "months")) uri->fb_duration_type = FB_DURATION_MONTHS; else uri->fb_duration_type = FB_DURATION_WEEKS; @@ -196,7 +196,7 @@ e_publish_uri_from_xml (const gchar *xml) for (p = root->children; p != NULL; p = p->next) { xmlChar *uid = xmlGetProp (p, (const guchar *)"uid"); - if (strcmp ((gchar *)p->name, "event") == 0) { + if (strcmp ((gchar *) p->name, "event") == 0) { events = g_slist_append (events, uid); } else { g_free (uid); @@ -234,15 +234,15 @@ e_publish_uri_to_xml (EPublishUri *uri) enabled = g_strdup_printf ("%d", uri->enabled); frequency = g_strdup_printf ("%d", uri->publish_frequency); format = g_strdup_printf ("%d", uri->publish_format); - xmlSetProp (root, (const guchar *)"location", (guchar *)uri->location); - xmlSetProp (root, (const guchar *)"enabled", (guchar *)enabled); - xmlSetProp (root, (const guchar *)"frequency", (guchar *)frequency); - xmlSetProp (root, (const guchar *)"format", (guchar *)format); - xmlSetProp (root, (const guchar *)"publish_time", (guchar *)uri->last_pub_time); + xmlSetProp (root, (const guchar *)"location", (guchar *) uri->location); + xmlSetProp (root, (const guchar *)"enabled", (guchar *) enabled); + xmlSetProp (root, (const guchar *)"frequency", (guchar *) frequency); + xmlSetProp (root, (const guchar *)"format", (guchar *) format); + xmlSetProp (root, (const guchar *)"publish_time", (guchar *) uri->last_pub_time); g_free (format); format = g_strdup_printf ("%d", uri->fb_duration_value); - xmlSetProp (root, (xmlChar *)"fb_duration_value", (xmlChar *)format); + xmlSetProp (root, (xmlChar *)"fb_duration_value", (xmlChar *) format); if (uri->fb_duration_type == FB_DURATION_DAYS) xmlSetProp (root, (xmlChar *)"fb_duration_type", (xmlChar *)"days"); diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index de59cd558c..e5b2be3b70 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -348,11 +348,11 @@ do_save_calendar_csv (FormatHandler *handler, config = g_new (CsvConfig, 1); tmp = gtk_entry_get_text (GTK_ENTRY (d->delimiter_entry)); - config->delimiter = userstring_to_systemstring (tmp?tmp:", "); + config->delimiter = userstring_to_systemstring (tmp ? tmp:", "); tmp = gtk_entry_get_text (GTK_ENTRY (d->newline_entry)); - config->newline = userstring_to_systemstring (tmp?tmp:"\\n"); + config->newline = userstring_to_systemstring (tmp ? tmp:"\\n"); tmp = gtk_entry_get_text (GTK_ENTRY (d->quote_entry)); - config->quote = userstring_to_systemstring (tmp?tmp:"\""); + config->quote = userstring_to_systemstring (tmp ? tmp:"\""); config->header = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (d->header_check)); @@ -570,9 +570,9 @@ create_options_widget (FormatHandler *handler) _("Prepend a _header")); /* Advanced CSV options */ - gtk_entry_set_text (GTK_ENTRY(d->delimiter_entry), ", "); - gtk_entry_set_text (GTK_ENTRY(d->quote_entry), "\""); - gtk_entry_set_text (GTK_ENTRY(d->newline_entry), "\\n"); + gtk_entry_set_text (GTK_ENTRY (d->delimiter_entry), ", "); + gtk_entry_set_text (GTK_ENTRY (d->quote_entry), "\""); + gtk_entry_set_text (GTK_ENTRY (d->newline_entry), "\\n"); gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index 0c7d97c140..c4326ccd0f 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -150,7 +150,7 @@ add_time_to_rdf (xmlNodePtr node, /* Not sure about this property */ timezone = calendar_config_get_timezone (); tmp = g_strdup_printf ("http://www.w3.org/2002/12/cal/tzd/%s#tz", timezone); - xmlSetProp (cur_node, (const guchar *)"rdf:datatype", (guchar *)tmp); + xmlSetProp (cur_node, (const guchar *)"rdf:datatype", (guchar *) tmp); g_free (tmp); g_free (timezone); g_free (str); @@ -214,7 +214,7 @@ do_save_calendar_rdf (FormatHandler *handler, GSList *iter; xmlBufferPtr buffer = xmlBufferCreate (); - xmlDocPtr doc = xmlNewDoc((xmlChar *) "1.0"); + xmlDocPtr doc = xmlNewDoc ((xmlChar *) "1.0"); xmlNodePtr fnode; doc->children = xmlNewDocNode (doc, NULL, (const guchar *)"rdf:RDF", NULL); @@ -234,14 +234,14 @@ do_save_calendar_rdf (FormatHandler *handler, xmlNewChild (fnode, NULL, (const guchar *)"calscale", (const guchar *)"GREGORIAN"); temp = calendar_config_get_timezone (); - xmlNewChild (fnode, NULL, (const guchar *)"x-wr:timezone", (guchar *)temp); + xmlNewChild (fnode, NULL, (const guchar *)"x-wr:timezone", (guchar *) temp); g_free (temp); xmlNewChild (fnode, NULL, (const guchar *)"method", (const guchar *)"PUBLISH"); - xmlNewChild (fnode, NULL, (const guchar *)"x-wr:relcalid", (guchar *)e_source_get_uid (primary_source)); + xmlNewChild (fnode, NULL, (const guchar *)"x-wr:relcalid", (guchar *) e_source_get_uid (primary_source)); - xmlNewChild (fnode, NULL, (const guchar *)"x-wr:calname", (guchar *)e_source_get_display_name (primary_source)); + xmlNewChild (fnode, NULL, (const guchar *)"x-wr:calname", (guchar *) e_source_get_display_name (primary_source)); /* Version of this RDF-format */ xmlNewChild (fnode, NULL, (const guchar *)"version", (const guchar *)"2.0"); @@ -261,7 +261,7 @@ do_save_calendar_rdf (FormatHandler *handler, /* Getting the stuff */ e_cal_component_get_uid (comp, &temp_constchar); tmp_str = g_strdup_printf ("#%s", temp_constchar); - xmlSetProp (node, (const guchar *)"about", (guchar *)tmp_str); + xmlSetProp (node, (const guchar *)"about", (guchar *) tmp_str); g_free (tmp_str); add_string_to_rdf (node, "uid",temp_constchar); diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index f218bce9a4..75876f9507 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -176,7 +176,7 @@ commit_changes (UIData *ui) /* Check if the keyword and value are not empty */ if ((keyword) && (value) && (g_utf8_strlen (g_strstrip (keyword), -1) > 0) && (g_utf8_strlen (g_strstrip (value), -1) > 0)) { - key = g_strdup_printf("%s=%s", keyword, value); + key = g_strdup_printf ("%s=%s", keyword, value); g_variant_builder_add (&b, "s", key); } @@ -1118,9 +1118,9 @@ build_template_menus_recurse (CamelStore *local_store, action = gtk_action_new ( action_name, action_label, NULL, NULL); - g_object_set_data(G_OBJECT (action), "template-uid", (gpointer) uid); + g_object_set_data (G_OBJECT (action), "template-uid", (gpointer) uid); - g_object_set_data(G_OBJECT (action), "template-folder", folder); + g_object_set_data (G_OBJECT (action), "template-folder", folder); g_signal_connect ( action, "activate", -- cgit v1.2.3