Merge revisions 36737:36810 from trunk.

svn path=/branches/kill-bonobo/; revision=36811

15 files changed, 118 insertions, 19 deletions

diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 785857400a..0d526d6245 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-22  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #557246
+
+	* exchange-folder.c: (org_gnome_exchange_check_inbox_subscribed): Pop 
+	up the "Unsubscribe Folder" option only for the subscribed folders and 
+	not to the Other's folder hierarchy.
+
 2008-10-08  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #530606
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index 3f2dc421fc..b2b53d1bb3 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -223,7 +223,7 @@ org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *tar
 
 	g_free (path);
 
-	if (!sub_folder)
+	if (!sub_folder || !g_strrstr(sub_folder, "/"))
 		return;
 
         for (i = 0; i < sizeof (popup_inbox_items) / sizeof (popup_inbox_items[0]); i++)
diff --git a/plugins/folder-unsubscribe/ChangeLog b/plugins/folder-unsubscribe/ChangeLog
index c58c840d45..fd8eb19b43 100644
--- a/plugins/folder-unsubscribe/ChangeLog
+++ b/plugins/folder-unsubscribe/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-23  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #552850
+
+	* org-gnome-mail-folder-unsubscribe.eplug.xml:
+	Prefer the term "side bar" over "folder tree".
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
index 6452504f95..44cf7af61f 100644
--- a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
+++ b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
@@ -6,7 +6,7 @@
 		domain="@GETTEXT_PACKAGE@"
 		_name="Unsubscribe Folders"
 		location="@PLUGINDIR@/liborg-gnome-mail-folder-unsubscribe@SOEXT@">
-		<_description>Allows unsubscribing of mail folders in the folder tree context menu.</_description>
+		<_description>Allows unsubscribing of mail folders in the side bar context menu.</_description>
 		<author name="Jeffrey Stedfast" email="fejj@novell.com"/>
 
 		<hook class="org.gnome.evolution.mail.popup:1.0">
diff --git a/plugins/google-account-setup/ChangeLog b/plugins/google-account-setup/ChangeLog
index 84badcf745..a59a5aad19 100644
--- a/plugins/google-account-setup/ChangeLog
+++ b/plugins/google-account-setup/ChangeLog
@@ -1,3 +1,18 @@
+2008-11-07  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fix for bug #559518
+
+	* google-source.c: (retrieve_list_clicked),
+	(retrieve_list_sensitize), (plugin_google): Desensitizes the button 
+	when the username field is blank.
+
+2008-11-06  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #557726
+
+	* google-contacts-source.c: (destroy_ui_data),
+	(plugin_google_contacts): Destroy the widgets created by this group.
+
 2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
 
 	** Fixes bug #553479
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
index 3220933098..b33ac86856 100644
--- a/plugins/google-account-setup/google-contacts-source.c
+++ b/plugins/google-account-setup/google-contacts-source.c
@@ -218,6 +218,12 @@ on_interval_combo_changed (GtkComboBox *combo, gpointer user_data)
     g_free (value_string);
 }
 
+static void
+destroy_ui_data(gpointer data)
+{
+	gtk_widget_destroy((GtkWidget *)data);
+}
+
 GtkWidget *
 plugin_google_contacts (EPlugin                    *epl,
                         EConfigHookItemFactoryData *data)
@@ -254,6 +260,9 @@ plugin_google_contacts (EPlugin                    *epl,
 
     base_uri = e_source_group_peek_base_uri (group);
 
+    g_object_set_data_full (G_OBJECT (epl), "widget", NULL,
+			(GDestroyNotify)gtk_widget_destroy);
+
     if (strcmp (base_uri, "google://")) {
         return NULL;
     }
@@ -337,6 +346,9 @@ plugin_google_contacts (EPlugin                    *epl,
 
     g_object_set_data (G_OBJECT (interval_sb), "interval-combo", interval_combo);
     g_object_set_data (G_OBJECT (interval_combo), "interval-sb", interval_sb);
+
+    g_object_set_data_full(G_OBJECT(epl), "widget", vbox2,
+			destroy_ui_data);
     g_signal_connect (G_OBJECT (username_entry), "changed",
                       G_CALLBACK (on_username_entry_changed),
                       source);
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index 772d8a771a..dd86d1723b 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -435,10 +435,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 	g_return_if_fail (source != NULL);
 
 	username = e_source_get_property (source, "username");
-	if (!username || !*username) {
-		claim_error (parent, _("Please enter user name first."));
-		return;
-	}
+	g_return_if_fail (username != NULL && *username != '\0');
 
 	tmp = g_strdup_printf (_("Enter password for user %s to access list of subscribed calendars."), username);
 	password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp, 
@@ -553,6 +550,18 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 	g_object_unref (service);
 }
 
+static void
+retrieve_list_sensitize (GtkEntry *username_entry,
+                         GtkWidget *button)
+{
+	const gchar *text;
+	gboolean sensitive;
+
+	text = gtk_entry_get_text (username_entry);
+	sensitive = (text != NULL && *text != '\0');
+	gtk_widget_set_sensitive (button, sensitive);
+}
+
 GtkWidget *
 plugin_google  (EPlugin                    *epl,
 	     EConfigHookItemFactoryData *data)
@@ -727,8 +736,10 @@ plugin_google  (EPlugin                    *epl,
 	gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
 	label = gtk_button_new_with_mnemonic (_("Retrieve _list"));
 	g_signal_connect (label, "clicked", G_CALLBACK (retrieve_list_clicked), combo);
+	g_signal_connect (user, "changed", G_CALLBACK (retrieve_list_sensitize), label);
 	g_object_set_data (G_OBJECT (label), "ESource", source);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+	gtk_widget_set_sensitive (label, FALSE);
 
 	gtk_widget_show_all (hbox);
 	gtk_table_attach (GTK_TABLE (parent), hbox, 1, 2, row + 4, row + 5, GTK_FILL | GTK_EXPAND, 0, 0, 0);
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 8674762787..474e27d7ec 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-11  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #440646 (bugzilla.novell.com)
+
+	* camel-gw-listener.c (add_proxy_sources): Set the ESource color-spec 
+	for proxy accounts in the correct format. 
+
 2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
 
 	** Fix for bug #553148
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index fa46d8d973..0cee4317a7 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -559,7 +559,7 @@ add_proxy_sources (GwAccountInfo *info, const char *parent_name)
 
 	url = camel_url_new (info->source_url, NULL);
 
-	color = g_strdup_printf ("%u",  g_random_int_range (0x100000, 0xffffaa));
+	color = g_strdup_printf ("#%06X",  g_random_int_range (0x100000, 0xffffaa));
 	/* The above range is chosen so that the colors are neither too light nor too dark
 	and appealing in all the themes */
 
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 9f9161496f..1fb67ff518 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-20  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug bnc #446286
+
+	* status-track.c: (track_status): Remove the header check as we do a 
+	e_gw_connection_get_item for tracking the status.
+
 2008-11-04  Sankar P  <psankar@novell.com>
 
 	** Fix for bug bnc #434968
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index cb9e0d8028..65b66962c5 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -79,8 +79,6 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 
 	gchar *boldmsg;
 
-	const char *status = NULL ;
-
 	int row = 0;
 
 	EGwConnection *cnc;
@@ -93,14 +91,6 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 		return ;
 	}
 
-	status = camel_medium_get_header ( CAMEL_MEDIUM(msg), "X-gw-status-opt") ;
-	if (!status) {
-		g_print ("Error!! No header\n");
-		/* No need to make any call if this header is not available.
-		This is the server side identifier for sent-items */
-		return ;
-	}
-
 	/*Create the dialog*/
 	d = (GtkDialog *) gtk_dialog_new ();
 	gtk_dialog_add_button (d, GTK_STOCK_OK, GTK_RESPONSE_OK);
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index f408872cdc..966cc611e7 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-06  Patrick Ohly  <patrick.ohly@gmx.de>
+
+	** Fix for bug #541121
+
+	* itip-formatter.c: don't allow sending a response to meeting
+	invitation replies
+
 2008-10-20  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #514989
@@ -18,7 +25,7 @@
 	* itip-formatter.c: (view_response_cb):
 	Use the proper functions to traverse messages in a folder's summary.
 
-2008-10-10  Patrick Ohly  <pohly@ecld0pohly>
+2008-10-10  Patrick Ohly  <patrick.ohly@gmx.de>
 
 	** #541121: improved itip formatter: allow replying to forwarded
 	and already imported invitations; honor RVSP flag in invitation
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index a2ceffb77b..ae7190174b 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -686,9 +686,12 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 		
 		/*
 		 * Only allow replies if backend doesn't do that automatically.
+                 * Only enable it for forwarded invitiations (PUBLISH) or direct
+                 * invitiations (REQUEST), but not replies (REPLY).
 		 * Replies only make sense for events with an organizer.
 		 */
 		if (!e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_SAVE_SCHEDULES) &&
+                    (pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST) &&
 		    pitip->has_organizer) {
 			rsvp_enabled = TRUE;
 		}
diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog
index 3e489aca96..96c5abc9e4 100644
--- a/plugins/mail-notification/ChangeLog
+++ b/plugins/mail-notification/ChangeLog
@@ -1,3 +1,14 @@
+2008-11-19  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* mail-notification.c: Fix compilation error.
+
+2008-11-19  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for BNC bug #434320
+
+	* plugins/mail-notification/mail-notification.c: When the popup is
+	clicked close the status icon.
+
 2008-09-16  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index f3da922a79..a501d99bb1 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -56,6 +56,7 @@
 
 static gboolean enabled = FALSE;
 static GtkWidget *get_cfg_widget (void);
+static GStaticMutex mlock = G_STATIC_MUTEX_INIT;
 
 /**
  * each part should "implement" its own "public" functions:
@@ -441,6 +442,26 @@ popup_menu_status (GtkStatusIcon *status_icon, guint button, guint activate_time
 	g_object_unref (menu);
 }
 
+#ifdef HAVE_LIBNOTIFY
+static void 
+notifyActionCallback (NotifyNotification *n, gchar *label, gpointer a)
+{
+	g_static_mutex_lock (&mlock);
+	
+	gtk_status_icon_set_visible (status_icon, FALSE);
+	g_object_unref (status_icon);
+
+	if (blink_timeout_id) {
+		g_source_remove (blink_timeout_id);
+		blink_timeout_id = 0;
+	}
+
+	status_icon = NULL;
+	status_count = 0;	
+	g_static_mutex_unlock (&mlock);
+}
+#endif
+
 static void
 new_notify_status (EMEventTargetFolder *t)
 {
@@ -487,6 +508,7 @@ new_notify_status (EMEventTargetFolder *t)
 
 			notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
 			notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
+			notify_notification_add_action(notify, "default", "Default", notifyActionCallback, NULL, NULL);
 			g_timeout_add (500, notification_callback, notify);
 		}
 	}
@@ -835,7 +857,6 @@ void org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t);
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
 GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl);
 
-static GStaticMutex mlock = G_STATIC_MUTEX_INIT;
 
 void
 org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)