Make this place a bit more quiet

svn path=/trunk/; revision=31328

6 files changed, 18 insertions, 25 deletions

diff --git a/plugins/groupwise-features/.cvsignore b/plugins/groupwise-features/.cvsignore
new file mode 100644
index 0000000000..2a782dc66a
--- /dev/null
+++ b/plugins/groupwise-features/.cvsignore
@@ -0,0 +1,3 @@
+Makefile.in
+Makefile
+*.eplug
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 40ae0a26d5..0c944458a5 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -154,7 +154,7 @@ accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg)
 {
 	EMFolderTreeModel *model;
 	EMFolderTree *folder_tree;
-	GtkWidget *dialog ;
+	GtkWidget *dialog;
 	struct AcceptData *accept_data; 
 	char *uri;
 
@@ -186,18 +186,15 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 	GtkWidget *window;
 	GnomeDruid *wizard;
 	GnomeDruidPageEdge *title_page;
-	CamelMimeMessage *msg = (CamelMimeMessage *) target->message ;
-	CamelStreamMem *content ;
+	CamelMimeMessage *msg = (CamelMimeMessage *) target->message;
+	CamelStreamMem *content;
 	CamelDataWrapper *dw;
-	CamelMimePart *mime_part ;
-	char *notification;
 	char *start_message;
 
 	if (!msg)
-		return ;
+		return;
 
-	mime_part = CAMEL_MIME_PART(msg) ;
-	if ((notification = (char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
+	if (((char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
 	    || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL
 	    || !camel_internet_address_get(from_addr, 0, &name, &email)
 	    || (dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg))) == NULL) {
@@ -210,7 +207,7 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 		}
 
 		content = (CamelStreamMem *)camel_stream_mem_new();
-		camel_data_wrapper_write_to_stream(dw, (CamelStream *)content) ;
+		camel_data_wrapper_write_to_stream(dw, (CamelStream *)content);
 		camel_stream_write((CamelStream *)content, "", 1);
 
 		from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message);
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 90ea657cf2..2575addc72 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -375,7 +375,6 @@ static void
 junk_settings_construct (JunkSettings *js)
 {
 	GladeXML *xml;
-	GtkWidget *box;
 	char *gladefile;
 
 	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
@@ -408,7 +407,6 @@ junk_settings_construct (JunkSettings *js)
 
 	js->entry = GTK_ENTRY (glade_xml_get_widget (js->xml, "entry4"));
 		/*TODO:connect entry and label*/
-	box = GTK_WIDGET (glade_xml_get_widget (js->xml, "hbox227"));
 	gtk_widget_show ((GtkWidget *) js->entry);
 
 	js->scrolled_window = GTK_WIDGET (glade_xml_get_widget (js->xml,"scrolledwindow4"));
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 8522a550e8..22d656b2f2 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -76,7 +76,7 @@
 
 static GObjectClass *parent_class = NULL;
 
-static int proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account);
+static gboolean proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account);
 
 struct _proxyDialogPrivate {
 	/* Glade XML data for the Add/Edit Proxy dialog*/
@@ -707,7 +707,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 		gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new("Proxy"));
 		g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account);
 		pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog);
-		g_object_set_data ((GObject *) account, "proxy_tab_num", pag_num);
+		g_object_set_data ((GObject *) account, "proxy_tab_num", GINT_TO_POINTER (pag_num));
 		gtk_widget_show_all (priv->tab_dialog);
 	}  else if (!g_strrstr (e_account_get_string(account, E_ACCOUNT_SOURCE_URL), "groupwise://")) {
 		prd = g_object_get_data ((GObject *) account, "prd");
@@ -727,7 +727,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 	return NULL;
 }
 
-static int
+static gboolean
 proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account)
 {
 	proxyDialog *prd;
@@ -736,16 +736,16 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EA
 	prd = g_object_get_data ((GObject *) account, "prd");
 
 	if (!prd || !prd->priv)
-		return;
+		return TRUE;
 	
 	priv = prd->priv;
 
-	if (num == g_object_get_data ((GObject *) account, "proxy_tab_num") && account->enabled) {
+	if (g_object_get_data ((GObject *) account, "proxy_tab_num") && account->enabled) {
 		if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK) 
-				return NULL;
+				return FALSE;
 		proxy_update_tree_view (account);	
 	}
-	return TRUE;
+	return FALSE;
 }
 
 static void
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index 3eb9dec8bf..527311a0c2 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -250,10 +250,6 @@ send_options_finalize ()
 static void 
 e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGeneral *ggopts)
 {
-	time_t temp;
-
-	temp = time (NULL);
-
 	ggopts->priority = gopts->priority;
 
 	ggopts->reply_enabled = gopts->reply_enabled;
@@ -498,7 +494,7 @@ add_send_options_to_source (EGwSendOptions *n_opts)
 	ESource *csource, *tsource;
 	ESourceList *list;
 	EGwSendOptionsGeneral *gopts;
-	EGwSendOptionsStatusTracking *topts, *mopts, *copts;
+	EGwSendOptionsStatusTracking *topts, *copts;
 
 	list = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources");
 	csource = get_source (list);
@@ -507,7 +503,6 @@ add_send_options_to_source (EGwSendOptions *n_opts)
 	tsource = get_source (list);
 	
 	gopts = e_gw_sendoptions_get_general_options (n_opts);
-	mopts = e_gw_sendoptions_get_status_tracking_options (n_opts, "mail");
 	copts = e_gw_sendoptions_get_status_tracking_options (n_opts, "calendar");
 	topts = e_gw_sendoptions_get_status_tracking_options (n_opts, "task");
 
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 0db7f629b6..1a9ef868d3 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -63,7 +63,7 @@ add_detail (GtkTable *table, char *label, char *value, int row)
 
 	time = e_gw_connection_get_date_from_string (value);
 	actual_time = camel_header_decode_date (ctime(&time), NULL);
-	*str = ctime (&actual_time);
+	str = ctime (&actual_time);
 
 	str [strlen(str)-1] = '\0';