[nemiver/profiler] Change the profiling perspective name to: profiler

[Fabien Parent <fparent src gnome org>]

commit 9f559791545278d59eb4fc79a3109766edba6a24
Author: Fabien Parent <parent f gmail com>
Date:   Sun Aug 19 19:49:21 2012 +0200

    Change the profiling perspective name to: profiler

 src/persp/profperspective/nmv-prof-perspective.cc |   15 ++++-----------
 src/persp/profperspective/plugin-descriptor.xml   |    2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/src/persp/profperspective/nmv-prof-perspective.cc b/src/persp/profperspective/nmv-prof-perspective.cc
index 76639d1..03a077d 100644
--- a/src/persp/profperspective/nmv-prof-perspective.cc
+++ b/src/persp/profperspective/nmv-prof-perspective.cc
@@ -76,6 +76,7 @@ class ProfPerspective : public IProfPerspective {
     SafePtr<SpinnerToolItem> throbber;
     SafePtr<Gtk::HBox> toolbar;
 
+    std::list<Gtk::UIManager::ui_merge_id> merge_ids;
     std::map<UString, int> symbol_to_pagenum_map;
     Glib::RefPtr<Gtk::ActionGroup> default_action_group;
     Glib::RefPtr<Gtk::ActionGroup> record_action_group;
@@ -96,13 +97,12 @@ public:
                           int a_argc,
                           char **a_argv);
     bool process_gui_options (int a_argc, char **a_argv);
-    const UString& name () const;
     void do_init (IWorkbench *a_workbench);
     const UString& get_perspective_identifier ();
     void get_toolbars (std::list<Gtk::Widget*> &a_tbs);
     Gtk::Widget* get_body ();
     IWorkbench& get_workbench ();
-    std::list<Gtk::UIManager::ui_merge_id> edit_workbench_menu ();
+    const std::list<Gtk::UIManager::ui_merge_id>& edit_workbench_menu ();
     Gtk::Widget* load_menu (const UString &a_filename,
                             const UString &a_widget_name);
     bool agree_to_shutdown ();
@@ -230,13 +230,6 @@ ProfPerspective::profiler ()
     return prof;
 }
 
-const UString&
-ProfPerspective::name () const
-{
-    static const UString &s_name = "Profiler";
-    return s_name;
-}
-
 void
 ProfPerspective::do_init (IWorkbench *a_workbench)
 {
@@ -580,7 +573,7 @@ ProfPerspective::init_actions ()
     uimanager->insert_action_group (recording_action_group);
 }
 
-std::list<Gtk::UIManager::ui_merge_id>
+const std::list<Gtk::UIManager::ui_merge_id>&
 ProfPerspective::edit_workbench_menu ()
 {
     std::string relative_path = Glib::build_filename ("menus", "menus.xml");
@@ -593,7 +586,7 @@ ProfPerspective::edit_workbench_menu ()
     Gtk::UIManager::ui_merge_id menubar_merge_id =
         uimanager->add_ui_from_file (Glib::filename_to_utf8 (absolute_path));
 
-    std::list<Gtk::UIManager::ui_merge_id> merge_ids;
+    merge_ids.clear ();
     merge_ids.push_back (menubar_merge_id);
     return merge_ids;
 }
diff --git a/src/persp/profperspective/plugin-descriptor.xml b/src/persp/profperspective/plugin-descriptor.xml
index 8c6a53c..7757c06 100644
--- a/src/persp/profperspective/plugin-descriptor.xml
+++ b/src/persp/profperspective/plugin-descriptor.xml
@@ -1,5 +1,5 @@
 <plugindescriptor autoactivate="yes" candeactivate="no">
-    <name>profperspective</name>
+    <name>profiler</name>
     <version>0.0.1</version>
     <entrypoint>
         <modulename>profperspective</modulename>