1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
--- src/Makefile.am (revision 24)
+++ src/Makefile.am (working copy)
@@ -19,10 +19,7 @@
Nfc.cpp Nfc.h Utils.h \
gtk/Consts.cpp gtk/Consts.h \
gtk/GtkUtil.h gtk/GtkUtil.cpp \
- gtk/dialogs/ErrorDialog.cpp gtk/dialogs/ErrorDialog.h \
- gtk/dialogs/KeysChooserDialog.cpp gtk/dialogs/KeysChooserDialog.h \
- gtk/dialogs/KeysStoreDialog.cpp gtk/dialogs/KeysStoreDialog.h \
- gtk/dialogs/InputDialog.cpp gtk/dialogs/InputDialog.h
+ gtk/dialogs/ErrorDialog.cpp gtk/dialogs/ErrorDialog.h
mtools_LDFLAGS = -lboost_regex-mt -lboost_thread-mt
--- src/Nfc.h (revision 24)
+++ src/Nfc.h (working copy)
@@ -16,9 +16,6 @@
#include <glibmm/i18n.h>
-#include <thread/Runnable.h>
-#include <thread/AsyncCallback.h>
-
/**
* This class is c++ wrapper for libfreefare library.
*/
--- src/gtk/Callbacks.cpp (revision 24)
+++ src/gtk/Callbacks.cpp (working copy)
@@ -66,10 +66,6 @@
app->getBuilder()->get_widget("miSearch", pMiSearch);
pMiSearch->signal_activate().connect(sigc::mem_fun(*this, &Callbacks::onBtnSearchClicked));
- Gtk::ImageMenuItem* pMiOpenKeys;
- app->getBuilder()->get_widget("miOpenKeys", pMiOpenKeys);
- pMiOpenKeys->signal_activate().connect(sigc::mem_fun(*this, &Callbacks::onMiOpenKeys));
-
Gtk::ImageMenuItem* pMiAbout;
app->getBuilder()->get_widget("miAbout", pMiAbout);
pMiAbout->signal_activate().connect(sigc::mem_fun(*this, &Callbacks::about));
@@ -78,8 +74,6 @@
app->getBuilder()->get_widget("dlgAbout", pDlgAbout);
pDlgAbout->signal_response().connect(sigc::mem_fun(*this, &Callbacks::onDlgAboutResponse));
- dlgKeysStore.signal_changed.connect(sigc::mem_fun(*this, &Callbacks::onKeysStoreChange));
-
nfc = new Nfc();
}
@@ -260,10 +254,6 @@
Gtk::Main::quit();
}
-void Callbacks::onMiOpenKeys() {
- dlgKeysStore.run();
-}
-
void Callbacks::authenticate(int sector) {
unsigned char key[6] = {0};
--- src/gtk/Callbacks.h (revision 24)
+++ src/gtk/Callbacks.h (working copy)
@@ -13,13 +13,10 @@
#include "gtk/DataAccessConditions.h"
#include "gtk/TrailerAccessConditions.h"
-#include "gtk/dialogs/KeysStoreDialog.h"
#include <gtk/dialogs/ErrorDialog.h>
#include "gtk/ComboBoxText.h"
-#include <thread/AsyncCallback.h>
-
class Callbacks {
public:
Callbacks();
@@ -59,7 +56,6 @@
DataAccessConditions dataAC;
TrailerAccessConditions trailerAC;
- KeysStoreDialog dlgKeysStore;
void onKeysStoreChange(std::vector<std::string> v);
void onBtnSearchClicked();
|
