[glom/glom-1-14] Revert previous "Fix a crash when using find mode" commit.



commit d0dc75c79aa9846c5ba1562fd1d77f178b67c7f8
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Jun 19 14:58:50 2010 +0200

    Revert previous "Fix a crash when using find mode" commit.
    
    	* glom/application.cc:
    	* glom/application.h: This was apparently only a problem due to a previous
    	UI-changing commit in the glom-1-16 branch.

 ChangeLog           |    8 ++++++++
 glom/application.cc |   12 ++----------
 glom/application.h  |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 999d4b5..3921c13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-19  Murray Cumming  <murrayc murrayc com>
+
+	Revert previous "Fix a crash when using find mode" commit.
+
+	* glom/application.cc: 
+	* glom/application.h: This was apparently only a problem due to a previous 
+	UI-changing commit in the glom-1-16 branch.
+	
 2010-05-03  Daniel Borgmann  <danielb openismus com>
 
 	Set default icon instead of individual window icons.
diff --git a/glom/application.cc b/glom/application.cc
index 79d28b6..9ce1ff0 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -1542,20 +1542,12 @@ void Application::existing_or_new_new()
 
 void Application::set_mode_data()
 {
-  if (!m_pFrame)
-    return;
-
-  if (m_pFrame->m_Mode == Frame_Glom::MODE_Find)
-    m_action_mode_find->activate();
+  m_action_mode_data->activate();
 }
 
 void Application::set_mode_find()
 {
-  if (!m_pFrame)
-    return;
-
-  if (m_pFrame->m_Mode == Frame_Glom::MODE_Data)
-    m_action_mode_find->activate();
+  m_action_mode_find->activate();
 }
 
 #ifndef GLOM_ENABLE_MAEMO
diff --git a/glom/application.h b/glom/application.h
index 2b61e72..332f0b9 100644
--- a/glom/application.h
+++ b/glom/application.h
@@ -215,7 +215,7 @@ private:
   typedef std::list< Glib::RefPtr<Gtk::Action> > type_listActions;
   type_listActions m_listDeveloperActions; //Only enabled when in developer mode.
   type_listActions m_listTableSensitiveActions; // Only enabled when a table is loaded.
-  Glib::RefPtr<Gtk::Action> m_action_mode_find;
+  Glib::RefPtr<Gtk::Action> m_action_mode_data, m_action_mode_find;
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   Glib::RefPtr<Gtk::Action> m_action_developer_users;
   Glib::RefPtr<Gtk::RadioAction> m_action_menu_userlevel_developer, m_action_menu_userlevel_operator;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]