From 5cdd067dde50ed9083248a0f262167017b3742f5 Mon Sep 17 00:00:00 2001
From: Alan Fitton <alan@eth0.org.uk>
Date: Fri, 3 Aug 2012 18:30:23 +0100
Subject: issue 208 - escape URL for pango markup. issue 206 - minimize on tray
 click.

---
 src/trg-general-panel.c |  8 +++++---
 src/trg-main-window.c   | 41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/trg-general-panel.c b/src/trg-general-panel.c
index e91a837..79df46d 100644
--- a/src/trg-general-panel.c
+++ b/src/trg-general-panel.c
@@ -113,7 +113,7 @@ trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t,
     TrgGeneralPanelPrivate *priv;
     gchar buf[32];
     gint sizeOfBuf;
-    gchar *statusString, *fullStatusString, *completedAtString, *comment;
+    gchar *statusString, *fullStatusString, *completedAtString, *comment, *markup;
     const gchar *errorStr;
     gint64 eta, uploaded, haveValid, completedAt;
     GtkLabel *keyLabel;
@@ -180,14 +180,16 @@ trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t,
                        torrent_get_download_dir(t));
 
     comment = add_links_to_text(torrent_get_comment(t));
-    gtk_label_set_markup(GTK_LABEL(priv->gen_comment_label), comment);
+    markup = g_markup_printf_escaped("%s", comment);
+    gtk_label_set_markup(GTK_LABEL(priv->gen_comment_label), markup);
     g_free(comment);
+    g_free(markup);
 
     errorStr = torrent_get_errorstr(t);
     keyLabel =
         gen_panel_label_get_key_label(GTK_LABEL(priv->gen_error_label));
     if (strlen(errorStr) > 0) {
-        gchar *markup =
+        markup =
             g_markup_printf_escaped("<span fgcolor=\"red\">%s</span>",
                                     errorStr);
         gtk_label_set_markup(GTK_LABEL(priv->gen_error_label), markup);
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index 80de448..3020b3d 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -199,6 +199,7 @@ static gboolean torrent_tv_button_pressed_cb(GtkWidget * treeview,
                                              gpointer userdata);
 static gboolean torrent_tv_popup_menu_cb(GtkWidget * treeview,
                                          gpointer userdata);
+static void trg_main_window_set_hidden_to_tray(TrgMainWindow *win, gboolean hidden);
 static gboolean is_ready_for_torrent_action(TrgMainWindow * win);
 static gboolean window_state_event(TrgMainWindow * win,
                                    GdkEventWindowState * event,
@@ -247,6 +248,7 @@ struct _TrgMainWindowPrivate {
     GtkWidget *hpaned, *vpaned;
     GtkWidget *filterEntry;
 
+    gboolean hidden;
     gint width, height;
     guint timerId;
     guint sessionTimerId;
@@ -1792,16 +1794,13 @@ status_icon_activated(GtkStatusIcon * icon G_GNUC_UNUSED,
                       TrgMainWindow * win)
 {
     TrgMainWindowPrivate *priv = win->priv;
+    TrgPrefs *prefs = trg_client_get_prefs(priv->client);
 
-    gtk_window_deiconify(GTK_WINDOW(win));
-    gtk_window_present(GTK_WINDOW(win));
-
-    if (priv->timerId > 0) {
-        g_source_remove(priv->timerId);
-        dispatch_async(priv->client,
-                       torrent_get(TORRENT_GET_TAG_MODE_FULL),
-                       on_torrent_get_update, win);
-    }
+	trg_main_window_set_hidden_to_tray(win,
+			!priv->hidden
+					&& trg_prefs_get_bool(prefs,
+							TRG_PREFS_KEY_SYSTEM_TRAY_MINIMISE,
+							TRG_PREFS_GLOBAL));
 }
 
 static gboolean
@@ -2365,6 +2364,26 @@ torrent_tv_popup_menu_cb(GtkWidget * treeview, gpointer userdata)
     return TRUE;
 }
 
+static void trg_main_window_set_hidden_to_tray(TrgMainWindow *win, gboolean hidden) {
+
+	TrgMainWindowPrivate *priv = win->priv;
+
+	if (hidden) {
+		gtk_widget_hide(GTK_WIDGET(win));
+	} else {
+		gtk_window_deiconify(GTK_WINDOW(win) );
+		gtk_window_present(GTK_WINDOW(win) );
+
+		if (priv->timerId > 0) {
+			g_source_remove(priv->timerId);
+			dispatch_async(priv->client, torrent_get(TORRENT_GET_TAG_MODE_FULL),
+					on_torrent_get_update, win);
+		}
+	}
+
+	priv->hidden = hidden;
+}
+
 static gboolean
 window_state_event(TrgMainWindow * win,
                    GdkEventWindowState * event, gpointer trayIcon)
@@ -2377,7 +2396,7 @@ window_state_event(TrgMainWindow * win,
         && (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED)
         && trg_prefs_get_bool(prefs, TRG_PREFS_KEY_SYSTEM_TRAY_MINIMISE,
                               TRG_PREFS_GLOBAL)) {
-        gtk_widget_hide(GTK_WIDGET(win));
+        trg_main_window_set_hidden_to_tray(win, TRUE);
         return TRUE;
     }
 
@@ -2742,7 +2761,7 @@ static GObject *trg_main_window_constructor(GType type,
         gtk_paned_set_position(GTK_PANED(priv->hpaned), pos);
 
     if (tray && priv->min_on_start)
-        gtk_widget_hide(GTK_WIDGET(self));
+        trg_main_window_set_hidden_to_tray(self, TRUE);
 
     /* Drag and Drop */
     gtk_drag_dest_set(GTK_WIDGET(self), /* widget that will accept a drop */
-- 
cgit v1.2.3