diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-12 23:31:41 -0400 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-12 23:31:41 -0400 |
| commit | c88e9c9f9c1f2079cbac92cf897584be8c448370 (patch) | |
| tree | d591b3b94dcd168c33f5207be62a4bb31d12a4b0 /servers | |
| parent | b911cb5d99e7bc43c96e09d33621192f223dd554 (diff) | |
| download | evolution-data-server-c88e9c9f9c1f2079cbac92cf897584be8c448370.tar.gz | |
Fix excessive whitespace.
Diffstat (limited to 'servers')
67 files changed, 0 insertions, 204 deletions
diff --git a/servers/exchange/lib/e2k-action.c b/servers/exchange/lib/e2k-action.c index 889ae8221..6662f3401 100644 --- a/servers/exchange/lib/e2k-action.c +++ b/servers/exchange/lib/e2k-action.c @@ -267,7 +267,6 @@ e2k_action_delete (void) return act; } - /** * e2k_addr_list_new: * @nentries: the number of entries diff --git a/servers/exchange/lib/e2k-action.h b/servers/exchange/lib/e2k-action.h index 1679f5120..ae7ccc2d6 100644 --- a/servers/exchange/lib/e2k-action.h +++ b/servers/exchange/lib/e2k-action.h @@ -36,7 +36,6 @@ E2kAction *e2k_action_delete (void); void e2k_actions_free (GPtrArray *actions); void e2k_action_free (E2kAction *act); - E2kAddrList *e2k_addr_list_new (gint nentries); void e2k_addr_list_set_local (E2kAddrList *list, gint entry_num, diff --git a/servers/exchange/lib/e2k-autoconfig.c b/servers/exchange/lib/e2k-autoconfig.c index b9a2cbddc..f277e2a36 100644 --- a/servers/exchange/lib/e2k-autoconfig.c +++ b/servers/exchange/lib/e2k-autoconfig.c @@ -792,7 +792,6 @@ e2k_autoconfig_check_exchange (E2kAutoconfig *ac, E2kOperation *op) return ac->exchange_dn ? E2K_AUTOCONFIG_OK : E2K_AUTOCONFIG_FAILED; } - /* FIXME: make this cancellable */ static void find_global_catalog (E2kAutoconfig *ac) @@ -1043,7 +1042,6 @@ set_account_uri_string (E2kAutoconfig *ac) e2k_uri_free (owa_uri); } - /* Approximate mapping from Exchange timezones to Olson ones. Exchange * is less specific, so we factor in the language/country info from * the locale in our guess. @@ -1386,7 +1384,6 @@ find_olson_timezone (const gchar *windows_timezone) return g_strdup (zonemap[i - 1].olson_name); } - /* Config file handling */ static GHashTable *config_options; @@ -1685,7 +1682,6 @@ e2k_validate_user (const gchar *owa_url, gchar *pkey, gchar **user, try_auth_again: username = g_strdup (*user); - password = e_passwords_get_password ("Exchange", key); if (password) { /* This can be the case, where user presses authenticate button and diff --git a/servers/exchange/lib/e2k-autoconfig.h b/servers/exchange/lib/e2k-autoconfig.h index a211ee8c0..bf9d5b9f4 100644 --- a/servers/exchange/lib/e2k-autoconfig.h +++ b/servers/exchange/lib/e2k-autoconfig.h @@ -74,7 +74,6 @@ E2kGlobalCatalog *e2k_autoconfig_get_global_catalog (E2kAutoconfig *ac, E2kAutoconfigResult e2k_autoconfig_check_global_catalog (E2kAutoconfig *ac, E2kOperation *op); - const gchar *e2k_autoconfig_lookup_option (const gchar *option); G_END_DECLS diff --git a/servers/exchange/lib/e2k-context.c b/servers/exchange/lib/e2k-context.c index b2a808348..6e5bc68bd 100644 --- a/servers/exchange/lib/e2k-context.c +++ b/servers/exchange/lib/e2k-context.c @@ -131,7 +131,6 @@ static gboolean do_notification (GIOChannel *source, GIOCondition condition, gpo static void setup_message (SoupSession *session, SoupMessage *msg, SoupSocket *socket, gpointer user_data); static void proxy_settings_changed (EProxy *proxy, gpointer user_data); - static void proxy_settings_changed (EProxy *proxy, gpointer user_data) { @@ -256,7 +255,6 @@ class_init (GObjectClass *object_class) E2K_MAKE_TYPE (e2k_context, E2kContext, class_init, init, PARENT_TYPE) - static void renew_sub_list (gpointer key, gpointer value, gpointer data) { @@ -931,7 +929,6 @@ e2k_context_send_message (E2kContext *ctx, E2kOperation *op, SoupMessage *msg) return status; } - static void update_unique_uri (E2kContext *ctx, SoupMessage *msg, const gchar *folder_uri, const gchar *encoded_name, gint *count, @@ -958,7 +955,6 @@ update_unique_uri (E2kContext *ctx, SoupMessage *msg, g_free (uri); } - /* GET */ static SoupMessage * @@ -1997,8 +1993,6 @@ e2k_context_search_start (E2kContext *ctx, E2kOperation *op, const gchar *uri, search_data); } - - /* DELETE */ static SoupMessage * @@ -2357,7 +2351,6 @@ e2k_context_transfer_dir (E2kContext *ctx, E2kOperation *op, return status; } - /* Subscriptions */ typedef struct { diff --git a/servers/exchange/lib/e2k-context.h b/servers/exchange/lib/e2k-context.h index ddc36b510..e722d58d9 100644 --- a/servers/exchange/lib/e2k-context.h +++ b/servers/exchange/lib/e2k-context.h @@ -187,7 +187,6 @@ void e2k_context_subscribe (E2kContext *ctx, void e2k_context_unsubscribe (E2kContext *ctx, const gchar *uri); - /* * Utility functions */ diff --git a/servers/exchange/lib/e2k-global-catalog.c b/servers/exchange/lib/e2k-global-catalog.c index 4d51089d0..b5b04c9b2 100644 --- a/servers/exchange/lib/e2k-global-catalog.c +++ b/servers/exchange/lib/e2k-global-catalog.c @@ -58,7 +58,6 @@ static GObjectClass *parent_class = NULL; static void finalize (GObject *); static gint get_gc_connection (E2kGlobalCatalog *gc, E2kOperation *op); - static void class_init (GObjectClass *object_class) { @@ -166,7 +165,6 @@ finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - E2K_MAKE_TYPE (e2k_global_catalog, E2kGlobalCatalog, class_init, init, PARENT_TYPE) static gint @@ -531,7 +529,6 @@ lookup_mta (E2kGlobalCatalog *gc, E2kOperation *op, const gchar *mta_dn) return hostname; } - static void get_sid_values (E2kGlobalCatalog *gc, E2kOperation *op, LDAPMessage *msg, E2kGlobalCatalogEntry *entry) @@ -878,7 +875,6 @@ e2k_global_catalog_lookup (E2kGlobalCatalog *gc, return status; } - struct async_lookup_data { E2kGlobalCatalog *gc; E2kOperation *op; diff --git a/servers/exchange/lib/e2k-global-catalog.h b/servers/exchange/lib/e2k-global-catalog.h index abd7d98bf..096f81f7c 100644 --- a/servers/exchange/lib/e2k-global-catalog.h +++ b/servers/exchange/lib/e2k-global-catalog.h @@ -39,7 +39,6 @@ E2kGlobalCatalog *e2k_global_catalog_new (const gchar *server, const gchar *password, E2kAutoconfigGalAuthPref use_auth); - typedef enum { E2K_GLOBAL_CATALOG_OK, E2K_GLOBAL_CATALOG_NO_SUCH_USER, @@ -102,7 +101,6 @@ void e2k_global_catalog_async_lookup (E2kGlobalCatalog *gc, gdouble lookup_passwd_max_age (E2kGlobalCatalog *gc, E2kOperation *op); - #define e2k_global_catalog_entry_free(gc, entry) E2kGlobalCatalogStatus e2k_global_catalog_add_delegate (E2kGlobalCatalog *gc, diff --git a/servers/exchange/lib/e2k-operation.c b/servers/exchange/lib/e2k-operation.c index d16477752..40467735d 100644 --- a/servers/exchange/lib/e2k-operation.c +++ b/servers/exchange/lib/e2k-operation.c @@ -68,7 +68,6 @@ e2k_operation_free (E2kOperation *op) g_static_mutex_unlock (&op_mutex); } - /** * e2k_operation_start: * @op: an #E2kOperation, or %NULL @@ -128,7 +127,6 @@ e2k_operation_finish (E2kOperation *op) g_static_mutex_unlock (&op_mutex); } - /** * e2k_operation_cancel: * @op: an #E2kOperation diff --git a/servers/exchange/lib/e2k-operation.h b/servers/exchange/lib/e2k-operation.h index 597928914..51552edfc 100644 --- a/servers/exchange/lib/e2k-operation.h +++ b/servers/exchange/lib/e2k-operation.h @@ -30,7 +30,6 @@ void e2k_operation_start (E2kOperation *op, gpointer data); void e2k_operation_finish (E2kOperation *op); - void e2k_operation_cancel (E2kOperation *op); gboolean e2k_operation_is_cancelled (E2kOperation *op); diff --git a/servers/exchange/lib/e2k-path.c b/servers/exchange/lib/e2k-path.c index 9c650e67c..188c9051b 100644 --- a/servers/exchange/lib/e2k-path.c +++ b/servers/exchange/lib/e2k-path.c @@ -123,7 +123,6 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath) return ppath; } - static gboolean find_folders_recursive (const gchar *physical_path, const gchar *path, EPathFindFoldersCallback callback, gpointer data) @@ -205,7 +204,6 @@ e_path_find_folders (const gchar *prefix, return find_folders_recursive (prefix, "", callback, data); } - /** * e_path_rmdir: * @prefix: a prefix to prepend to the path, or %NULL diff --git a/servers/exchange/lib/e2k-properties.c b/servers/exchange/lib/e2k-properties.c index 9370e5df1..44ddfa4bc 100644 --- a/servers/exchange/lib/e2k-properties.c +++ b/servers/exchange/lib/e2k-properties.c @@ -262,7 +262,6 @@ e2k_properties_empty (E2kProperties *props) return g_hash_table_size (props->set) == 0; } - extern gchar e2k_des_key[8]; static E2kPropInfo * @@ -423,8 +422,6 @@ E2K_PROPERTIES_SETTER (float, float, FLOAT, g_strdup_printf ("%f", value)) E2K_PROPERTIES_SETTER (bool, gboolean, BOOL, g_strdup_printf ("%d", value != FALSE)) E2K_PROPERTIES_SETTER (date, gchar *, DATE, value) - - /** * e2k_properties_set_type_as_string: * @props: an #E2kProperties @@ -638,7 +635,6 @@ e2k_properties_foreach_namespace (E2kProperties *props, g_hash_table_destroy (fnd.seen_namespaces); } - static GHashTable *namespaces; static gint next_namespace = 'a'; static GStaticMutex namespaces_lock = G_STATIC_MUTEX_INIT; diff --git a/servers/exchange/lib/e2k-properties.h b/servers/exchange/lib/e2k-properties.h index b3dfd50d9..7f8df28a5 100644 --- a/servers/exchange/lib/e2k-properties.h +++ b/servers/exchange/lib/e2k-properties.h @@ -79,7 +79,6 @@ void e2k_properties_set_type_as_string_array (E2kProperties *props, void e2k_properties_remove (E2kProperties *props, const gchar *propname); - typedef void (*E2kPropertiesForeachFunc) (const gchar *propname, E2kPropType type, gpointer value, @@ -91,7 +90,6 @@ void e2k_properties_foreach_removed (E2kProperties *props, E2kPropertiesForeachFunc callback, gpointer user_data); - typedef void(*E2kPropertiesForeachNamespaceFunc)(const gchar *namespace, gchar abbrev, gpointer user_data); diff --git a/servers/exchange/lib/e2k-restriction.c b/servers/exchange/lib/e2k-restriction.c index da7ab0479..f8a6c675f 100644 --- a/servers/exchange/lib/e2k-restriction.c +++ b/servers/exchange/lib/e2k-restriction.c @@ -534,7 +534,6 @@ e2k_restriction_ref (E2kRestriction *rn) rn->ref_count++; } - /* SQL export */ static gboolean rn_to_sql (E2kRestriction *rn, GString *sql, E2kRestrictionType inside); @@ -731,7 +730,6 @@ e2k_restriction_to_sql (E2kRestriction *rn) return ret; } - /* Binary import/export */ static gboolean diff --git a/servers/exchange/lib/e2k-result.c b/servers/exchange/lib/e2k-result.c index e7b7cf379..12be98aff 100644 --- a/servers/exchange/lib/e2k-result.c +++ b/servers/exchange/lib/e2k-result.c @@ -370,7 +370,6 @@ e2k_results_array_free (GArray *results_array, gboolean free_results) g_array_free (results_array, FALSE); } - /** * e2k_results_from_multistatus: * @msg: a 207 Multi-Status response @@ -441,7 +440,6 @@ e2k_results_free (E2kResult *results, gint nresults) g_free (results); } - /* Iterators */ struct E2kResultIter { E2kContext *ctx; diff --git a/servers/exchange/lib/e2k-result.h b/servers/exchange/lib/e2k-result.h index 2140dda21..20c418ad5 100644 --- a/servers/exchange/lib/e2k-result.h +++ b/servers/exchange/lib/e2k-result.h @@ -25,7 +25,6 @@ E2kResult *e2k_results_copy (E2kResult *results, void e2k_results_free (E2kResult *results, gint nresults); - GArray *e2k_results_array_new (void); void e2k_results_array_add_from_multistatus (GArray *results_array, @@ -34,7 +33,6 @@ void e2k_results_array_add_from_multistatus (GArray *results_array, void e2k_results_array_free (GArray *results_array, gboolean free_results); - typedef struct E2kResultIter E2kResultIter; typedef E2kHTTPStatus (*E2kResultIterFetchFunc) (E2kResultIter *iter, diff --git a/servers/exchange/lib/e2k-rule-xml.c b/servers/exchange/lib/e2k-rule-xml.c index 3cd37356d..4ccda131a 100644 --- a/servers/exchange/lib/e2k-rule-xml.c +++ b/servers/exchange/lib/e2k-rule-xml.c @@ -657,7 +657,6 @@ restriction_to_xml (E2kRestriction *rn, xmlNode *partset, return TRUE; } - static gchar * stringify_entryid (guint8 *data, gint len) { diff --git a/servers/exchange/lib/e2k-rule.c b/servers/exchange/lib/e2k-rule.c index 62a16818f..c02563664 100644 --- a/servers/exchange/lib/e2k-rule.c +++ b/servers/exchange/lib/e2k-rule.c @@ -402,7 +402,6 @@ e2k_rule_extract_proptag (guint8 **ptr, gint *len, E2kRuleProp *prop) return TRUE; } - /** * e2k_rule_append_propvalue: * @ba: a byte array containing a binary rule @@ -530,7 +529,6 @@ e2k_rule_free_propvalue (E2kPropValue *pv) g_byte_array_free (pv->value, TRUE); } - /** * e2k_rule_free: * @rule: an #E2kRule diff --git a/servers/exchange/lib/e2k-security-descriptor.c b/servers/exchange/lib/e2k-security-descriptor.c index 0174be7c4..abf234288 100644 --- a/servers/exchange/lib/e2k-security-descriptor.c +++ b/servers/exchange/lib/e2k-security-descriptor.c @@ -176,7 +176,6 @@ dispose (GObject *object) E2K_MAKE_TYPE (e2k_security_descriptor, E2kSecurityDescriptor, class_init, init, PARENT_TYPE) - /* This determines the relative ordering of any two ACEs in a SID. * See docs/security for details. */ @@ -275,7 +274,6 @@ ace_compar (E2k_ACE *ace1, E2k_ACE *ace2, E2kSecurityDescriptor *sd) } } - static xmlNode * find_child (xmlNode *node, const xmlChar *name) { @@ -837,7 +835,6 @@ e2k_security_descriptor_set_permissions (E2kSecurityDescriptor *sd, } } - static struct { const gchar *name; guint32 perms; diff --git a/servers/exchange/lib/e2k-security-descriptor.h b/servers/exchange/lib/e2k-security-descriptor.h index 15fff71a0..4283391ff 100644 --- a/servers/exchange/lib/e2k-security-descriptor.h +++ b/servers/exchange/lib/e2k-security-descriptor.h @@ -35,7 +35,6 @@ E2kSid *e2k_security_descriptor_get_default (E2kSecurityDescrip void e2k_security_descriptor_remove_sid (E2kSecurityDescriptor *sd, E2kSid *sid); - /* MAPI folder permissions */ #define E2K_PERMISSION_READ_ANY 0x001 #define E2K_PERMISSION_CREATE 0x002 diff --git a/servers/exchange/lib/e2k-sid.c b/servers/exchange/lib/e2k-sid.c index bf96e0c0b..53c8df618 100644 --- a/servers/exchange/lib/e2k-sid.c +++ b/servers/exchange/lib/e2k-sid.c @@ -273,7 +273,6 @@ e2k_sid_get_display_name (E2kSid *sid) return sid->priv->display_name; } - /** * e2k_sid_binary_sid_equal: * @a: pointer to a binary SID diff --git a/servers/exchange/lib/e2k-sid.h b/servers/exchange/lib/e2k-sid.h index 777dcdbe0..ac17e3cf3 100644 --- a/servers/exchange/lib/e2k-sid.h +++ b/servers/exchange/lib/e2k-sid.h @@ -64,6 +64,5 @@ gint e2k_sid_binary_sid_equal (gconstpointer a, #define E2K_SID_WKS_ANONYMOUS "S-1-5-7" #define E2K_SID_WKS_ANONYMOUS_NAME "Anonymous" - #endif diff --git a/servers/exchange/lib/e2k-uri.c b/servers/exchange/lib/e2k-uri.c index 4b584d3ba..93c0f2ace 100644 --- a/servers/exchange/lib/e2k-uri.c +++ b/servers/exchange/lib/e2k-uri.c @@ -214,7 +214,6 @@ e2k_uri_get_param (E2kUri *uri, const gchar *name) return g_datalist_get_data (&uri->params, name); } - #define HEXVAL(c) (isdigit (c) ? (c) - '0' : g_ascii_tolower (c) - 'a' + 10) /** diff --git a/servers/exchange/lib/e2k-uri.h b/servers/exchange/lib/e2k-uri.h index 27d0293ab..5df234de5 100644 --- a/servers/exchange/lib/e2k-uri.h +++ b/servers/exchange/lib/e2k-uri.h @@ -20,7 +20,6 @@ typedef struct { gchar *fragment; } E2kUri; - E2kUri * e2k_uri_new (const gchar *uri_string); void e2k_uri_free (E2kUri *uri); const gchar *e2k_uri_get_param (E2kUri *uri, const gchar *name); diff --git a/servers/exchange/lib/e2k-validate.h b/servers/exchange/lib/e2k-validate.h index cb13921f9..e0b5c7d2a 100644 --- a/servers/exchange/lib/e2k-validate.h +++ b/servers/exchange/lib/e2k-validate.h @@ -50,7 +50,6 @@ gboolean e2k_validate_user (const gchar *owa_url, gchar *key, gchar **user, E2kAutoconfigResult *result, GtkWindow *parent); - G_END_DECLS #endif /* __EXCHANGE_VALIDATE_H_ */ diff --git a/servers/exchange/lib/ebrowse.c b/servers/exchange/lib/ebrowse.c index caa6e5d37..7f1402874 100644 --- a/servers/exchange/lib/ebrowse.c +++ b/servers/exchange/lib/ebrowse.c @@ -273,7 +273,6 @@ got_all_properties (SoupMessage *msg, gpointer ctx) e2k_results_free (results, nresults); } - #define ALL_PROPS \ "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" \ "<propfind xmlns=\"DAV:\" xmlns:e=\"http://schemas.microsoft.com/exchange/\">" \ @@ -333,7 +332,6 @@ get_fav_properties(E2kContext *ctx, gchar *uri) gint status; gchar *eml_str, *top = uri, fav_uri[1024]; - /* list the contents and search for the favorite properties */ e2k_operation_init (&op); prop = E2K_PR_DAV_DISPLAY_NAME; diff --git a/servers/exchange/lib/gctest.c b/servers/exchange/lib/gctest.c index bd3d0b080..c3c80df81 100644 --- a/servers/exchange/lib/gctest.c +++ b/servers/exchange/lib/gctest.c @@ -118,7 +118,6 @@ do_lookup (E2kGlobalCatalog *gc, const gchar *user) if (entry->user_account_control) printf (" user_account_control : %d\n", entry->user_account_control); - maxAge = lookup_passwd_max_age (gc, &op); printf("Password max age is %f \n", maxAge); pwd_exp_days = (maxAge * 0.000000100)/86400; diff --git a/servers/exchange/lib/test-utils.h b/servers/exchange/lib/test-utils.h index df8be681b..0a625749e 100644 --- a/servers/exchange/lib/test-utils.h +++ b/servers/exchange/lib/test-utils.h @@ -18,7 +18,6 @@ E2kGlobalCatalog *test_get_gc (const gchar *server); void test_abort_if_http_error (E2kHTTPStatus status); - /* lower-level util */ gchar *test_ask_password (const gchar *prompt); diff --git a/servers/exchange/storage/e-folder-exchange.c b/servers/exchange/storage/e-folder-exchange.c index a56ddd4d5..a22f8e325 100644 --- a/servers/exchange/storage/e-folder-exchange.c +++ b/servers/exchange/storage/e-folder-exchange.c @@ -339,7 +339,6 @@ e_folder_exchange_set_folder_size (EFolder *folder, gint64 folder_size) efe->priv->folder_size = folder_size; } - /** * e_folder_exchange_get_has_subfolders: * @folder: an #EFolderExchange @@ -459,7 +458,6 @@ e_folder_exchange_get_storage_file (EFolder *folder, const gchar *filename) return path; } - /** * e_folder_exchange_save_to_file: * @folder: the folder @@ -646,8 +644,6 @@ e_folder_exchange_new_from_file (ExchangeHierarchy *hier, const gchar *filename) return folder; } - - /* E2kContext wrappers */ #define E_FOLDER_EXCHANGE_CONTEXT(efe) (exchange_account_get_context (((EFolderExchange *)efe)->priv->hier->account)) #define E_FOLDER_EXCHANGE_URI(efe) (((EFolderExchange *)efe)->priv->internal_uri) diff --git a/servers/exchange/storage/e-folder-exchange.h b/servers/exchange/storage/e-folder-exchange.h index 3c703cb60..975270e7d 100644 --- a/servers/exchange/storage/e-folder-exchange.h +++ b/servers/exchange/storage/e-folder-exchange.h @@ -41,7 +41,6 @@ EFolder *e_folder_exchange_new_from_file (ExchangeHierarchy *hier, gboolean e_folder_exchange_save_to_file (EFolder *folder, const gchar *filename); - const gchar *e_folder_exchange_get_internal_uri (EFolder *folder); void e_folder_exchange_set_internal_uri (EFolder *folder, const gchar *internal_uri); @@ -70,7 +69,6 @@ gchar *e_folder_exchange_get_storage_file (EFolder *folder, ExchangeHierarchy *e_folder_exchange_get_hierarchy (EFolder *folder); - /* E2kContext wrappers */ E2kHTTPStatus e_folder_exchange_propfind (EFolder *folder, E2kOperation *op, @@ -100,7 +98,6 @@ void e_folder_exchange_subscribe (EFolder *folder, gpointer user_data); void e_folder_exchange_unsubscribe (EFolder *folder); - E2kResultIter *e_folder_exchange_transfer_start (EFolder *source, E2kOperation *op, EFolder *dest, @@ -151,7 +148,6 @@ E2kHTTPStatus e_folder_exchange_transfer_dir (EFolder *source, gboolean delete_original, gchar **permanent_url); - G_END_DECLS #endif /* __E_FOLDER_EXCHANGE_H__ */ diff --git a/servers/exchange/storage/e-folder-tree.c b/servers/exchange/storage/e-folder-tree.c index f4491f3ab..1fa2491cb 100644 --- a/servers/exchange/storage/e-folder-tree.c +++ b/servers/exchange/storage/e-folder-tree.c @@ -429,7 +429,6 @@ e_folder_tree_foreach (EFolderTree *folder_tree, traverse_subtree (folder_tree, root_node, foreach_func, data); } - /** * e_folder_tree_get_path_for_data: * @folder_tree: A pointer to an EFolderTree diff --git a/servers/exchange/storage/e-folder-type-registry.h b/servers/exchange/storage/e-folder-type-registry.h index 9f83d04ea..beede01c8 100644 --- a/servers/exchange/storage/e-folder-type-registry.h +++ b/servers/exchange/storage/e-folder-type-registry.h @@ -84,7 +84,6 @@ const gchar *e_folder_type_registry_get_description_for_type GList *e_folder_type_registry_get_accepted_dnd_types_for_type (EFolderTypeRegistry *folder_type_registry, const gchar *type_name); - G_END_DECLS #endif /* _E_FOLDER_TYPE_REGISTRY_H_ */ diff --git a/servers/exchange/storage/e-folder.c b/servers/exchange/storage/e-folder.c index 1550cf698..7413530f8 100644 --- a/servers/exchange/storage/e-folder.c +++ b/servers/exchange/storage/e-folder.c @@ -79,7 +79,6 @@ accept_drop (EFolder *folder, GdkDragContext *context, return FALSE; } - /* GObject methods. */ static void diff --git a/servers/exchange/storage/exchange-account.c b/servers/exchange/storage/exchange-account.c index a973c7752..ab6f077af 100644 --- a/servers/exchange/storage/exchange-account.c +++ b/servers/exchange/storage/exchange-account.c @@ -307,10 +307,8 @@ finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - E2K_MAKE_TYPE (exchange_account, ExchangeAccount, class_init, init, PARENT_TYPE) - void exchange_account_rescan_tree (ExchangeAccount *account) { @@ -910,8 +908,6 @@ static const gchar *mailbox_info_props[] = { }; static const gint n_mailbox_info_props = G_N_ELEMENTS (mailbox_info_props); - - static gboolean account_moved (ExchangeAccount *account, E2kAutoconfig *ac) { @@ -1172,7 +1168,6 @@ exchange_account_is_save_password (ExchangeAccount *account) return account->priv->account->source->save_passwd; } - /** * exchange_account_set_offline: * @account: an #ExchangeAccount @@ -1937,7 +1932,6 @@ struct _folders_tree { GPtrArray *folders; }; - static void add_folder (gpointer key, gpointer value, gpointer folders) { @@ -2207,7 +2201,6 @@ exchange_account_get_authtype (ExchangeAccount *account) return NULL; } - /** * exchange_account_new: * @adata: an #EAccount diff --git a/servers/exchange/storage/exchange-account.h b/servers/exchange/storage/exchange-account.h index 9a6a2093c..364d6fac3 100644 --- a/servers/exchange/storage/exchange-account.h +++ b/servers/exchange/storage/exchange-account.h @@ -131,7 +131,6 @@ void exchange_account_is_offline (ExchangeAccount *account, void exchange_account_is_offline_sync_set (ExchangeAccount *account, gint *mode); - typedef enum { EXCHANGE_ACCOUNT_FOLDER_OK, EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS, @@ -198,7 +197,6 @@ GtkListStore *exchange_account_folder_size_get_model (ExchangeAccount *ac void exchange_account_scan_foreign_hierarchy (ExchangeAccount *account, const gchar *user_email); - G_END_DECLS #endif /* __EXCHANGE_ACCOUNT_H__ */ diff --git a/servers/exchange/storage/exchange-constants.h b/servers/exchange/storage/exchange-constants.h index acb8299fe..4a928ab4b 100644 --- a/servers/exchange/storage/exchange-constants.h +++ b/servers/exchange/storage/exchange-constants.h @@ -4,7 +4,6 @@ #ifndef __EXCHANGE_CONSTANTS_H__ #define __EXCHANGE_CONSTANTS_H__ - enum { UNSUPPORTED_MODE = 0, OFFLINE_MODE, diff --git a/servers/exchange/storage/exchange-folder-size.c b/servers/exchange/storage/exchange-folder-size.c index b0c7b753d..5b872413d 100644 --- a/servers/exchange/storage/exchange-folder-size.c +++ b/servers/exchange/storage/exchange-folder-size.c @@ -42,7 +42,6 @@ typedef struct { gdouble folder_size; } folder_info; - struct _ExchangeFolderSizePrivate { GHashTable *table; diff --git a/servers/exchange/storage/exchange-folder-size.h b/servers/exchange/storage/exchange-folder-size.h index 6b89f37e8..2d5abd471 100644 --- a/servers/exchange/storage/exchange-folder-size.h +++ b/servers/exchange/storage/exchange-folder-size.h @@ -16,7 +16,6 @@ G_BEGIN_DECLS #define EXCHANGE_IS_FOLDER_SIZE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXCHANGE_TYPE_FOLDER_SIZE)) #define EXCHANGE_IS_FOLDER_SIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EXCHANGE_TYPE_FOLDER_SIZE)) - typedef struct _ExchangeFolderSize ExchangeFolderSize; typedef struct _ExchangeFolderSizePrivate ExchangeFolderSizePrivate; typedef struct _ExchangeFolderSizeClass ExchangeFolderSizeClass; diff --git a/servers/exchange/storage/exchange-hierarchy-foreign.c b/servers/exchange/storage/exchange-hierarchy-foreign.c index b0bfb768e..69bf78523 100644 --- a/servers/exchange/storage/exchange-hierarchy-foreign.c +++ b/servers/exchange/storage/exchange-hierarchy-foreign.c @@ -334,7 +334,6 @@ create_internal (ExchangeHierarchy *hier, EFolder *parent, return result; } - static ExchangeAccountFolderResult create_folder (ExchangeHierarchy *hier, EFolder *parent, const gchar *name, const gchar *type) diff --git a/servers/exchange/storage/exchange-hierarchy-gal.c b/servers/exchange/storage/exchange-hierarchy-gal.c index 308fe8927..32b84434b 100644 --- a/servers/exchange/storage/exchange-hierarchy-gal.c +++ b/servers/exchange/storage/exchange-hierarchy-gal.c @@ -37,7 +37,6 @@ E2K_MAKE_TYPE (exchange_hierarchy_gal, ExchangeHierarchyGAL, NULL, NULL, PARENT_TYPE) - ExchangeHierarchy * exchange_hierarchy_gal_new (ExchangeAccount *account, const gchar *hierarchy_name, diff --git a/servers/exchange/storage/exchange-hierarchy-somedav.c b/servers/exchange/storage/exchange-hierarchy-somedav.c index 4f39bf54e..8b93336ea 100644 --- a/servers/exchange/storage/exchange-hierarchy-somedav.c +++ b/servers/exchange/storage/exchange-hierarchy-somedav.c @@ -102,7 +102,6 @@ finalize (GObject *object) E2K_MAKE_TYPE (exchange_hierarchy_somedav, ExchangeHierarchySomeDAV, class_init, init, PARENT_TYPE) - static inline gboolean folder_is_unreadable (E2kProperties *props) { @@ -194,7 +193,6 @@ scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint mode) return folder_result; } - GPtrArray * exchange_hierarchy_somedav_get_hrefs (ExchangeHierarchySomeDAV *hsd) { diff --git a/servers/exchange/storage/exchange-hierarchy-somedav.h b/servers/exchange/storage/exchange-hierarchy-somedav.h index b8ba4ee96..d2b292e09 100644 --- a/servers/exchange/storage/exchange-hierarchy-somedav.h +++ b/servers/exchange/storage/exchange-hierarchy-somedav.h @@ -33,7 +33,6 @@ struct _ExchangeHierarchySomeDAVClass { GType exchange_hierarchy_somedav_get_type (void); - GPtrArray *exchange_hierarchy_somedav_get_hrefs (ExchangeHierarchySomeDAV *hsd); ExchangeAccountFolderResult exchange_hierarchy_somedav_add_folder (ExchangeHierarchySomeDAV *hsd, const gchar *uri); diff --git a/servers/exchange/storage/exchange-hierarchy-webdav.c b/servers/exchange/storage/exchange-hierarchy-webdav.c index 3915d1fd5..4d4c3eb76 100644 --- a/servers/exchange/storage/exchange-hierarchy-webdav.c +++ b/servers/exchange/storage/exchange-hierarchy-webdav.c @@ -145,7 +145,6 @@ finalize (GObject *object) E2K_MAKE_TYPE (exchange_hierarchy_webdav, ExchangeHierarchyWebDAV, class_init, init, PARENT_TYPE) - typedef struct { const gchar *contentclass, *component; gboolean offline_supported; @@ -726,7 +725,6 @@ scan_subtree (ExchangeHierarchy *hier, EFolder *parent, gint mode) return EXCHANGE_ACCOUNT_FOLDER_OK; } - if (!folders_rn) { folders_rn = e2k_restriction_andv ( @@ -818,7 +816,6 @@ scan_offline_cb (const gchar *physical_path, const gchar *path, gpointer data) EFolder *folder; gchar *mf_name; - mf_name = g_build_filename (physical_path, "connector-metadata.xml", NULL); folder = e_folder_exchange_new_from_file (sod->hier, mf_name); if (!folder) { diff --git a/servers/exchange/storage/exchange-hierarchy-webdav.h b/servers/exchange/storage/exchange-hierarchy-webdav.h index 987ccd3b1..ce629f178 100644 --- a/servers/exchange/storage/exchange-hierarchy-webdav.h +++ b/servers/exchange/storage/exchange-hierarchy-webdav.h @@ -64,7 +64,6 @@ void exchange_hierarchy_webdav_offline_scan_subtree (ExchangeHierarchy *hier, gdouble exchange_hierarchy_webdav_get_total_folder_size (ExchangeHierarchyWebDAV *hwd); - G_END_DECLS #endif /* __EXCHANGE_HIERARCHY_WEBDAV_H__ */ diff --git a/servers/exchange/storage/exchange-hierarchy.c b/servers/exchange/storage/exchange-hierarchy.c index 6423f9e22..77f5d6a7a 100644 --- a/servers/exchange/storage/exchange-hierarchy.c +++ b/servers/exchange/storage/exchange-hierarchy.c @@ -131,7 +131,6 @@ finalize (GObject *object) E2K_MAKE_TYPE (exchange_hierarchy, ExchangeHierarchy, class_init, NULL, PARENT_TYPE) - /** * exchange_hierarchy_new_folder: * @hier: the hierarchy @@ -180,7 +179,6 @@ exchange_hierarchy_is_empty (ExchangeHierarchy *hier) return HIER_CLASS (hier)->is_empty (hier); } - static ExchangeAccountFolderResult create_folder (ExchangeHierarchy *hier, EFolder *parent, const gchar *name, const gchar *type) @@ -270,7 +268,6 @@ exchange_hierarchy_xfer_folder (ExchangeHierarchy *hier, EFolder *source, remove_source); } - static void rescan (ExchangeHierarchy *hier) { @@ -291,7 +288,6 @@ exchange_hierarchy_rescan (ExchangeHierarchy *hier) HIER_CLASS (hier)->rescan (hier); } - static ExchangeAccountFolderResult scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint mode) { @@ -318,7 +314,6 @@ exchange_hierarchy_scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint return HIER_CLASS (hier)->scan_subtree (hier, folder, mode); } - static void add_to_storage (ExchangeHierarchy *hier) { @@ -341,7 +336,6 @@ exchange_hierarchy_add_to_storage (ExchangeHierarchy *hier) HIER_CLASS (hier)->add_to_storage (hier); } - /** * exchange_hierarchy_construct: * @hier: the hierarchy diff --git a/servers/exchange/xntlm/xntlm-des.c b/servers/exchange/xntlm/xntlm-des.c index 4f6b49a3f..aabf0e342 100644 --- a/servers/exchange/xntlm/xntlm-des.c +++ b/servers/exchange/xntlm/xntlm-des.c @@ -296,13 +296,11 @@ static guchar pc2[] = { /* End of DES-defined tables */ - /* bit 0 is left-most in byte */ static gint bytebit[] = { 0200,0100,040,020,010,04,02,01 }; - /* Generate key schedule for encryption or decryption * depending on the value of "decrypt" */ diff --git a/servers/exchange/xntlm/xntlm.c b/servers/exchange/xntlm/xntlm.c index 0bf422f5b..def4b6d1f 100644 --- a/servers/exchange/xntlm/xntlm.c +++ b/servers/exchange/xntlm/xntlm.c @@ -28,7 +28,6 @@ #include <ctype.h> #include <string.h> - static guchar NTLM_NEGOTIATE_MESSAGE[] = { 'N', 'T', 'L', 'M', 'S', 'S', 'P', 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x82, 0x00, 0x00, @@ -56,7 +55,6 @@ xntlm_negotiate (void) return message; } - #define GET_SHORTY(p) ((p)[0] + ((p)[1] << 8)) static gchar * @@ -150,7 +148,6 @@ xntlm_parse_challenge (gpointer challenge, gint len, gchar **nonce, return TRUE; } - static void ntlm_set_string (GByteArray *ba, gint offset, const gchar *data, gint len) { @@ -231,7 +228,6 @@ xntlm_authenticate (const gchar *nonce, const gchar *domain, return message; } - static void setup_schedule (const guchar *key_56, XNTLM_DES_KS ks) { @@ -325,4 +321,3 @@ ntlm_calc_response (const guchar key[21], const guchar plaintext[8], xntlm_des (ks, results + 16); } - diff --git a/servers/google/libgdata-google/gdata-google-service.c b/servers/google/libgdata-google/gdata-google-service.c index b90f17f63..195bf4ef3 100644 --- a/servers/google/libgdata-google/gdata-google-service.c +++ b/servers/google/libgdata-google/gdata-google-service.c @@ -66,7 +66,6 @@ enum { PROP_AGENT }; - static const gchar *GOOGLE_CLIENT_LOGIN = "https://www.google.com/accounts/ClientLogin"; GQuark @@ -150,7 +149,6 @@ service_is_authenticated (GDataGoogleService *service) return TRUE; } - /** * * gdata_google_service_get_feed: @@ -211,7 +209,6 @@ gdata_google_service_get_feed (GDataService *service, const gchar *feed_url, GEr return feed; } - /** * * gdata_google_service_insert_entry: @@ -281,7 +278,6 @@ gdata_google_service_insert_entry (GDataService *service, const gchar *feed_url, return updated_entry; } - /** * * gdata_google_service_delete_entry: @@ -357,7 +353,6 @@ gdata_google_service_update_entry (GDataService *service, GDataEntry *entry, GEr return gdata_google_service_update_entry_with_link (service, entry, entry_edit_url, error); } - /** * * gdata_google_update_entry_with_link: @@ -454,7 +449,6 @@ static void gdata_google_service_instance_init(GTypeInstance *instance, priv->name = NULL; priv->agent = NULL; - priv->auth = g_new0(GDataGoogleServiceAuth,1); priv->auth->username = NULL; priv->auth->password = NULL; @@ -573,7 +567,6 @@ static void gdata_google_service_set_property (GObject *obj, } } - static void gdata_google_service_class_init(gpointer g_class, gpointer g_class_data) { @@ -587,7 +580,6 @@ static void gdata_google_service_class_init(gpointer g_class, gobject_class->dispose = gdata_google_service_dispose; gobject_class->finalize = gdata_google_service_finalize; - g_object_class_install_property(gobject_class, PROP_NAME, g_param_spec_string("name", "Name", "The name (e.g. 'cl') of the service", @@ -598,7 +590,6 @@ static void gdata_google_service_class_init(gpointer g_class, G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - g_object_class_install_property(gobject_class, PROP_AGENT, g_param_spec_string("agent", "Agent", "The agent (e.g 'evolution', 'tinymail') of the calling program", @@ -612,7 +603,6 @@ static void gdata_google_service_class_init(gpointer g_class, return; } - GType gdata_google_service_get_type (void) { static GType type = 0; @@ -651,7 +641,6 @@ GType gdata_google_service_get_type (void) return type; } - /*********API******* */ /** diff --git a/servers/google/libgdata/gdata-entry.c b/servers/google/libgdata/gdata-entry.c index f2a3a0e0b..87bc0329a 100644 --- a/servers/google/libgdata/gdata-entry.c +++ b/servers/google/libgdata/gdata-entry.c @@ -22,7 +22,6 @@ * */ - #include <config.h> /* LibXML2 includes */ @@ -173,7 +172,6 @@ static void destroy_postal_address (gpointer data, gpointer user_data) g_free (address); } - static void gdata_entry_init (GTypeInstance *instance, gpointer g_class) { @@ -326,7 +324,6 @@ GType gdata_entry_get_type (void) return type; } - /*** API ***/ static GDataEntryAuthor * xmlnode_to_author (xmlDocPtr doc, xmlNodePtr cur) @@ -846,7 +843,6 @@ postal_address_to_xmlnode (GDataEntryPostalAddress *address) return address_node; } - /** * gdata_entry_new: * Creates a new #GDataEntry. @@ -1361,7 +1357,6 @@ gdata_entry_get_start_time (GDataEntry *entry) return priv->start_time; } - /** * gdata_entry_get_transparency: * @entry: A #GDataEntry object. diff --git a/servers/google/libgdata/gdata-entry.h b/servers/google/libgdata/gdata-entry.h index c15c9e250..67759b3b9 100644 --- a/servers/google/libgdata/gdata-entry.h +++ b/servers/google/libgdata/gdata-entry.h @@ -28,17 +28,14 @@ #include <glib.h> #include <glib-object.h> - /* LibXML2 includes */ #include <libxml/parser.h> #include <libxml/tree.h> #include <libxml/xpath.h> #include <libxml/xpathInternals.h> - G_BEGIN_DECLS - #define GDATA_TYPE_ENTRY (gdata_entry_get_type()) #define GDATA_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GDATA_TYPE_ENTRY, GDataEntry)) #define GDATA_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GDATA_TYPE_ENTRY, GDataEntryClass)) @@ -50,7 +47,6 @@ typedef struct _GDataEntry GDataEntry; typedef struct _GDataEntryClass GDataEntryClass; typedef struct _GDataEntryPrivate GDataEntryPrivate; - struct _GDataEntry { GObject parent; @@ -144,10 +140,8 @@ struct _GDataEntryPostalAddress { gboolean primary; }; - GType gdata_entry_get_type(void); - /***** API *****/ GDataEntry * gdata_entry_new(void); diff --git a/servers/google/libgdata/gdata-feed.c b/servers/google/libgdata/gdata-feed.c index 7c9c9a49f..dad83d852 100644 --- a/servers/google/libgdata/gdata-feed.c +++ b/servers/google/libgdata/gdata-feed.c @@ -36,7 +36,6 @@ #define GDATA_FEED_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_FEED, GDataFeedPrivate)) - struct _GDataFeedAuthor { gchar *email; gchar *name; @@ -62,8 +61,6 @@ struct _GDataFeedLink { }; typedef struct _GDataFeedLink GDataFeedLink; - - struct _GDataFeedPrivate { /* feed information */ @@ -246,7 +243,6 @@ gdata_feed_finalize(GObject *obj) if (priv->feedXML != NULL) g_free(priv->feedXML); - /* Chain up to the parent class */ klass = GDATA_FEED_CLASS(g_type_class_peek(GDATA_TYPE_FEED)); parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass)); @@ -304,13 +300,11 @@ gdata_feed_class_init(gpointer g_class, GObjectClass *gobject_class = G_OBJECT_CLASS(g_class); GDataFeedClass *klass = GDATA_FEED_CLASS(g_class); - g_type_class_add_private(klass, sizeof (GDataFeedPrivate)); gobject_class->set_property = gdata_feed_set_property; gobject_class->get_property = gdata_feed_get_property; - gobject_class->dispose = gdata_feed_dispose; gobject_class->finalize = gdata_feed_finalize; gobject_class->constructor = gdata_feed_constructor; @@ -337,7 +331,6 @@ GType gdata_feed_get_type(void) return type; } - /*** API ***/ static GDataFeedAuthor * xmlnode_to_author(xmlDocPtr doc, xmlNodePtr cur) @@ -387,7 +380,6 @@ xmlnode_to_link(xmlDocPtr doc, xmlNodePtr cur) link->title = NULL; link->type = NULL; - value = xmlGetProp(cur, (xmlChar *)"href"); if (value) { link->href = g_strdup((gchar *)value); @@ -415,7 +407,6 @@ xmlnode_to_link(xmlDocPtr doc, xmlNodePtr cur) return link; } - static GDataFeedCategory * xmlnode_to_category(xmlDocPtr doc, xmlNodePtr cur) { @@ -523,7 +514,6 @@ gdata_feed_new(void) return g_object_new(GDATA_TYPE_FEED, NULL); } - GDataFeed * gdata_feed_new_from_xml(const gchar * feedXML, const gint length) { @@ -603,7 +593,6 @@ gdata_feed_new_from_xml(const gchar * feedXML, const gint length) return feed; } - gchar * gdata_feed_generate_xml(GDataFeed *feed) { diff --git a/servers/google/libgdata/gdata-feed.h b/servers/google/libgdata/gdata-feed.h index b2406d431..44bccec3c 100644 --- a/servers/google/libgdata/gdata-feed.h +++ b/servers/google/libgdata/gdata-feed.h @@ -29,7 +29,6 @@ G_BEGIN_DECLS - #define GDATA_TYPE_FEED (gdata_feed_get_type()) #define GDATA_FEED(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GDATA_TYPE_FEED, GDataFeed)) #define GDATA_FEED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GDATA_TYPE_FEED, GDataFeedClass)) @@ -41,7 +40,6 @@ typedef struct _GDataFeed GDataFeed; typedef struct _GDataFeedClass GDataFeedClass; typedef struct _GDataFeedPrivate GDataFeedPrivate; - struct _GDataFeed { GObject parent; diff --git a/servers/groupwise/e-gw-connection.c b/servers/groupwise/e-gw-connection.c index bb08519af..ca15da1db 100644 --- a/servers/groupwise/e-gw-connection.c +++ b/servers/groupwise/e-gw-connection.c @@ -521,7 +521,6 @@ e_gw_connection_new_with_error_handler (const gchar *uri, const gchar *username, static GStaticMutex connecting = G_STATIC_MUTEX_INIT; - g_static_mutex_lock (&connecting); /* search the connection in our hash table */ @@ -540,7 +539,6 @@ e_gw_connection_new_with_error_handler (const gchar *uri, const gchar *username, } } - /* not found, so create a new connection */ cnc = g_object_new (E_TYPE_GW_CONNECTION, NULL); @@ -664,7 +662,6 @@ e_gw_connection_new_with_error_handler (const gchar *uri, const gchar *username, } - EGwConnection * e_gw_connection_new (const gchar *uri, const gchar *username, const gchar *password) { @@ -1010,7 +1007,6 @@ e_gw_connection_get_items_delta (EGwConnection *cnc, const gchar *container, con subparam = soup_soap_parameter_get_next_child_by_name (subparam, "item")) { EGwItem *item; - item = e_gw_item_new_from_soap_parameter (cnc->priv->user_email, container, subparam); subsubparam = soup_soap_parameter_get_first_child_by_name(subparam, "sync"); @@ -1035,7 +1031,6 @@ e_gw_connection_get_items_delta (EGwConnection *cnc, const gchar *container, con } - EGwConnectionStatus e_gw_connection_get_items (EGwConnection *cnc, const gchar *container, const gchar *view, EGwFilter *filter, GList **list) { @@ -1474,7 +1469,6 @@ e_gw_connection_get_item (EGwConnection *cnc, const gchar *container, const gcha return E_GW_CONNECTION_STATUS_UNKNOWN; } - e_gw_message_write_string_parameter (msg, "id", NULL, id); if (view) @@ -1517,10 +1511,6 @@ e_gw_connection_get_item (EGwConnection *cnc, const gchar *container, const gcha return E_GW_CONNECTION_STATUS_OK; } - - - - EGwConnectionStatus e_gw_connection_remove_item (EGwConnection *cnc, const gchar *container, const gchar *id) { @@ -2014,7 +2004,6 @@ e_gw_connection_get_address_book_list (EGwConnection *cnc, GList **container_lis return status; } - EGwConnectionStatus e_gw_connection_get_address_book_id ( EGwConnection *cnc, gchar *book_name, gchar **id , gboolean *is_writable) { @@ -2107,7 +2096,6 @@ e_gw_connection_get_settings (EGwConnection *cnc, EGwSendOptions **opts) EGwConnectionPrivate *priv; static GStaticMutex connecting = G_STATIC_MUTEX_INIT; - g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT); priv = cnc->priv; @@ -2303,7 +2291,6 @@ e_gw_connection_add_members (EGwConnection *cnc, const gchar *group_id, GList *m g_object_unref (msg); return status; - } EGwConnectionStatus @@ -2347,11 +2334,8 @@ e_gw_connection_remove_members (EGwConnection *cnc, const gchar *group_id, GList g_object_unref (msg); return status; - - } - EGwConnectionStatus e_gw_connection_create_cursor (EGwConnection *cnc, const gchar *container, const gchar *view, EGwFilter *filter, gint *cursor) { @@ -2440,8 +2424,6 @@ e_gw_connection_destroy_cursor (EGwConnection *cnc, const gchar *container, gin } - - EGwConnectionStatus e_gw_connection_position_cursor (EGwConnection *cnc, const gchar *container, gint cursor, const gchar *seek, gint offset) { @@ -2651,10 +2633,8 @@ EGwConnectionStatus e_gw_connection_get_quick_messages (EGwConnection *cnc, cons g_object_unref (msg); return E_GW_CONNECTION_STATUS_OK; - } - EGwConnectionStatus e_gw_connection_create_folder(EGwConnection *cnc, const gchar *parent_name,const gchar *folder_name, gchar **container_id) { @@ -2719,7 +2699,6 @@ e_gw_connection_get_attachment (EGwConnection *cnc, const gchar *id, gint offset return E_GW_CONNECTION_STATUS_UNKNOWN; } - e_gw_message_write_string_parameter (msg, "id", NULL, id); e_gw_message_write_int_parameter (msg, "offset", NULL, offset); e_gw_message_write_int_parameter (msg, "length", NULL, length); @@ -2742,7 +2721,6 @@ e_gw_connection_get_attachment (EGwConnection *cnc, const gchar *id, gint offset return status; } - param = soup_soap_response_get_first_parameter_by_name (response, "part"); if (param) { buf_length = soup_soap_parameter_get_property (param, "length"); @@ -2789,7 +2767,6 @@ e_gw_connection_get_attachment_base64 (EGwConnection *cnc, const gchar *id, gint return E_GW_CONNECTION_STATUS_UNKNOWN; } - e_gw_message_write_string_parameter (msg, "id", NULL, id); e_gw_message_write_int_parameter (msg, "offset", NULL, offset); e_gw_message_write_int_parameter (msg, "length", NULL, length); @@ -2812,7 +2789,6 @@ e_gw_connection_get_attachment_base64 (EGwConnection *cnc, const gchar *id, gint return status; } - param = soup_soap_response_get_first_parameter_by_name (response, "part"); if (param) { buf_length = soup_soap_parameter_get_property (param, "length"); @@ -3001,7 +2977,6 @@ e_gw_connection_move_item (EGwConnection *cnc, const gchar *id, const gchar *des g_return_val_if_fail (id != NULL, E_GW_CONNECTION_STATUS_INVALID_OBJECT); g_return_val_if_fail (dest_container_id != NULL, E_GW_CONNECTION_STATUS_INVALID_OBJECT); - /* build the SOAP message */ msg = e_gw_message_new_with_header (cnc->priv->uri, cnc->priv->session_id, "moveItemRequest"); e_gw_message_write_string_parameter (msg, "id", NULL, id); @@ -3025,7 +3000,6 @@ e_gw_connection_move_item (EGwConnection *cnc, const gchar *id, const gchar *des g_object_unref (msg); return status; - } EGwConnectionStatus diff --git a/servers/groupwise/e-gw-connection.h b/servers/groupwise/e-gw-connection.h index 0ac9c8115..ea5394f0a 100644 --- a/servers/groupwise/e-gw-connection.h +++ b/servers/groupwise/e-gw-connection.h @@ -114,7 +114,6 @@ EGwConnectionStatus e_gw_connection_remove_items (EGwConnection *cnc, const gcha EGwConnectionStatus e_gw_connection_get_items_delta_info (EGwConnection *cnc, const gchar *container, gdouble *first_sequence, gdouble *last_sequence, gdouble *last_po_rebuild_time); EGwConnectionStatus e_gw_connection_get_items_delta (EGwConnection *cnc, const gchar *container, const gchar *view, const gchar *count, const gchar * start_sequence, GList **add_list, GList **delete_list); - const gchar *e_gw_connection_get_uri (EGwConnection *cnc); const gchar *e_gw_connection_get_session_id (EGwConnection *cnc); const gchar *e_gw_connection_get_user_name (EGwConnection *cnc); @@ -123,11 +122,9 @@ const gchar *e_gw_connection_get_user_uuid (EGwConnection *cnc); const gchar *e_gw_connection_get_version (EGwConnection *cnc); const gchar *e_gw_connection_get_server_time (EGwConnection *cnc); - time_t e_gw_connection_get_date_from_string (const gchar *dtstring); gchar *e_gw_connection_format_date_string (const gchar *dtstring); - EGwConnectionStatus e_gw_connection_create_item (EGwConnection *cnc, EGwItem *item, gchar ** id); EGwConnectionStatus e_gw_connection_get_item (EGwConnection *cnc, const gchar *container, const gchar *id, const gchar *view, EGwItem **item); EGwConnectionStatus e_gw_connection_modify_item (EGwConnection *cnc, const gchar *id, EGwItem *item); diff --git a/servers/groupwise/e-gw-container.c b/servers/groupwise/e-gw-container.c index 981976ff5..6e1f44e33 100644 --- a/servers/groupwise/e-gw-container.c +++ b/servers/groupwise/e-gw-container.c @@ -270,7 +270,6 @@ e_gw_container_set_from_soap_parameter (EGwContainer *container, SoupSoapParamet g_free (value); } - /* retrive the unread and total count */ subparam = soup_soap_parameter_get_first_child_by_name (param, "hasUnread"); if (!subparam) { @@ -635,7 +634,6 @@ e_gw_container_get_unread_count (EGwContainer *container) } - gboolean e_gw_container_get_is_writable (EGwContainer *container) { diff --git a/servers/groupwise/e-gw-filter.c b/servers/groupwise/e-gw-filter.c index 636587582..6cc9e189a 100644 --- a/servers/groupwise/e-gw-filter.c +++ b/servers/groupwise/e-gw-filter.c @@ -45,8 +45,6 @@ struct _EGwFilterPrivate { }; - - void e_gw_filter_add_filter_component (EGwFilter *filter, EGwFilterOpType operation, const gchar *field_name, const gchar *field_value) { @@ -126,7 +124,6 @@ append_child_component (FilterComponent* filter_component, SoupSoapMessage *msg) } - if (operation_name != NULL) { e_gw_message_write_string_parameter (msg, "op", NULL, operation_name); @@ -137,8 +134,6 @@ append_child_component (FilterComponent* filter_component, SoupSoapMessage *msg) soup_soap_message_end_element (msg); } - - static GSList* append_complex_component (GSList *component_list, SoupSoapMessage *msg) { @@ -169,7 +164,6 @@ append_complex_component (GSList *component_list, SoupSoapMessage *msg) else append_child_component (filter_component, msg); - } soup_soap_message_end_element (msg); @@ -248,7 +242,6 @@ e_gw_filter_init (EGwFilter *filter, EGwFilterClass *klass) filter->priv = priv; } - static void e_gw_filter_class_init (EGwFilterClass *klass) { diff --git a/servers/groupwise/e-gw-filter.h b/servers/groupwise/e-gw-filter.h index 9bc24c783..a93141253 100644 --- a/servers/groupwise/e-gw-filter.h +++ b/servers/groupwise/e-gw-filter.h @@ -24,7 +24,6 @@ #ifndef E_GW_FILTER_H #define E_GW_FILTER_H - #include "soup-soap-message.h" #include "soup-soap-response.h" @@ -40,7 +39,6 @@ typedef struct _EGwFilter EGwFilter; typedef struct _EGwFilterClass EGwFilterClass; typedef struct _EGwFilterPrivate EGwFilterPrivate; - typedef enum { E_GW_FILTER_OP_AND, E_GW_FILTER_OP_OR, diff --git a/servers/groupwise/e-gw-item.c b/servers/groupwise/e-gw-item.c index d14e06b70..a22d8e5c4 100644 --- a/servers/groupwise/e-gw-item.c +++ b/servers/groupwise/e-gw-item.c @@ -583,7 +583,6 @@ e_gw_item_init (EGwItem *item, EGwItemClass *klass) priv->parent_threads = NULL; item->priv = priv; - } GType @@ -680,7 +679,6 @@ set_recipient_list_from_soap_parameter (EGwItem *item, SoupSoapParameter *param) } /*FIXME gw recipientTypes need to be added after the server is fixed. */ - /* update Recipient Status look for accepted/declined and update the item else set it to none. */ @@ -881,7 +879,6 @@ e_gw_item_get_email_list (EGwItem *item) { return item->priv->email_list; - } void @@ -1065,7 +1062,6 @@ set_common_addressbook_item_fields_from_soap_parameter (EGwItem *item, SoupSoapP } } - } static void @@ -1221,7 +1217,6 @@ set_contact_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param) } } - subparam = soup_soap_parameter_get_first_child_by_name(param, "phoneList"); if(subparam) { g_hash_table_insert (simple_fields, (gpointer) "default_phone", soup_soap_parameter_get_property(subparam, "default")); @@ -1374,7 +1369,6 @@ set_group_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param) } } - } static void @@ -1463,7 +1457,6 @@ set_organization_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *p g_hash_table_insert (simple_fields, (gpointer) "website", value); } - } static void @@ -2654,7 +2647,6 @@ e_gw_item_set_trigger (EGwItem *item, gint trigger) item->priv->trigger = trigger; } - void e_gw_item_set_to (EGwItem *item, const gchar *to) { @@ -2740,7 +2732,6 @@ e_gw_item_get_track_info (EGwItem *item) return item->priv->track_info; } - void e_gw_item_set_autodelete (EGwItem *item, gboolean set) { @@ -3381,7 +3372,6 @@ e_gw_item_append_to_soap_message (EGwItem *item, SoupSoapMessage *msg) else e_gw_message_write_string_parameter (msg, "allDayEvent", NULL ,"0"); - if (priv->trigger != 0) { alarm = g_strdup_printf ("%d", priv->trigger); e_gw_message_write_string_parameter_with_attribute (msg, "alarm", NULL, alarm, "enabled", "1"); @@ -3445,7 +3435,6 @@ e_gw_item_append_to_soap_message (EGwItem *item, SoupSoapMessage *msg) return TRUE; } - static void append_contact_changes_to_soap_message (EGwItem *item, SoupSoapMessage *msg, gint change_type) { diff --git a/servers/groupwise/e-gw-item.h b/servers/groupwise/e-gw-item.h index f76979cf5..f145e5e30 100644 --- a/servers/groupwise/e-gw-item.h +++ b/servers/groupwise/e-gw-item.h @@ -55,7 +55,6 @@ typedef enum { } EGwItemType; - typedef enum { E_GW_ITEM_CHANGE_TYPE_ADD, E_GW_ITEM_CHANGE_TYPE_UPDATE, @@ -248,7 +247,6 @@ void e_gw_item_set_delay_until (EGwItem *item, gchar *delay_until); gchar *e_gw_item_get_delay_until (EGwItem *item); void e_gw_item_free_cal_id (EGwItemCalId *calid); - #define E_GW_ITEM_CLASSIFICATION_PUBLIC "Public" #define E_GW_ITEM_CLASSIFICATION_PRIVATE "Private" #define E_GW_ITEM_CLASSIFICATION_CONFIDENTIAL "Confidential" @@ -282,7 +280,6 @@ void e_gw_item_set_organizer (EGwItem *item, EGwItemOrganizer *organizer); GSList * e_gw_item_get_attach_id_list (EGwItem *item); void e_gw_item_set_attach_id_list (EGwItem *item, GSList *attach_list); - GSList *e_gw_item_get_recurrence_dates (EGwItem *item); void e_gw_item_set_recurrence_dates (EGwItem *item, GSList *new_recurrence_dates); @@ -307,7 +304,6 @@ gboolean e_gw_item_is_from_internet (EGwItem *item); const gchar *e_gw_item_get_parent_thread_ids (EGwItem *item); const gchar * e_gw_item_get_message_id (EGwItem *item); - typedef struct { gchar *email; gchar *display_name; diff --git a/servers/groupwise/e-gw-message.h b/servers/groupwise/e-gw-message.h index 25541f47a..541e6f66b 100644 --- a/servers/groupwise/e-gw-message.h +++ b/servers/groupwise/e-gw-message.h @@ -43,7 +43,6 @@ void e_gw_message_write_base64_parameter (SoupSoapMessage *msg, const gchar *value); void e_gw_message_write_int_parameter (SoupSoapMessage *msg, const gchar *name, const gchar *prefix, glong value); - void e_gw_message_write_footer (SoupSoapMessage *msg); G_END_DECLS diff --git a/servers/groupwise/e-gw-proxy.h b/servers/groupwise/e-gw-proxy.h index 98dd8f7ad..bebe29b2f 100644 --- a/servers/groupwise/e-gw-proxy.h +++ b/servers/groupwise/e-gw-proxy.h @@ -47,7 +47,6 @@ #define E_GW_PROXY_MODIFY_FOLDERS (1 << 10) #define E_GW_PROXY_READ_PRIVATE (1 << 11) - struct _proxyHandler { gchar *uniqueid; gchar *proxy_name; diff --git a/servers/groupwise/e-gw-recur-utils.c b/servers/groupwise/e-gw-recur-utils.c index 0014419b6..16e370144 100644 --- a/servers/groupwise/e-gw-recur-utils.c +++ b/servers/groupwise/e-gw-recur-utils.c @@ -36,5 +36,3 @@ e_gw_recur_get_day_of_week (short day) return days_of_week [day-1]; } - - diff --git a/servers/groupwise/e-gw-recur-utils.h b/servers/groupwise/e-gw-recur-utils.h index c6043cc2d..72d11f476 100644 --- a/servers/groupwise/e-gw-recur-utils.h +++ b/servers/groupwise/e-gw-recur-utils.h @@ -30,7 +30,6 @@ #define E_GW_ITEM_RECURRENCE_FREQUENCY_MONTHLY "Monthly" #define E_GW_ITEM_RECURRENCE_FREQUENCY_YEARLY "Yearly" - #define E_GW_ITEM_RECUR_OCCURRENCE_TYPE_FIRST "First" #define E_GW_ITEM_RECUR_OCCURRENCE_TYPE_SECOND "Second" #define E_GW_ITEM_RECUR_OCCURRENCE_TYPE_THIRD "Third" @@ -65,11 +64,8 @@ typedef struct { short by_setpos [E_GW_ITEM_BY_SETPOS_SIZE]; } EGwItemRecurrenceRule; - #define E_GW_ITEM_RECUR_END_MARKER 0x7f7f - - const gchar *e_gw_recur_get_day_of_week (short day); #endif diff --git a/servers/groupwise/e-gw-sendoptions.c b/servers/groupwise/e-gw-sendoptions.c index 70ff7c918..8dcf91585 100644 --- a/servers/groupwise/e-gw-sendoptions.c +++ b/servers/groupwise/e-gw-sendoptions.c @@ -229,7 +229,6 @@ parse_status_tracking_options (SoupSoapParameter *group_param, guint i, EGwSendO } else sopts->opened = E_GW_RETURN_NOTIFY_NONE; - } else if (!g_ascii_strcasecmp (field + i, "ReturnDelete")) { if (val_param) val_param = soup_soap_parameter_get_first_child_by_name (val_param, "mail"); @@ -254,7 +253,6 @@ parse_status_tracking_options (SoupSoapParameter *group_param, guint i, EGwSendO } else sopts->accepted = E_GW_RETURN_NOTIFY_NONE; - } else if (!g_ascii_strcasecmp (field + i, "ReturnCompleted")) { if (val_param) val_param = soup_soap_parameter_get_first_child_by_name (val_param, "mail"); @@ -659,4 +657,3 @@ e_gw_sendoptions_new_from_soap_parameter (SoupSoapParameter *param) return opts; } - diff --git a/servers/groupwise/soup-soap-message.c b/servers/groupwise/soup-soap-message.c index b776db0f6..4180f72f0 100644 --- a/servers/groupwise/soup-soap-message.c +++ b/servers/groupwise/soup-soap-message.c @@ -60,7 +60,6 @@ soup_soap_message_init (SoupSoapMessage *msg) priv->doc->encoding = xmlCharStrdup ("UTF-8"); } - static xmlNsPtr fetch_ns (SoupSoapMessage *msg, const gchar *prefix, const gchar *ns_uri) { diff --git a/servers/groupwise/soup-soap-response.c b/servers/groupwise/soup-soap-response.c index 37b80fd9f..6b03d5d89 100644 --- a/servers/groupwise/soup-soap-response.c +++ b/servers/groupwise/soup-soap-response.c @@ -55,7 +55,6 @@ soup_soap_response_init (SoupSoapResponse *response) priv->xmldoc = xmlNewDoc ((const xmlChar *)"1.0"); } - /** * soup_soap_response_new: * @@ -563,7 +562,6 @@ soup_xml_real_node (xmlNode *node) return node; } - gint soup_soap_response_dump_response (SoupSoapResponse *response, FILE *buffer) { diff --git a/servers/groupwise/soup-soap-response.h b/servers/groupwise/soup-soap-response.h index e26f61723..8490571a7 100644 --- a/servers/groupwise/soup-soap-response.h +++ b/servers/groupwise/soup-soap-response.h @@ -63,7 +63,6 @@ SoupSoapParameter *soup_soap_response_get_next_parameter_by_name (SoupSoapRespon gint soup_soap_response_dump_response (SoupSoapResponse *response, FILE *buffer); - G_END_DECLS #endif |
