diff options
Diffstat (limited to 'plugins/publish-calendar')
-rw-r--r-- | plugins/publish-calendar/publish-calendar.c | 12 | ||||
-rw-r--r-- | plugins/publish-calendar/publish-format-fb.c | 12 | ||||
-rw-r--r-- | plugins/publish-calendar/publish-format-ical.c | 10 | ||||
-rw-r--r-- | plugins/publish-calendar/publish-location.c | 8 | ||||
-rw-r--r-- | plugins/publish-calendar/url-editor-dialog.c | 4 |
5 files changed, 23 insertions, 23 deletions
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 5d11e7c86f..e2f87bfce3 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -50,7 +50,7 @@ static void update_timestamp (EPublishUri *uri); static void publish (EPublishUri *uri); static void -publish_uri_async (EPublishUri *uri) +publish_uri_async (EPublishUri *uri) { GThread *thread = NULL; GError *error = NULL; @@ -83,13 +83,13 @@ publish (EPublishUri *uri) password = e_passwords_get_password ("Calendar", uri->location); username = gnome_vfs_uri_get_user_name (vfs_uri); - req_pass = ((username && *username) && !(uri->service_type == TYPE_ANON_FTP && + req_pass = ((username && *username) && !(uri->service_type == TYPE_ANON_FTP && !strcmp (username, "anonymous"))) ? TRUE:FALSE; if (!password && req_pass) { gboolean remember; char *prompt = g_strdup_printf (_("Enter the password for `%s'"), uri->location); - + password = e_passwords_ask_password (_("Enter password"), "", uri->location, prompt, E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE, &remember, @@ -500,7 +500,7 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) ui->treeview = glade_xml_get_widget (xml, "url list"); if (store == NULL) store = gtk_list_store_new (URL_LIST_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER); - else + else gtk_list_store_clear (store); gtk_tree_view_set_model (GTK_TREE_VIEW (ui->treeview), GTK_TREE_MODEL (store)); @@ -556,7 +556,7 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) return toplevel; } -static gpointer +static gpointer publish_urls (gpointer data) { GSList *l; @@ -574,7 +574,7 @@ action_publish (EPlugin *ep, ECalMenuTargetSelect *t) { GThread *thread = NULL; GError *error = NULL; - + thread = g_thread_create ((GThreadFunc) publish_urls, NULL, FALSE, &error); if (!thread) { g_warning (G_STRLOC ": %s", error->message); diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index c6b14cf030..7a4eae3b65 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -62,9 +62,9 @@ write_calendar (gchar *uid, ESourceList *source_list, GnomeVFSHandle *handle) g_error_free (error); return FALSE; } - + if (e_cal_get_cal_address (client, &email, &error)) { - if (email && *email) + if (email && *email) users = g_list_append (users, email); } @@ -93,14 +93,14 @@ write_calendar (gchar *uid, ESourceList *source_list, GnomeVFSHandle *handle) /* FIXME: EError */ g_object_unref (client); g_error_free (error); - if (users) + if (users) g_list_free (users); g_free (email); - + return FALSE; } - - if (users) + + if (users) g_list_free (users); g_free (email); diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c index 1208cdbd42..5f620accc9 100644 --- a/plugins/publish-calendar/publish-format-ical.c +++ b/plugins/publish-calendar/publish-format-ical.c @@ -33,7 +33,7 @@ typedef struct { GHashTable *zones; ECal *ecal; } CompTzData; - + static void insert_tz_comps (icalparameter *param, void *cb_data) { @@ -44,16 +44,16 @@ insert_tz_comps (icalparameter *param, void *cb_data) GError *error = NULL; tzid = icalparameter_get_tzid (param); - + if (g_hash_table_lookup (tdata->zones, tzid)) return; - + if (!e_cal_get_timezone (tdata->ecal, tzid, &zone, &error)) { g_warning ("Could not get the timezone information for %s : %s \n", tzid, error->message); g_error_free (error); return; } - + tzcomp = icalcomponent_new_clone (icaltimezone_get_component (zone)); g_hash_table_insert (tdata->zones, (gpointer) tzid, (gpointer) tzcomp); } @@ -96,7 +96,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GnomeVFSHandle *handle) GnomeVFSFileSize bytes_written = 0; GnomeVFSResult result; CompTzData tdata; - + tdata.zones = g_hash_table_new (g_str_hash, g_str_equal); tdata.ecal = client; diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c index 372b484e3f..e4414a8109 100644 --- a/plugins/publish-calendar/publish-location.c +++ b/plugins/publish-calendar/publish-location.c @@ -60,12 +60,12 @@ migrateURI (const gchar *xml, xmlDocPtr doc) username = xmlGetProp (root, (const unsigned char *)"username"); vfs_uri = gnome_vfs_uri_new ((char *)location); - + if (!vfs_uri) { g_warning ("Could not form the uri for %s \n", location); - goto cleanup; + goto cleanup; } - + gnome_vfs_uri_set_user_name ((GnomeVFSURI *)vfs_uri, (char *)username); temp = gnome_vfs_uri_to_string (vfs_uri, GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD | GNOME_VFS_URI_HIDE_PASSWORD); uri->location = g_strdup_printf ("dav://%s", temp); @@ -132,7 +132,7 @@ e_publish_uri_from_xml (const gchar *xml) if ((username = xmlGetProp (root, (const unsigned char *)"username"))) { xmlFree (username); return migrateURI (xml, doc); - + } uri = g_new0 (EPublishUri, 1); diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index 4d6268664d..627c64fa87 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -287,10 +287,10 @@ set_from_uri (UrlEditorDialog *dialog) else uri->service_type = TYPE_URI; - if (euri->user) + if (euri->user) gtk_entry_set_text (GTK_ENTRY (dialog->username_entry), euri->user); - if (euri->host) + if (euri->host) gtk_entry_set_text (GTK_ENTRY (dialog->server_entry), euri->host); if (euri->port) { |