From a4909bbd1b7a19f724d40093ec58a2056e997efd Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Mon, 17 Mar 2008 03:25:03 +0000
Subject: [PATCH] (gtk) minor code cleanup

---
 gtk/main.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/gtk/main.c b/gtk/main.c
index 03aeb7361..f91cbf5cf 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -103,18 +103,18 @@ static const char * LICENSE =
 
 struct cbdata
 {
+    gboolean       minimized;
+    gboolean       closing;
+    guint          timer;
     guint          idle_hide_mainwindow_tag;
+    gpointer       icon;
     GtkWindow    * wind;
     TrCore       * core;
-    gpointer       icon;
     GtkWidget    * msgwin;
     GtkWidget    * prefs;
-    guint          timer;
-    gboolean       closing;
     GList        * errqueue;
     GHashTable   * tor2details;
     GHashTable   * details2tor;
-    gboolean       minimized;
 };
 
 #define CBDATA_PTR "callback-data-pointer"
@@ -130,8 +130,6 @@ appsetup( TrWindow * wind, GList * args,
 static void
 winsetup( struct cbdata * cbdata, TrWindow * wind );
 static void
-makeicon( struct cbdata * cbdata );
-static void
 wannaquit( void * vdata );
 static void
 setupdrag(GtkWidget *widget, struct cbdata *data);
@@ -397,7 +395,7 @@ appsetup( TrWindow * wind, GList * args,
     winsetup( cbdata, wind );
 
     /* set up the system tray */
-    makeicon( cbdata );
+    cbdata->icon = tr_icon_new( cbdata->core );
 
     /* start model update timer */
     cbdata->timer = g_timeout_add( UPDATE_INTERVAL, updatemodel, cbdata );
@@ -531,13 +529,6 @@ winsetup( struct cbdata * cbdata, TrWindow * wind )
     setupdrag( GTK_WIDGET(wind), cbdata );
 }
 
-static void
-makeicon( struct cbdata * cbdata )
-{
-    if( cbdata->icon == NULL )
-        cbdata->icon = tr_icon_new( cbdata->core );
-}
-
 static gpointer
 quitThreadFunc( gpointer gdata )
 {