[vidalia-svn] r2310: A couple small cleanups from notbobfischer's Marble patch th (in vidalia/trunk: . src/vidalia/network src/vidalia/tray)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-01-19 11:48:58 -0500 (Sat, 19 Jan 2008)
New Revision: 2310

Modified:
   vidalia/trunk/
   vidalia/trunk/src/vidalia/network/tormapwidget.cpp
   vidalia/trunk/src/vidalia/tray/trayicon.cpp
Log:
 r55@lysithea:  edmanm | 2008-01-19 11:48:51 -0500
 A couple small cleanups from notbobfischer's Marble patch that can go in
 immediately. Thanks!



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r55] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/src/vidalia/network/tormapwidget.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/tormapwidget.cpp	2008-01-19 14:46:39 UTC (rev 2309)
+++ vidalia/trunk/src/vidalia/network/tormapwidget.cpp	2008-01-19 16:48:58 UTC (rev 2310)
@@ -56,7 +56,7 @@
 
 /** Robinson projection table */
 /** Length of the parallel of latitude */
-float  plen[] = {
+static float  plen[] = {
     1.0000, 0.9986, 0.9954, 0.9900,
     0.9822, 0.9730, 0.9600, 0.9427,
     0.9216, 0.8962, 0.8679, 0.8350,
@@ -65,7 +65,7 @@
   };
 
 /** Distance of corresponding parallel from equator */ 
-float  pdfe[] = {
+static float  pdfe[] = {
     0.0000, 0.0620, 0.1240, 0.1860,
     0.2480, 0.3100, 0.3720, 0.4340,
     0.4958, 0.5571, 0.6176, 0.6769,

Modified: vidalia/trunk/src/vidalia/tray/trayicon.cpp
===================================================================
--- vidalia/trunk/src/vidalia/tray/trayicon.cpp	2008-01-19 14:46:39 UTC (rev 2309)
+++ vidalia/trunk/src/vidalia/tray/trayicon.cpp	2008-01-19 16:48:58 UTC (rev 2310)
@@ -167,9 +167,9 @@
 #if defined(HAVE_QSYSTEMTRAYICON_H)
   QSystemTrayIcon::MessageIcon icon;
   switch (balloonIcon) {
-    NoIcon:   icon = QSystemTrayIcon::NoIcon; break;
-    Warning:  icon = QSystemTrayIcon::Warning; break;
-    Critical: icon = QSystemTrayIcon::Critical; break;
+    case NoIcon:   icon = QSystemTrayIcon::NoIcon; break;
+    case Warning:  icon = QSystemTrayIcon::Warning; break;
+    case Critical: icon = QSystemTrayIcon::Critical; break;
     default:  icon = QSystemTrayIcon::Information; break;
   }
   TrayIconImpl::showMessage(title, message, icon);