GNOME.org
 

[evolution-exchange] Fix dead assignments.

commit 3ca1a18ac8551e97e164a1dab6d574302f0f8d12
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Mar 6 08:51:54 2011 -0500

    Fix dead assignments.

 addressbook/e-book-backend-gal.c           |   28 ++++++++++++++--------------
 calendar/e-cal-backend-exchange-calendar.c |    3 +--
 calendar/e-cal-backend-exchange-tasks.c    |    2 --
 camel/camel-exchange-utils.c               |    5 +----
 eplugin/exchange-config-listener.c         |    3 +--
 eplugin/exchange-contacts.c                |    2 --
 eplugin/exchange-delegates.c               |    7 +++----
 eplugin/exchange-send-options.c            |    2 --
 server/lib/e2k-autoconfig.c                |    6 +++---
 server/lib/e2k-result.c                    |    3 +--
 server/lib/e2k-utils.c                     |    2 --
 server/storage/e-folder-type-registry.c    |    7 -------
 server/storage/exchange-hierarchy-webdav.c |    3 +--
 server/xntlm/xntlm-md4.c                   |    3 +--
 14 files changed, 26 insertions(+), 50 deletions(-)
---
diff --git a/addressbook/e-book-backend-gal.c b/addressbook/e-book-backend-gal.c
index 27d127f..71eaf70 100644
--- a/addressbook/e-book-backend-gal.c
+++ b/addressbook/e-book-backend-gal.c
@@ -2251,7 +2251,7 @@ generate_cache (EBookBackendGAL *book_backend_gal, const gchar * changed_filter)
 	LDAPGetContactListOp *contact_list_op = g_new0 (LDAPGetContactListOp, 1);
 	EBookBackendGALPrivate *priv;
 	gchar *ldap_query;
-	gint  i = 0, rc;
+	gint  i = 0;
 	BerElement *prber = NULL;
 	gchar t[15], *cachetime;
 	LDAPControl c[6];
@@ -2316,7 +2316,7 @@ getNextPage:
 	}
 	g_mutex_unlock (priv->ldap_lock);
 
-	rc = dosearch (book_backend_gal, LDAP_ROOT_DSE, LDAP_SCOPE_SUBTREE, NULL, ldap_query, NULL, 0, NULL, NULL, NULL, changed_filter, -1);
+	dosearch (book_backend_gal, LDAP_ROOT_DSE, LDAP_SCOPE_SUBTREE, NULL, ldap_query, NULL, 0, NULL, NULL, NULL, changed_filter, -1);
 
 	/* loop to get the next set of entries */
 
