recipes/wpa-supplicant/wpa-gui-0.6.9/session_manager.patch

   1 diff -rup wpa_supplicant-0.6.9_orig/wpa_supplicant/wpa_gui-qt4/main.cpp wpa_supplicant-0.6.9/wpa_supplicant/wpa_gui-qt4/main.cpp
   2 --- wpa_gui-qt4/main.cpp        2009-03-23 15:06:28.000000000 +0100
   3 +++ wpa_gui-qt4/main.cpp        2009-11-14 17:55:47.000000000 +0100
   4 @@ -24,7 +24,9 @@ class WpaGuiApp : public QApplication
   5  public:
   6         WpaGuiApp(int &argc, char **argv);
   7
   8 +#ifndef QT_NO_SESSIONMANAGER
   9         virtual void saveState(QSessionManager &manager);
  10 +#endif
  11
  12         WpaGui *w;
  13  };
  14 @@ -33,11 +35,13 @@ WpaGuiApp::WpaGuiApp(int &argc, char **a
  15  {
  16  }
  17
  18 +#ifndef QT_NO_SESSIONMANAGER
  19  void WpaGuiApp::saveState(QSessionManager &manager)
  20  {
  21         QApplication::saveState(manager);
  22         w->saveState();
  23  }
  24 +#endif
  25
  26
  27  int main(int argc, char *argv[])
  28 diff -rup wpa_supplicant-0.6.9_orig/wpa_supplicant/wpa_gui-qt4/wpagui.cpp wpa_supplicant-0.6.9/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
  29 --- wpa_gui-qt4/wpagui.cpp      2009-03-23 15:06:28.000000000 +0100
  30 +++ wpa_gui-qt4/wpagui.cpp      2009-11-14 17:55:47.000000000 +0100
  31 @@ -145,6 +145,7 @@ WpaGui::WpaGui(QApplication *_app, QWidg
  32
  33         parse_argv();
  34
  35 +#ifndef QT_NO_SESSIONMANAGER
  36         if (app->isSessionRestored()) {
  37                 QSettings settings("wpa_supplicant", "wpa_gui");
  38                 settings.beginGroup("state");
  39 @@ -153,6 +154,7 @@ WpaGui::WpaGui(QApplication *_app, QWidg
  40                         startInTray = settings.value("in_tray").toBool();
  41                 settings.endGroup();
  42         }
  43 +#endif
  44
  45         if (QSystemTrayIcon::isSystemTrayAvailable())
  46                 createTrayIcon(startInTray);
  47 @@ -1689,6 +1691,7 @@ void WpaGui::addInterface()
  48  }
  49
  50
  51 +#ifndef QT_NO_SESSIONMANAGER
  52  void WpaGui::saveState()
  53  {
  54         QSettings settings("wpa_supplicant", "wpa_gui");
  55 @@ -1697,3 +1700,4 @@ void WpaGui::saveState()
  56         settings.setValue("in_tray", inTray);
  57         settings.endGroup();
  58  }
  59 +#endif
  60 diff -rup wpa_supplicant-0.6.9_orig/wpa_supplicant/wpa_gui-qt4/wpagui.h wpa_supplicant-0.6.9/wpa_supplicant/wpa_gui-qt4/wpagui.h
  61 --- wpa_gui-qt4/wpagui.h        2009-03-23 15:06:28.000000000 +0100
  62 +++ wpa_gui-qt4/wpagui.h        2009-11-14 17:55:47.000000000 +0100
  63 @@ -40,7 +40,9 @@ public:
  64         virtual void disableNetwork(const QString &sel);
  65         virtual int getNetworkDisabled(const QString &sel);
  66         void setBssFromScan(const QString &bssid);
  67 +#ifndef QT_NO_SESSIONMANAGER
  68         void saveState();
  69 +#endif
  70
  71  public slots:
  72         virtual void parse_argv();