[vidalia-svn] r3742: Backport Steve's patch in r3740 to 0.1.x and give it a chang (in vidalia/branches/vidalia-0.1: . src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-04-29 16:13:52 -0400 (Wed, 29 Apr 2009)
New Revision: 3742

Modified:
   vidalia/branches/vidalia-0.1/
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp
   vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.h
Log:

Backport Steve's patch in r3740 to 0.1.x and give it a changelog entry.



Property changes on: vidalia/branches/vidalia-0.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/trunk:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3732
   + /vidalia/trunk:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3732,3740

Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-04-29 20:06:57 UTC (rev 3741)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-04-29 20:13:52 UTC (rev 3742)
@@ -1,6 +1,11 @@
 0.1.13  xx-xxx-2009
   o Remove an old warning on the relay settings page that running a bridge
     relay requires Tor 0.2.0.8-alpha or newer.
+  o Add a workaround for a bug that prevented Vidalia's tray icon from
+    getting adding to the system notification area on Gnome when Vidalia was
+    run on system startup. Patch by Steve Tyree. (Ticket #247)
+  o Fix a bug that prevented the control panel from displaying when
+    running on the Enlightenment window manager. Patch by Steve Tyree.
 
 
 0.1.12  16-Mar-2009

Modified: vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp	2009-04-29 20:06:57 UTC (rev 3741)
+++ vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp	2009-04-29 20:13:52 UTC (rev 3742)
@@ -168,21 +168,11 @@
          this, SLOT(upnpError(UPNPControl::UPNPError)));
 #endif
 
-  if (TrayIcon::isTrayIconSupported()) {
-    /* Make the tray icon visible */
-    _trayIcon.show();
-    /* Check if we are supposed to show our main window on startup */
-    ui.chkShowOnStartup->setChecked(settings.showMainWindowAtStart());
-    if (ui.chkShowOnStartup->isChecked())
-      show();
-  } else {
-    /* Don't let people hide the main window, since that's all they have. */
-    ui.chkShowOnStartup->hide();
-    ui.btnHide->hide();
-    setMinimumHeight(height()-ui.btnHide->height());
-    setMaximumHeight(height()-ui.btnHide->height());
-    show();
-  }
+  ui.chkShowOnStartup->setChecked(settings.showMainWindowAtStart());
+  if (ui.chkShowOnStartup->isChecked())
+    show(); 
+  /* Optimistically hope that the tray icon gets added. */
+  _trayIcon.show();
 }
 
 /** Destructor. */
@@ -195,6 +185,23 @@
   delete _configDialog;
 }
 
+void
+MainWindow::setVisible(bool visible)
+{
+  if (visible) {
+    /* In Gnome, will hide buttons if Vidalia is run on startup. */
+    if (!TrayIcon::isTrayIconSupported()) {
+      /* Don't let people hide the main window, since that's all they have. */
+      ui.chkShowOnStartup->hide();
+      ui.btnHide->hide();
+      /* Causes window to not appear in Enlightenment. */
+      //setMinimumHeight(height()-ui.btnHide->height());
+      //setMaximumHeight(height()-ui.btnHide->height());
+    }
+  }
+  VidaliaWindow::setVisible(visible);
+}
+
 /** Catches and processes Tor client and general status events. */
 void
 MainWindow::customEvent(QEvent *event)

Modified: vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.h
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.h	2009-04-29 20:06:57 UTC (rev 3741)
+++ vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.h	2009-04-29 20:13:52 UTC (rev 3742)
@@ -47,6 +47,10 @@
   /** Destructor. */
   ~MainWindow();
 
+public slots:
+  /** Shows or hides this window. **/
+  virtual void setVisible(bool visible);
+
 protected:
   /** Catches and processes Tor client status events. */
   virtual void customEvent(QEvent *event);