Fixing comments from code review for r2833

data/data.qrc

@@ -299,6 +299,8 @@
         <file>pythonstartup.py</file>
         <file>schema/schema-27.sql</file>
         <file>schema/schema-28.sql</file>
-        <file>network-server.png</file>
+        <file>icons/22x22/network-server.png</file>
+        <file>icons/32x32/network-server.png</file>
+        <file>icons/48x48/network-server.png</file>
     </qresource>
 </RCC>

debian/copyright

@@ -100,6 +100,11 @@ Files: 3rdparty/universalchardet/*
 Copyright: Netscape Communications Corporation
 License: MPL-1.1 or GPL-2+ or LGPL-2.1+
 
+Files: 3rdparty/keychain/*
+Copyright: 2011, David Sansome <me@davidsansome.com>
+           2011, John Maguire <john.maguire@gmail.com>
+License: GPL-2+
+
 License: LGPL-2.1
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License, version 2.1, as

src/remote/remoteconfig.cpp

@@ -26,13 +26,13 @@
 #include <QSettings>
 
 const char* kClientLoginUrl = "https://www.google.com/accounts/ClientLogin";
-const char* kSettingsGroup = "remote";
+const char* RemoteConfig::kSettingsGroup = "Remote";
 
 RemoteConfig::RemoteConfig(QWidget *parent)
   : QWidget(parent),
     ui_(new Ui_RemoteConfig),
     waiting_for_auth_(false),
-    network_(new NetworkAccessManager)
+    network_(new NetworkAccessManager(this))
 {
   ui_->setupUi(this);
   ui_->busy->hide();

src/remote/remoteconfig.h

@@ -20,8 +20,6 @@
 
 #include <QWidget>
 
-#include <boost/scoped_ptr.hpp>
-
 #include "core/network.h"
 
 class Ui_RemoteConfig;
@@ -35,6 +33,8 @@ class RemoteConfig : public QWidget {
 
   bool NeedsValidation() const;
 
+  static const char* kSettingsGroup;
+
  public slots:
   void Validate();
   void Load();
@@ -53,7 +53,7 @@ class RemoteConfig : public QWidget {
 
   Ui_RemoteConfig* ui_;
   bool waiting_for_auth_;
-  boost::scoped_ptr<NetworkAccessManager> network_;
+  NetworkAccessManager* network_;
 };
 
 #endif // REMOTECONFIG_H

src/remote/xmpp.cpp

@@ -7,6 +7,7 @@
 #include <QtDebug>
 
 #include "keychain.h"
+#include "remoteconfig.h"
 
 using gloox::Client;
 using gloox::ConnectionTCPClient;
@@ -24,7 +25,7 @@ XMPP::~XMPP() {
 
 void XMPP::Connect() {
   QSettings s;
-  s.beginGroup("remote");
+  s.beginGroup(RemoteConfig::kSettingsGroup);
   QVariant username = s.value("username");
   if (username.isValid()) {
     Keychain* keychain = Keychain::getDefault();

src/ui/settingsdialog.cpp

@@ -120,7 +120,7 @@ SettingsDialog::SettingsDialog(BackgroundStreams* streams, QWidget* parent)
 
 #ifdef HAVE_REMOTE
   ui_->list->insertItem(Page_Remote, tr("Remote Control"));
-  ui_->list->item(Page_Remote)->setIcon(QIcon(":/network-server.png"));
+  ui_->list->item(Page_Remote)->setIcon(IconLoader::Load("network-server"));
 
   QWidget* remote_page = new QWidget;
   QVBoxLayout* remote_layout = new QVBoxLayout;