[Pkg-privacy-commits] [vidalia] 03/07: Refresh Tails-specific patches so that they apply against Vidalia 0.2.20.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:16:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to annotated tag debian/0.2.21-1+tails1
in repository vidalia.
commit 226e49638b6a92fe5930a3ebeb81889df77efdd9
Author: intrigeri <intrigeri at boum.org>
Date: Tue Sep 4 17:16:51 2012 +0200
Refresh Tails-specific patches so that they apply against Vidalia 0.2.20.
---
debian/patches/tails-remove-useless-controls.patch | 36 ++++++++----------
debian/patches/vidalia-bridgeconf.patch | 44 ++++++++--------------
2 files changed, 31 insertions(+), 49 deletions(-)
diff --git a/debian/patches/tails-remove-useless-controls.patch b/debian/patches/tails-remove-useless-controls.patch
index 65519d7..9b4a8c1 100644
--- a/debian/patches/tails-remove-useless-controls.patch
+++ b/debian/patches/tails-remove-useless-controls.patch
@@ -8,21 +8,19 @@ Subject: tails-remove-useless-controls
src/vidalia/MainWindow.ui | 138 --------------------------------------------
3 files changed, 2 insertions(+), 197 deletions(-)
-diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
-index b404802..67b8aa0 100644
--- a/src/vidalia/MainWindow.cpp
+++ b/src/vidalia/MainWindow.cpp
-@@ -215,8 +215,7 @@ MainWindow::MainWindow()
+@@ -221,8 +221,7 @@
this, SLOT(upnpError(UPNPControl::UPNPError)));
#endif
- ui.chkShowOnStartup->setChecked(settings.showMainWindowAtStart());
- if (ui.chkShowOnStartup->isChecked())
+ if (settings.showMainWindowAtStart())
- show();
+ show();
/* Optimistically hope that the tray icon gets added. */
_trayIcon.show();
-@@ -249,7 +248,6 @@ MainWindow::setVisible(bool visible)
+@@ -257,7 +256,6 @@
/* In Gnome, will hide buttons if Vidalia is run on startup. */
if (!QSystemTrayIcon::isSystemTrayAvailable()) {
/* Don't let people hide the main window, since that's all they have. */
@@ -30,7 +28,7 @@ index b404802..67b8aa0 100644
ui.btnHide->hide();
/* Causes window to not appear in Enlightenment. */
//setMinimumHeight(height()-ui.btnHide->height());
-@@ -265,16 +263,6 @@ MainWindow::retranslateUi()
+@@ -273,16 +271,6 @@
ui.retranslateUi(this);
updateTorStatus(_status);
@@ -47,8 +45,8 @@ index b404802..67b8aa0 100644
_actionShowBandwidth->setText(tr("Bandwidth Graph"));
_actionShowMessageLog->setText(tr("Message Log"));
-@@ -423,9 +411,6 @@ MainWindow::close()
- void
+@@ -431,9 +419,6 @@
+ void
MainWindow::createActions()
{
- _actionStartStopTor = new QAction(tr("Start Tor"), this);
@@ -57,7 +55,7 @@ index b404802..67b8aa0 100644
_actionExit = new QAction(tr("Exit"), this);
connect(_actionExit, SIGNAL(triggered()), this, SLOT(close()));
-@@ -468,7 +453,6 @@ MainWindow::createActions()
+@@ -480,7 +465,6 @@
/* Don't give the menu items icons on OS X, since they end up in the
* application menu bar. Menu bar items on OS X typically do not have
* icons. */
@@ -65,7 +63,7 @@ index b404802..67b8aa0 100644
_actionExit->setIcon(QIcon(IMG_EXIT));
_actionShowBandwidth->setIcon(QIcon(IMG_BWGRAPH));
_actionShowMessageLog->setIcon(QIcon(IMG_MESSAGELOG));
-@@ -506,8 +490,6 @@ QMenu*
+@@ -518,8 +502,6 @@
MainWindow::createTrayMenu()
{
QMenu *menu = new QMenu(this);
@@ -74,7 +72,7 @@ index b404802..67b8aa0 100644
menu->addAction(_actionShowBandwidth);
menu->addAction(_actionShowMessageLog);
menu->addAction(_actionShowNetworkMap);
-@@ -537,7 +519,6 @@ MainWindow::createMenuBar()
+@@ -549,7 +531,6 @@
/* Mac users sure like their shortcuts. Actions NOT mentioned below
* don't explicitly need shortcuts, since they are merged to the default
* menubar and get the default shortcuts anyway. */
@@ -82,7 +80,7 @@ index b404802..67b8aa0 100644
_actionShowBandwidth->setShortcut(tr("Ctrl+B"));
_actionShowMessageLog->setShortcut(tr("Ctrl+L"));
_actionShowNetworkMap->setShortcut(tr("Ctrl+N"));
-@@ -564,8 +545,6 @@ MainWindow::createMenuBar()
+@@ -576,8 +557,6 @@
fileMenu->addAction(_actionShowConfig);
QMenu *torMenu = _menuBar->addMenu(tr("Tor"));
@@ -91,7 +89,7 @@ index b404802..67b8aa0 100644
torMenu->addAction(_actionNewIdentity);
QMenu *viewMenu = _menuBar->addMenu(tr("View"));
-@@ -896,20 +875,7 @@ MainWindow::updateTorStatus(TorStatus status)
+@@ -920,20 +899,7 @@
actionText = tr("Start Tor");
trayIconFile = IMG_TOR_STOPPED;
statusIconFile = IMG_TOR_STOPPED_48;
@@ -113,11 +111,11 @@ index b404802..67b8aa0 100644
setStartupProgressVisible(false);
} else if (status == Stopping) {
if (_delayedShutdownStarted) {
-@@ -920,32 +886,10 @@ MainWindow::updateTorStatus(TorStatus status)
+@@ -944,32 +910,10 @@
}
trayIconFile = IMG_TOR_STOPPING;
statusIconFile = IMG_TOR_STOPPING_48;
--
+-
- ui.lblStartStopTor->setStatusTip(tr("Stop Tor Now"));
- } else if (status == Started) {
- actionText = tr("Stop Tor");
@@ -128,7 +126,7 @@ index b404802..67b8aa0 100644
- ui.lblStartStopTor->setText(actionText);
- ui.lblStartStopTor->setPixmap(QPixmap(IMG_STOP_TOR_48));
- ui.lblStartStopTor->setStatusTip(actionText);
--
+-
- /* XXX: This might need to be smarter if we ever start connecting other
- * slots to these triggered() and clicked() signals. */
- QObject::disconnect(_actionStartStopTor, SIGNAL(triggered()), this, 0);
@@ -146,11 +144,9 @@ index b404802..67b8aa0 100644
setStartupProgressVisible(true);
setStartupProgress(STARTUP_PROGRESS_STARTING, statusText);
} else if (status == CircuitEstablished) {
-diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h
-index 8cf424b..4900df0 100644
--- a/src/vidalia/MainWindow.h
+++ b/src/vidalia/MainWindow.h
-@@ -280,7 +280,6 @@ private:
+@@ -285,7 +285,6 @@
/** Defines the actions for the tray menu */
QAction* _actionShowControlPanel;
@@ -158,8 +154,6 @@ index 8cf424b..4900df0 100644
QAction* _actionShowConfig;
QAction* _actionShowAbout;
QAction* _actionExit;
-diff --git a/src/vidalia/MainWindow.ui b/src/vidalia/MainWindow.ui
-index 586af36..de90734 100644
--- a/src/vidalia/MainWindow.ui
+++ b/src/vidalia/MainWindow.ui
@@ -224,32 +224,6 @@
diff --git a/debian/patches/vidalia-bridgeconf.patch b/debian/patches/vidalia-bridgeconf.patch
index 7f26597..c3d07bf 100644
--- a/debian/patches/vidalia-bridgeconf.patch
+++ b/debian/patches/vidalia-bridgeconf.patch
@@ -11,8 +11,6 @@ Subject: vidalia-bridgeconf
src/vidalia/config/NetworkSettings.h | 3 ++
6 files changed, 90 insertions(+), 8 deletions(-)
-diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
-index d170d47..b404802 100644
--- a/src/vidalia/MainWindow.cpp
+++ b/src/vidalia/MainWindow.cpp
@@ -23,6 +23,7 @@
@@ -23,7 +21,7 @@ index d170d47..b404802 100644
#ifdef USE_AUTOUPDATE
#include "UpdatesAvailableDialog.h"
#endif
-@@ -1510,6 +1511,20 @@ MainWindow::authenticated()
+@@ -1585,6 +1586,20 @@
if (status.isValid())
bootstrapStatusChanged(status);
}
@@ -44,7 +42,7 @@ index d170d47..b404802 100644
}
/** Called when Vidalia fails to authenticate to Tor. The failure reason is
-@@ -1860,6 +1875,37 @@ MainWindow::showServerConfigDialog()
+@@ -1935,6 +1950,37 @@
showConfigDialog(ConfigDialog::Server);
}
@@ -82,11 +80,9 @@ index d170d47..b404802 100644
/** Called when the user selects the "New Identity" action from the menu. */
void
MainWindow::newIdentity()
-diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h
-index dc251e1..8cf424b 100644
--- a/src/vidalia/MainWindow.h
+++ b/src/vidalia/MainWindow.h
-@@ -114,6 +114,8 @@ private slots:
+@@ -114,6 +114,8 @@
void showConfigDialog(ConfigDialog::Page page = ConfigDialog::General);
/** Displays the Configuration dialog, set to the Server page. */
void showServerConfigDialog();
@@ -95,11 +91,9 @@ index dc251e1..8cf424b 100644
/** Called when the "show on startup" checkbox is toggled. */
void toggleShowOnStartup(bool checked);
/** Called when the web browser or IM client have stopped */
-diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp
-index 53b41c9..d2d1d8f 100644
--- a/src/vidalia/Vidalia.cpp
+++ b/src/vidalia/Vidalia.cpp
-@@ -40,14 +40,15 @@
+@@ -39,14 +39,15 @@
#include <stdlib.h>
/* Available command-line arguments. */
@@ -123,7 +117,7 @@ index 53b41c9..d2d1d8f 100644
#define ARG_READ_PASSWORD_FROM_STDIN \
"read-password-from-stdin" /**< Read password from stdin. */
-@@ -58,6 +59,7 @@ QString Vidalia::_language; /**< The current language. */
+@@ -57,6 +58,7 @@
TorControl* Vidalia::_torControl = 0; /**< Main TorControl object. */
Log Vidalia::_log;
QList<QTranslator *> Vidalia::_translators;
@@ -131,7 +125,7 @@ index 53b41c9..d2d1d8f 100644
/** Catches debugging messages from Qt and sends them to Vidalia's logs. If Qt
-@@ -124,6 +126,9 @@ Vidalia::Vidalia(QStringList args, int &argc, char **argv)
+@@ -123,6 +125,9 @@
/* Set the GUI style appropriately. */
setStyle(_args.value(ARG_GUISTYLE));
@@ -141,8 +135,8 @@ index 53b41c9..d2d1d8f 100644
/* Creates a TorControl object, used to talk to Tor. */
_torControl = new TorControl(TorSettings().getControlMethod());
-@@ -217,6 +222,10 @@ Vidalia::showUsageMessageBox()
- out << trow(tcol("-"ARG_LANGUAGE" <language>") +
+@@ -212,6 +217,10 @@
+ out << trow(tcol("-"ARG_LANGUAGE" <language>") +
tcol(tr("Sets Vidalia's language.") +
"<br>[" + LanguageSupport::languageCodes().join("|") + "]"));
+ out << trow(tcol("-"ARG_BRIDGECONF) +
@@ -151,23 +145,21 @@ index 53b41c9..d2d1d8f 100644
+ "get and setup bridges.")));
out << "</table>";
- VMessageBox::information(0,
-diff --git a/src/vidalia/Vidalia.h b/src/vidalia/Vidalia.h
-index b7d09f4..88cb858 100644
+ VMessageBox::information(0,
--- a/src/vidalia/Vidalia.h
+++ b/src/vidalia/Vidalia.h
-@@ -74,6 +74,10 @@ public:
-
+@@ -75,6 +75,10 @@
/** Returns Vidalia's main TorControl object. */
static TorControl* torControl() { return _torControl; }
-+
+
+ /** Returns true if we should show the network config page on start and
+ * guide the user through setting up bridges. */
+ static bool showBridgeConfOnStart() { return _showBridgeConfOnStart; }
-
++
/** Returns the location Vidalia uses for its data files. */
static QString dataDirectory();
-@@ -158,6 +162,7 @@ private:
+ /** Returns the default location of Vidalia's data directory. */
+@@ -153,6 +157,7 @@
static TorControl* _torControl; /**< Vidalia's main TorControl object.*/
static Log _log; /**< Logs debugging messages to file or stdout. */
static QList<QTranslator *> _translators; /**< List of installed translators. */
@@ -175,8 +167,6 @@ index b7d09f4..88cb858 100644
};
#endif
-diff --git a/src/vidalia/config/NetworkSettings.cpp b/src/vidalia/config/NetworkSettings.cpp
-index 0229442..49fb144 100644
--- a/src/vidalia/config/NetworkSettings.cpp
+++ b/src/vidalia/config/NetworkSettings.cpp
@@ -16,6 +16,8 @@
@@ -188,7 +178,7 @@ index 0229442..49fb144 100644
#define SETTING_FASCIST_FIREWALL "FascistFirewall"
#define SETTING_REACHABLE_ADDRESSES "ReachableAddresses"
-@@ -284,6 +286,21 @@ NetworkSettings::getTunnelDirConns()
+@@ -284,6 +286,21 @@
return value(SETTING_TUNNEL_DIR_CONNS).toBool();
}
@@ -210,11 +200,9 @@ index 0229442..49fb144 100644
/** Converts the ProxyType <b>type</b> to a string to store in the
* configuration file. */
QString
-diff --git a/src/vidalia/config/NetworkSettings.h b/src/vidalia/config/NetworkSettings.h
-index aa5d88a..94f9196 100644
--- a/src/vidalia/config/NetworkSettings.h
+++ b/src/vidalia/config/NetworkSettings.h
-@@ -97,6 +97,9 @@ public:
+@@ -97,6 +97,9 @@
* connections through a one-hop circuit. */
bool getTunnelDirConns();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git
More information about the Pkg-privacy-commits
mailing list