[gnote] Rename m_main_window_actions2 to m_main_window_actions

[Aurimas Černius <aurimasc src gnome org>]

commit e0e0f5dffddb4faca556ba7fa9819cc9c5b60c9d
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sun Jan 24 14:14:11 2016 +0200

    Rename m_main_window_actions2 to m_main_window_actions

 src/actionmanager.cpp |    8 ++++----
 src/actionmanager.hpp |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 0a323b6..11a89f1 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -172,14 +172,14 @@ namespace gnote {
 
   void ActionManager::register_main_window_action(const Glib::ustring & action, const Glib::VariantType 
*state_type, bool modifying)
   {
-    if(m_main_window_actions2.find(action) == m_main_window_actions2.end()) {
-      m_main_window_actions2[action] = state_type;
+    if(m_main_window_actions.find(action) == m_main_window_actions.end()) {
+      m_main_window_actions[action] = state_type;
       if(!modifying) {
         m_non_modifying_actions.push_back(action);
       }
     }
     else {
-      if(m_main_window_actions2[action] != state_type) {
+      if(m_main_window_actions[action] != state_type) {
         ERR_OUT("Action %s already registerred with different state type", action.c_str());
       }
     }
@@ -187,7 +187,7 @@ namespace gnote {
 
   std::map<Glib::ustring, const Glib::VariantType*> ActionManager::get_main_window_actions() const
   {
-    return m_main_window_actions2;
+    return m_main_window_actions;
   }
 
   bool ActionManager::is_modifying_main_window_action(const Glib::ustring & action) const
diff --git a/src/actionmanager.hpp b/src/actionmanager.hpp
index f58c813..b101972 100644
--- a/src/actionmanager.hpp
+++ b/src/actionmanager.hpp
@@ -88,7 +88,7 @@ private:
   };
   typedef std::multimap<int, AppMenuItem> AppMenuItemMultiMap;
   AppMenuItemMultiMap m_app_menu_items;
-  std::map<Glib::ustring, const Glib::VariantType*> m_main_window_actions2;
+  std::map<Glib::ustring, const Glib::VariantType*> m_main_window_actions;
   std::vector<Glib::ustring> m_non_modifying_actions;
   std::map<std::string, std::pair<Glib::ustring, sigc::slot<void, const Glib::VariantBase&>>> 
m_main_window_search_actions;
 };