remove pidgin_make_pretty_arrows and use the unicode arrows in the actual text

4 files changed, 12 insertions, 42 deletions

diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
index c89cd83eb2..36246fb368 100644
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -2289,7 +2289,7 @@ create_accounts_list(AccountsWindow *dialog)
 	GtkWidget *treeview;
 	GtkTreeSelection *sel;
 	GtkTargetEntry gte[] = {{"PURPLE_ACCOUNT", GTK_TARGET_SAME_APP, 0}};
-	char *pretty, *tmp;
+	gchar *text;
 
 	frame = gtk_frame_new(NULL);
 	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
@@ -2301,8 +2301,8 @@ create_accounts_list(AccountsWindow *dialog)
 
 	/* Create a helpful first-time-use label */
 	label = gtk_label_new(NULL);
-	/* Translators: Please maintain the use of -> or <- to represent the menu heirarchy */
-	tmp = g_strdup_printf(_(
+	/* Translators: Please maintain the use of ⇦ or ⇨ to represent the menu hierarchy */
+	text = g_strdup_printf(_(
 						 "<span size='larger' weight='bold'>Welcome to %s!</span>\n\n"
 
 						 "You have no IM accounts configured. To start connecting with %s "
@@ -2311,12 +2311,10 @@ create_accounts_list(AccountsWindow *dialog)
 						 "press <b>Add...</b> again to configure them all.\n\n"
 
 						 "You can come back to this window to add, edit, or remove "
-						 "accounts from <b>Accounts->Manage Accounts</b> in the Buddy "
+						 "accounts from <b>Accounts⇨Manage Accounts</b> in the Buddy "
 						 "List window"), PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME);
-	pretty = pidgin_make_pretty_arrows(tmp);
-	g_free(tmp);
-	gtk_label_set_markup(GTK_LABEL(label), pretty);
-	g_free(pretty);
+	gtk_label_set_markup(GTK_LABEL(label), text);
+	g_free(text);
 
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_widget_show(label);
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index 10a17f33a5..58cda51082 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -5726,7 +5726,7 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 	GtkWidget *content_area;
 	GtkWidget *label;
 	GtkWidget *close;
-	char *pretty, *tmp;
+	gchar *text;
 	const char *theme_name;
 	GtkActionGroup *action_group;
 	GError *error;
@@ -5830,20 +5830,18 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 	gtk_notebook_append_page(GTK_NOTEBOOK(gtkblist->notebook), kiosk_page(), NULL);
 #endif
 
-	/* Translators: Please maintain the use of -> and <- to refer to menu heirarchy */
-	tmp = g_strdup_printf(_("<span weight='bold' size='larger'>Welcome to %s!</span>\n\n"
+	/* Translators: Please maintain the use of ⇦ or ⇨ to refer to menu hierarchy */
+	text = g_strdup_printf(_("<span weight='bold' size='larger'>Welcome to %s!</span>\n\n"
 
 					       "You have no accounts enabled. Enable your IM accounts from the "
-					       "<b>Accounts</b> window at <b>Accounts->Manage Accounts</b>. Once you "
+					       "<b>Accounts</b> window at <b>Accounts⇨Manage Accounts</b>. Once you "
 					       "enable accounts, you'll be able to sign on, set your status, "
 					       "and talk to your friends."), PIDGIN_NAME);
-	pretty = pidgin_make_pretty_arrows(tmp);
-	g_free(tmp);
 	label = gtk_label_new(NULL);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_label_set_yalign(GTK_LABEL(label), 0.2);
-	gtk_label_set_markup(GTK_LABEL(label), pretty);
-	g_free(pretty);
+	gtk_label_set_markup(GTK_LABEL(label), text);
+	g_free(text);
 	gtk_notebook_append_page(GTK_NOTEBOOK(gtkblist->notebook),label, NULL);
 	gtkblist->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_notebook_append_page(GTK_NOTEBOOK(gtkblist->notebook), gtkblist->vbox, NULL);
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index 164892bce9..3a12ac58db 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -2462,21 +2462,6 @@ pidgin_convert_buddy_icon(PurpleProtocol *protocol, const char *path, size_t *le
 	return NULL;
 }
 
-char *pidgin_make_pretty_arrows(const char *str)
-{
-	char *ret;
-	char **split = g_strsplit(str, "->", -1);
-	ret = g_strjoinv("\342\207\250", split);
-	g_strfreev(split);
-
-	split = g_strsplit(ret, "<-", -1);
-	g_free(ret);
-	ret = g_strjoinv("\342\207\246", split);
-	g_strfreev(split);
-
-	return ret;
-}
-
 void pidgin_set_urgent(GtkWindow *window, gboolean urgent)
 {
 #if defined _WIN32
diff --git a/pidgin/gtkutils.h b/pidgin/gtkutils.h
index 9df86e5447..743f0bbfe3 100644
--- a/pidgin/gtkutils.h
+++ b/pidgin/gtkutils.h
@@ -617,17 +617,6 @@ GtkWidget *pidgin_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(cons
 gpointer pidgin_convert_buddy_icon(PurpleProtocol *protocol, const char *path, size_t *len);
 
 /**
- * pidgin_make_pretty_arrows:
- * @str:      The text to convert
- *
- * Converts "->" and "<-" in strings to Unicode arrow characters, for use in referencing
- * menu items.
- *
- * Returns:         A newly allocated string with unicode arrow characters
- */
-char *pidgin_make_pretty_arrows(const char *str);
-
-/**
  * PidginUtilMiniDialogCallback:
  *
  * The type of callbacks passed to pidgin_make_mini_dialog().