@@ -2389,10 +2389,10 @@ authenticate_user (EBookBackend *backend,
 	ExchangeAccount *account = NULL;
 	GError *err = NULL;
 #if defined(ENABLE_CACHE) && ENABLE_CACHE
-	GConfClient *gc = gconf_client_get_default ();
-	gint interval = gconf_client_get_int (gc, "/apps/evolution/addressbook/gal_cache_interval", NULL);
+	//GConfClient *gc = gconf_client_get_default ();
+	//gint interval = gconf_client_get_int (gc, "/apps/evolution/addressbook/gal_cache_interval", NULL);
 
-	g_object_unref (gc);
+	//g_object_unref (gc);
 #endif
 
 	/* We should not be here */
@@ -2431,17 +2431,17 @@ authenticate_user (EBookBackend *backend,
 #if defined(ENABLE_CACHE) && ENABLE_CACHE
 		if (be->priv->marked_for_offline) {
 			if (e_book_backend_db_cache_is_populated (be->priv->file_db) ) {
-				time_t t1, t2;
-				gint diff;
+				//time_t t1, t2;
+				//gint diff;
 
-				gchar *t = e_book_backend_db_cache_get_time (be->priv->file_db);
+				//gchar *t = e_book_backend_db_cache_get_time (be->priv->file_db);
 				d(printf("Cache is populated, check if refresh is required \n"));
-				if (t && *t)
-					t1 = atoi (t);
-				else
-					t1=0;
-				t2 = time (NULL);
-				diff = interval * 24 * 60 *60;
+				//if (t && *t)
+				//	t1 = atoi (t);
+				//else
+				//	t1=0;
+				//t2 = time (NULL);
+				//diff = interval * 24 * 60 *60;
 				/* We have a day specified, then we cache it. */
 				//if (!diff || t2 - t1 > diff) {
 				//	d(printf ("Cache older than specified period, refreshing \n"));
diff --git a/calendar/e-cal-backend-exchange-calendar.c b/calendar/e-cal-backend-exchange-calendar.c
index f5527eb..88b9ff7 100644
--- a/calendar/e-cal-backend-exchange-calendar.c
+++ b/calendar/e-cal-backend-exchange-calendar.c
@@ -334,7 +334,7 @@ get_changed_events (ECalBackendExchange *cbex)
 	E2kRestriction *rn;
 	E2kResultIter *iter;
 	E2kResult *result;
-	const gchar *prop, *uid, *modtime, *attach_prop, *receipts, *rid;
+	const gchar *uid, *modtime, *attach_prop, *receipts, *rid;
 	guint status;
 	E2kContext *ctx;
 	gint i, status_tracking = EX_NO_RECEIPTS;
@@ -454,7 +454,6 @@ get_changed_events (ECalBackendExchange *cbex)
 	/* Now get the full text of any that weren't already cached. */
 	/* OWA usually sends the attachment and whole event body as part of
 		PR_INTERNET_CONTENT property. Fetch events created from OWA */
-	prop = PR_INTERNET_CONTENT;
 	iter = e_folder_exchange_bpropfind_start (cbex->folder, NULL,
 						  (const gchar **)hrefs->pdata,
 						  hrefs->len,
diff --git a/calendar/e-cal-backend-exchange-tasks.c b/calendar/e-cal-backend-exchange-tasks.c
index fa0a59c..c38121c 100644
--- a/calendar/e-cal-backend-exchange-tasks.c
+++ b/calendar/e-cal-backend-exchange-tasks.c
@@ -1045,7 +1045,6 @@ static void
 create_task_object (ECalBackendSync *backend, EDataCal *cal,
 		    gchar **calobj, gchar **return_uid, GError **error)
 {
-	ECalBackendExchangeTasks *ecalbextask;
 	ECalBackendExchange *ecalbex;
 	E2kProperties *props;
 	E2kContext *e2kctx;
@@ -1064,7 +1063,6 @@ create_task_object (ECalBackendSync *backend, EDataCal *cal,
 	gchar *location;
 	const gchar *temp_comp_uid;
 
-	ecalbextask = E_CAL_BACKEND_EXCHANGE_TASKS (backend);
 	ecalbex = E_CAL_BACKEND_EXCHANGE (backend);
 
 	e_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
diff --git a/camel/camel-exchange-utils.c b/camel/camel-exchange-utils.c
index d3995e8..feef990 100644
--- a/camel/camel-exchange-utils.c
+++ b/camel/camel-exchange-utils.c
@@ -926,7 +926,7 @@ get_folder_contents_online (ExchangeFolder *mfld, GError **error)
 	E2kResult *result;
 	const gchar *prop, *uid;
 	guint32 article_num, camel_flags, high_article_num;
-	gint i, total = -1;
+	gint i;
 	guint m;
 	CamelFolder *folder;
 
@@ -965,7 +965,6 @@ get_folder_contents_online (ExchangeFolder *mfld, GError **error)
 	folder = get_camel_folder (mfld);
 
 	m = 0;
-	total = e2k_result_iter_get_total (iter);
 	while (m < msgs_copy->len && (result = e2k_result_iter_next (iter))) {
 		prop = e2k_properties_get_prop (result->props,
 						PR_INTERNET_ARTICLE_NUMBER);
@@ -1217,7 +1216,6 @@ get_folder_online (ExchangeFolder *mfld, GError **error)
 	E2kHTTPStatus status;
 	E2kResult *results;
 	gint nresults = 0;
-	gboolean readonly;
 	const gchar *prop;
 
 	mfld->changed_messages = g_ptr_array_new ();
@@ -1250,7 +1248,6 @@ get_folder_online (ExchangeFolder *mfld, GError **error)
 			e2k_results_free (results, nresults);
 		return FALSE;
 	}
-	readonly = (mfld->access & (MAPI_ACCESS_MODIFY | MAPI_ACCESS_CREATE_CONTENTS)) == 0;
 
 	prop = e2k_properties_get_prop (results[0].props, PR_DELETED_COUNT_TOTAL);
 	if (prop)
diff --git a/eplugin/exchange-config-listener.c b/eplugin/exchange-config-listener.c
index c460c41..37273e2 100644
--- a/eplugin/exchange-config-listener.c
+++ b/eplugin/exchange-config-listener.c
@@ -647,7 +647,6 @@ change_passwd_cb (GtkWidget *button, ExchangeAccount *account)
 static void
 display_passwd_expiry_message (gint max_passwd_age, ExchangeAccount *account)
 {
-	GtkResponseType response;
 	GtkWidget *passwd_exp_dialog;
 	GtkWidget *dialog_vbox1;
 	GtkWidget *dialog_action_area1;
@@ -700,7 +699,7 @@ display_passwd_expiry_message (gint max_passwd_age, ExchangeAccount *account)
 			  G_CALLBACK (change_passwd_cb),
 			  account);
 #endif
-	response = gtk_dialog_run (GTK_DIALOG (passwd_exp_dialog));
+	gtk_dialog_run (GTK_DIALOG (passwd_exp_dialog));
 
 	gtk_widget_destroy (passwd_exp_dialog);
 	g_free (passwd_expiry_msg);
diff --git a/eplugin/exchange-contacts.c b/eplugin/exchange-contacts.c
index baa1d37..a0f159e 100644
--- a/eplugin/exchange-contacts.c
+++ b/eplugin/exchange-contacts.c
@@ -342,7 +342,6 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 		GConfClient *client;
 		ESourceList *source_list = NULL;
 		ESourceGroup *source_group = NULL;
-		ESource *source;
 		EAccount *eaccount;
 
 		/* GAL folder */
@@ -355,7 +354,6 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 		g_return_val_if_fail (eaccount->uid != NULL, FALSE);
 
 		if ((source_group = e_source_list_peek_group_by_properties (source_list, "account-uid", eaccount->uid, NULL))) {
-			source =  e_source_group_peek_source_by_name (source_group, e_source_peek_name (t->source));
 			if (e_source_group_peek_source_by_name (source_group,
 							e_source_peek_name (t->source))) {
 				/* not a rename of GAL */
diff --git a/eplugin/exchange-delegates.c b/eplugin/exchange-delegates.c
index 37f6f77..9ca718b 100644
--- a/eplugin/exchange-delegates.c
+++ b/eplugin/exchange-delegates.c
@@ -513,7 +513,6 @@ email_look_up (const gchar *delegate_legacy, ExchangeAccount *account)
 {
 	E2kGlobalCatalog *gc;
 	E2kGlobalCatalogEntry *entry;
-	E2kGlobalCatalogStatus status;
 
 	const gchar *email_id;
 
@@ -522,9 +521,9 @@ email_look_up (const gchar *delegate_legacy, ExchangeAccount *account)
 	if (!gc)
 		return NULL;
 
-	status = e2k_global_catalog_lookup (
-			gc, NULL, E2K_GLOBAL_CATALOG_LOOKUP_BY_LEGACY_EXCHANGE_DN,
-			delegate_legacy, 0, &entry);
+	e2k_global_catalog_lookup (
+		gc, NULL, E2K_GLOBAL_CATALOG_LOOKUP_BY_LEGACY_EXCHANGE_DN,
+		delegate_legacy, 0, &entry);
 
 	email_id = g_strdup (entry->email);
 	e2k_global_catalog_entry_free (gc, entry);
diff --git a/eplugin/exchange-send-options.c b/eplugin/exchange-send-options.c
index 50b440d..b4de58b 100644
--- a/eplugin/exchange-send-options.c
+++ b/eplugin/exchange-send-options.c
@@ -248,11 +248,9 @@ delegate_option_toggled (GtkCheckButton *button, gpointer func_data)
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptionsDialog *sod;
 	ENameSelectorEntry *name_selector_entry;
-	ExchangeSendOptions *options;
 
 	sod=func_data;
 	priv=sod->priv;
-	options=sod->options;
 
 	name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User");
 
diff --git a/server/lib/e2k-autoconfig.c b/server/lib/e2k-autoconfig.c
index 9af274f..4ff8215 100644
--- a/server/lib/e2k-autoconfig.c
+++ b/server/lib/e2k-autoconfig.c
@@ -1479,7 +1479,7 @@ validate (const gchar *owa_url, gchar *user, gchar *password, ExchangeParams *ex
 	E2kOperation op;        /* FIXME */
 	E2kUri *euri;
 	gboolean valid = FALSE;
-	const gchar *old, *new;
+	/* const gchar *old, *new; */
 	gchar *path, *mailbox;
 
 	ac = e2k_autoconfig_new (owa_url, user, password,
@@ -1561,13 +1561,13 @@ validate (const gchar *owa_url, gchar *user, gchar *password, ExchangeParams *ex
 		switch (*result) {
 
 		case E2K_AUTOCONFIG_CANT_CONNECT:
-			if (!strncmp (ac->owa_uri, "http:", 5)) {
+			/* if (!strncmp (ac->owa_uri, "http:", 5)) {
 				old = "http";
 				new = "https";
 			} else {
 				old = "https";
 				new = "http";
-			}
+			} */
 
 			/* SURF : e_notice (NULL, GTK_MESSAGE_ERROR,
 				  _("Could not connect to the Exchange "
diff --git a/server/lib/e2k-result.c b/server/lib/e2k-result.c
index 12be98a..d7ceb31 100644
--- a/server/lib/e2k-result.c
+++ b/server/lib/e2k-result.c
@@ -223,7 +223,7 @@ sanitize_bad_multistatus (const gchar *buf, gint len)
 {
 	GString *body;
 	const gchar *p;
-	gint start, end;
+	gint start;
 	gchar ns, badprop[7], *ret;
 
 	/* If there are no "mapi/id/{...}" namespace declarations, then
@@ -241,7 +241,6 @@ sanitize_bad_multistatus (const gchar *buf, gint len)
 
 	p = strchr (p, '>');
 	g_return_val_if_fail (p != NULL, NULL);
-	end = p - body->str;
 
 	while (1) {
 		if (strncmp (body->str + start, "xmlns:", 6) != 0)
diff --git a/server/lib/e2k-utils.c b/server/lib/e2k-utils.c
index 126e0e2..8971207 100644
--- a/server/lib/e2k-utils.c
+++ b/server/lib/e2k-utils.c
@@ -238,7 +238,6 @@ e2k_lf_to_crlf (const gchar *in)
 gchar *
 e2k_crlf_to_lf (const gchar *in)
 {
-	gint len;
 	const gchar *s;
 	gchar *out;
 	GString *str;
@@ -247,7 +246,6 @@ e2k_crlf_to_lf (const gchar *in)
 
 	str = g_string_new ("");
 
-	len = strlen (in);
 	for (s = in; *s; s++) {
 		if (*s != '\r')
 			str = g_string_append_c (str, *s);
diff --git a/server/storage/e-folder-type-registry.c b/server/storage/e-folder-type-registry.c
index 8f3f03a..cb3d2e5 100644
--- a/server/storage/e-folder-type-registry.c
+++ b/server/storage/e-folder-type-registry.c
@@ -142,11 +142,8 @@ set_handler (EFolderTypeRegistry *folder_type_registry,
 	     const gchar *name,
 	     GObject *handler)
 {
-	EFolderTypeRegistryPrivate *priv;
 	FolderType *folder_type;
 
-	priv = folder_type_registry->priv;
-
 	folder_type = get_folder_type (folder_type_registry, name);
 	if (folder_type == NULL)
 		return FALSE;
@@ -251,13 +248,9 @@ gboolean
 e_folder_type_registry_type_registered  (EFolderTypeRegistry *folder_type_registry,
 					 const gchar *type_name)
 {
-	EFolderTypeRegistryPrivate *priv;
-
 	g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), FALSE);
 	g_return_val_if_fail (type_name != NULL, FALSE);
 
-	priv = folder_type_registry->priv;
-
 	if (get_folder_type (folder_type_registry, type_name) == NULL)
 		return FALSE;
 
diff --git a/server/storage/exchange-hierarchy-webdav.c b/server/storage/exchange-hierarchy-webdav.c
index e53c17e..4f2eb84 100644
--- a/server/storage/exchange-hierarchy-webdav.c
+++ b/server/storage/exchange-hierarchy-webdav.c
@@ -698,7 +698,7 @@ scan_subtree (ExchangeHierarchy *hier, EFolder *parent, gint mode)
 	E2kResultIter *iter;
 	E2kResult *result;
 	E2kHTTPStatus status;
-	EFolder *folder, *tmp;
+	EFolder *folder;
 	GPtrArray *folders;
 	gint i;
 	gdouble fsize_d = 0.0;
@@ -717,7 +717,6 @@ scan_subtree (ExchangeHierarchy *hier, EFolder *parent, gint mode)
 		folders = g_ptr_array_new ();
 		exchange_hierarchy_webdav_offline_scan_subtree (EXCHANGE_HIERARCHY (hier), add_folders, folders);
 		for (i = 0; i <folders->len; i++) {
-			tmp = (EFolder *)folders->pdata[i];
 			exchange_hierarchy_new_folder (hier, (EFolder *)folders->pdata[i]);
 		}
 		return EXCHANGE_ACCOUNT_FOLDER_OK;
diff --git a/server/xntlm/xntlm-md4.c b/server/xntlm/xntlm-md4.c
index a71d0d5..f20399a 100644
--- a/server/xntlm/xntlm-md4.c
+++ b/server/xntlm/xntlm-md4.c
@@ -124,10 +124,9 @@ xntlm_md4sum (const guchar *in, gint nbytes, guchar digest[16])
 	guchar M[128];
 	guint32 A, B, C, D;
 	gint pbytes, nbits = nbytes * 8, remaining_bytes;
-	gint total_len, offset;
+	gint offset;
 
 	pbytes = (120 - (nbytes % 64)) % 64;
-	total_len = nbytes + pbytes + 8;
 
 	A = 0x67452301;
 	B = 0xEFCDAB89;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]