diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-15 11:39:43 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-15 11:39:43 +0800 |
| commit | 2e3a3cf26e4d1894707703b15340529b8874466c (patch) | |
| tree | 880b18c84f6568e805b161d69a80037b251c766c /mail/em-folder-view.c | |
| parent | 7ed2b90bdad0637d72be1815e6634bb352d0ec08 (diff) | |
| download | gsoc2013-evolution-2e3a3cf26e4d1894707703b15340529b8874466c.tar gsoc2013-evolution-2e3a3cf26e4d1894707703b15340529b8874466c.tar.gz gsoc2013-evolution-2e3a3cf26e4d1894707703b15340529b8874466c.tar.bz2 gsoc2013-evolution-2e3a3cf26e4d1894707703b15340529b8874466c.tar.lz gsoc2013-evolution-2e3a3cf26e4d1894707703b15340529b8874466c.tar.xz gsoc2013-evolution-2e3a3cf26e4d1894707703b15340529b8874466c.tar.zst gsoc2013-evolution-2e3a3cf26e4d1894707703b15340529b8874466c.zip | |
Merge revisions 37047:37074 from trunk.
svn path=/branches/kill-bonobo/; revision=37075
Diffstat (limited to 'mail/em-folder-view.c')
| -rw-r--r-- | mail/em-folder-view.c | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 6cf21f3a94..30309df598 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -1675,37 +1675,6 @@ emfv_popup_menu (GtkWidget *widget) // } //} -static gchar * -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, "&", 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, "&", 5) == 0) - i += 4; - } - buff [j] = 0; - - return buff; -} - static void emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data) { @@ -1713,7 +1682,7 @@ emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data) struct _EMFolderViewPrivate *p = emfv->priv; g_free(p->selection_uri); - p->selection_uri = url_unescape_amp(pitem->user_data); + p->selection_uri = em_utils_url_unescape_amp(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()); |