evolution r37350 - trunk/mail

[tobiasmue svn gnome org]

Author: tobiasmue
Date: Mon Mar  2 01:34:54 2009
New Revision: 37350
URL: http://svn.gnome.org/viewvc/evolution?rev=37350&view=rev

Log:
2009-03-02  Matt McCutchen  <matt mattmccutchen net>

    * evolution/mail/em-folder-view.c:
    * evolution/mail/em-utils.c:
    * evolution/mail/em-utils.h:
    * evolution/mail/em-popup.c:
    Revert evolution revision 37063 (workaround for bug 563867).

    ** Part of the fix for bug #549838



Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-folder-view.c
   trunk/mail/em-popup.c
   trunk/mail/em-utils.c
   trunk/mail/em-utils.h

Modified: trunk/mail/em-folder-view.c
==============================================================================
--- trunk/mail/em-folder-view.c	(original)
+++ trunk/mail/em-folder-view.c	Mon Mar  2 01:34:54 2009
@@ -2746,7 +2746,7 @@
 	struct _EMFolderViewPrivate *p = emfv->priv;
 
 	g_free(p->selection_uri);
-	p->selection_uri = em_utils_url_unescape_amp(pitem->user_data);
+	p->selection_uri = g_strdup(pitem->user_data);
 
 	gtk_selection_owner_set(p->invisible, GDK_SELECTION_PRIMARY, gtk_get_current_event_time());
 	gtk_selection_owner_set(p->invisible, GDK_SELECTION_CLIPBOARD, gtk_get_current_event_time());

Modified: trunk/mail/em-popup.c
==============================================================================
--- trunk/mail/em-popup.c	(original)
+++ trunk/mail/em-popup.c	Mon Mar  2 01:34:54 2009
@@ -585,11 +585,9 @@
 emp_uri_popup_link_open(EPopup *ep, EPopupItem *item, void *data)
 {
 	EMPopupTargetURI *t = (EMPopupTargetURI *)ep->target;
-	gchar *unescaped_uri = em_utils_url_unescape_amp (t->uri);
 
 	/* FIXME Pass a parent window. */
-	e_show_uri (NULL, unescaped_uri);
-	g_free (unescaped_uri);
+	e_show_uri (NULL, t->uri);
 }
 
 static void

Modified: trunk/mail/em-utils.c
==============================================================================
--- trunk/mail/em-utils.c	(original)
+++ trunk/mail/em-utils.c	Mon Mar  2 01:34:54 2009
@@ -2427,34 +2427,3 @@
 		g_signal_connect(widget, "response", G_CALLBACK(error_response), NULL);
 	e_activity_handler_make_error (handler, "mail", E_LOG_WARNINGS, widget);
 }
-
-gchar *
-em_utils_url_unescape_amp (const gchar *url)
-{
-	gchar *buff;
-	int i, j, amps;
-
-	if (!url)
-		return NULL;
-
-	amps = 0;
-	for (i = 0; url [i]; i++) {
-		if (url [i] == '&' && strncmp (url + i, "&amp;", 5) == 0)
-			amps++;
-	}
-
-	buff = g_strdup (url);
-
-	if (!amps)
-		return buff;
-
-	for (i = 0, j = 0; url [i]; i++, j++) {
-		buff [j] = url [i];
-
-		if (url [i] == '&' && strncmp (url + i, "&amp;", 5) == 0)
-			i += 4;
-	}
-	buff [j] = 0;
-
-	return buff;
-}

Modified: trunk/mail/em-utils.h
==============================================================================
--- trunk/mail/em-utils.h	(original)
+++ trunk/mail/em-utils.h	Mon Mar  2 01:34:54 2009
@@ -117,9 +117,6 @@
 /* clears flag 'get_password_canceled' at every known accounts, so if needed, get_password will show dialog */
 void em_utils_clear_get_password_canceled_accounts_flag (void);
 
-/* Unescapes &amp; back to a real & in URIs */
-gchar *em_utils_url_unescape_amp (const gchar *url);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */