Make this place a bit more quiet

svn path=/trunk/; revision=31328

6 files changed, 14 insertions, 24 deletions

diff --git a/plugins/exchange-operations/.cvsignore b/plugins/exchange-operations/.cvsignore
new file mode 100644
index 0000000000..d436efd0f7
--- /dev/null
+++ b/plugins/exchange-operations/.cvsignore
@@ -0,0 +1,3 @@
+Makefile.in
+Makefile
+
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index c61174fd42..edb73c87ab 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -192,8 +192,10 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	GtkFrame *frm_auth;
 	GtkVBox *vbox_auth;
 	GtkTable *tbl_auth;
+#ifdef HAVE_KRB5
 	GtkLabel *lbl_chpass;
 	GtkButton *btn_chpass;
+#endif
 	GtkLabel *lbl_dass;
 	GtkButton *btn_dass;
 	
@@ -371,27 +373,15 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 static void
 print_error (const char *owa_url, E2kAutoconfigResult result)
 {
-	char *old, *new;
-
 	switch (result) {
 
 		case E2K_AUTOCONFIG_CANT_CONNECT:
-			if (!strncmp (owa_url, "http:", 5)) {
-				old = "http";
-				new = "https";
-			} else {
-				old = "https";
-				new = "http";
-			}
-
 			e_error_run (NULL, ERROR_DOMAIN ":account-connect-error", "", NULL);
-			
 			break;
 
 		case E2K_AUTOCONFIG_CANT_RESOLVE:
-
 			e_error_run (NULL, ERROR_DOMAIN ":account-resolve-error", "", NULL);
-				break;
+			break;
 
 		case E2K_AUTOCONFIG_AUTH_ERROR:
 		case E2K_AUTOCONFIG_AUTH_ERROR_TRY_NTLM:
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 0570ea6704..875a0d13ee 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -661,7 +661,10 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 {
 	ExchangeConfigListenerPrivate *priv;
 	ExchangeAccountResult result;
-	char *key, *password, *title, *new_password, *url_string;
+	char *key, *password, *title, *url_string;
+#ifdef HAVE_KRB5
+	char *new_password;
+#endif
 	gboolean oldremember, remember = FALSE;
 	CamelURL *camel_url;
 	const char *remember_password;
@@ -717,7 +720,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 		 result == EXCHANGE_ACCOUNT_QUOTA_SEND_ERROR ||
 		 result == EXCHANGE_ACCOUNT_QUOTA_WARN) {
 		gchar *current_quota_usage = NULL;
-		const char *error_code;
+		const char *error_code = NULL;
 		GtkWidget *widget;
 
 		switch (result) {
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index be143ff853..fc1de553db 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -645,7 +645,8 @@ delegates_apply (ExchangeDelegates *delegates)
 	GByteArray *entryid_dup;
 	char *error = NULL;
 	E2kProperties *props;
-	int i, status;
+	int i;
+	E2kGlobalCatalogStatus status;
 
 	if (!delegates->loaded_folders)
 		return;
@@ -681,11 +682,8 @@ delegates_apply (ExchangeDelegates *delegates)
 	}
 
 	if ((delegates->removed_users || delegates->added_users) && !delegates->self_dn) {
-		E2kGlobalCatalog *gc;
-		E2kGlobalCatalogStatus status;
 		E2kGlobalCatalogEntry *entry;
 
-		gc = exchange_account_get_global_catalog (delegates->account);
 		status = e2k_global_catalog_lookup (
 			gc, NULL, /* FIXME: cancellable */
 			E2K_GLOBAL_CATALOG_LOOKUP_BY_LEGACY_EXCHANGE_DN,
diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c
index 494fe5ef7c..53927176a2 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.c
+++ b/plugins/exchange-operations/exchange-folder-size-display.c
@@ -114,7 +114,6 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
         GtkWidget *dialog, *table;
 	GList *l;
 	char *col_name;
-        int response;
 
 	printf ("exchange_folder_size_display called\n");
         g_return_if_fail (GTK_IS_WIDGET (parent));
@@ -151,6 +150,6 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
                                      column);
         gtk_tree_view_set_model (GTK_TREE_VIEW (table),
                                  GTK_TREE_MODEL (model));
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_dialog_run (GTK_DIALOG (dialog));
         gtk_widget_destroy (dialog);
 }
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index 4a22ffd043..e0d5a1d459 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -335,13 +335,10 @@ unsubscribe_dialog_ab_response (GtkDialog *dialog, int response, gpointer data)
 		gchar *path = NULL;
 		gchar *uri = NULL;
 		const char *source_uid = NULL;
-		GConfClient *client;
 		ESourceGroup *source_group = NULL;
 		ESource *source = NULL;
 		EABPopupTargetSource *target = data;
 
-		client = gconf_client_get_default ();
-
 		account = exchange_operations_get_exchange_account ();
 
 		if (!account)