4 files changed, 42 insertions, 3 deletions

diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index e00514c2..b55fba29 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -22,6 +22,7 @@
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
   <signal name="delete_event" handler="gnunet_gtk_main_quit" after="yes" last_modification_time="Tue, 23 Aug 2005 07:30:53 GMT"/>
+  <signal name="window_state_event" handler="saveMainWindowState" after="yes" last_modification_time="Tue, 30 May 2006 20:04:10 GMT"/>
 
   <child>
     <widget class="GtkVBox" id="vbox1">
@@ -2564,7 +2565,8 @@ This release fixes downloads of files from directories.  The previous version ha
                   <child>
                     <widget class="GtkImage" id="image28">
                       <property name="visible">True</property>
-                      <property name="pixbuf">gnunet-gtk-advanced.png</property>
+                      <property name="stock">gtk-execute</property>
+                      <property name="icon_size">4</property>
                       <property name="xalign">0.5</property>
                       <property name="yalign">0.5</property>
                       <property name="xpad">0</property>
diff --git a/src/common/helper.c b/src/common/helper.c
index d1c51b01..1a67bac9 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -56,6 +56,8 @@ static GtkWidget * infoWindow;
 
 static GtkWidget * infoWindowTextView;
 
+static GdkWindowState main_window_state;
+
 /**
  * the main thread
  */
@@ -598,5 +600,23 @@ char * validate_utf8(char * msg) {
   return msg;
 }
 
+/**
+* Gtk callback to save the main window state (tray icon use)
+*/
+void saveMainWindowState(GtkWidget *main_window,
+                         GdkEventWindowState *event,
+                         gpointer user_data)
+{
+  main_window_state = (*event).new_window_state;
+  return;
+}
+
+/**
+* Get the last main window state when restoring (tray icon use)
+*/
+GdkWindowState getMainWindowState()
+{
+  return main_window_state;
+}
 
 /* end of helper.c */
diff --git a/src/core/eggtrayicon.c b/src/core/eggtrayicon.c
index f3872d17..f16bc9ed 100644
--- a/src/core/eggtrayicon.c
+++ b/src/core/eggtrayicon.c
@@ -599,10 +599,14 @@ static gboolean tray_clicked(GtkWidget *event_box,
   root
     = glade_xml_get_widget(getMainXML(),
                            "mainWindow");
+  GdkWindowState main_window_state;
   if (gtk_window_is_active (GTK_WINDOW(root)))
-          gtk_widget_hide (root);
+    gtk_widget_hide (root);
   else
-          gtk_window_present (GTK_WINDOW(root));
+    gtk_window_present (GTK_WINDOW(root));
+    main_window_state = getMainWindowState();
+    if(main_window_state & GDK_WINDOW_STATE_MAXIMIZED)
+      gtk_window_maximize (GTK_WINDOW(root));
   return TRUE;
 }
 
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index 5abb24db..2769fc79 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -121,4 +121,17 @@ void gnunetgtk_notify(int type,
  */
 char * validate_utf8(char * msg);
 
+/**
+* Gtk callback to save the main window state (tray icon use)
+*/
+void saveMainWindowState(GtkWidget *main_window,
+                         GdkEventWindowState *event,
+                         gpointer user_data);
+
+/**
+* Get the last main window state when restoring (tray icon use)
+*/
+GdkWindowState getMainWindowState();
+
+
 #endif