Changeset b826c25829b991595da1356477c09e480cb4ec23

Timestamp:

01/06/07 23:42:01 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

eac9d654e2ab86596ea7589952481779a14f6844

Children:

5a41a0aff9b1b43c3fdffdac6b31b3d9dbbe1fa0

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:42:01Z+0000

Message:

[project @ Fixed conflict caused by phil's security page]

Original author: Armin Burgmeier <armin@…>
Date: 2005-07-22 14:12:02+00:00

Files:

• inc/preferencesdialog.hpp (modified) (2 diffs)
• src/preferencesdialog.cpp (modified) (1 diff)

inc/preferencesdialog.hpp

@@ -106 +106 @@
         };
 
-v v v v v v v
-        PreferencesDialog(Gtk::Window& parent, const Preferences& preferences);
-*************
         class Security : public Page
         {
         public:
-                Security(Config& config);
+                Security(const Preferences& preferences);
                 ~Security();
 
                 // Fetch the key components
         protected:
-                virtual void on_response(int response_id);
-
                 Gtk::VBox m_box;
 
@@ -126 +121 @@
         };
 
-        PreferencesDialog(Gtk::Window& parent, Config& config);
-^ ^ ^ ^ ^ ^ ^
+        PreferencesDialog(Gtk::Window& parent, const Preferences& preferences);
         ~PreferencesDialog();
 

src/preferencesdialog.cpp

@@ -152 +152 @@
 }
 
-void Gobby::PreferencesDialog::Appearance::on_response(int response_id)
-{
-        if(response_id == Gtk::RESPONSE_OK)
-        {
-        }
+Gobby::PreferencesDialog::Security::Security(const Preferences& preferences)
+ : Page(preferences)
+{
+}
+
+Gobby::PreferencesDialog::Security::~Security()
+{
 }