GNOME.org
 

[gnome-system-monitor/wip/renaming: 2/5] Rename ProcmanApp -> GsmApplication

commit 20b155322da6af805616758424689fadece2bc59
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Tue Aug 6 18:16:44 2013 +0200

    Rename ProcmanApp -> GsmApplication

 src/Makefile.am                          |    2 +-
 src/{procman-app.cpp => application.cpp} |   50 +++++++++++++++---------------
 src/{procman-app.h => application.h}     |   10 +++---
 src/cgroups.cpp                          |    2 +-
 src/cgroups.h                            |    2 +-
 src/disks.cpp                            |   24 +++++++-------
 src/disks.h                              |   12 +++---
 src/interface.cpp                        |   48 ++++++++++++++--------------
 src/interface.h                          |    6 ++--
 src/load-graph.cpp                       |   26 ++++++++--------
 src/lsof.cpp                             |    6 ++--
 src/lsof.h                               |    4 +-
 src/memmaps.cpp                          |    8 ++--
 src/memmaps.h                            |    4 +-
 src/openfiles.cpp                        |    8 ++--
 src/openfiles.h                          |    4 +-
 src/prefsdialog.cpp                      |    6 ++--
 src/prefsdialog.h                        |    4 +-
 src/procactions.cpp                      |    6 ++--
 src/procactions.h                        |    6 ++--
 src/procdialogs.cpp                      |    8 ++--
 src/procdialogs.h                        |   10 +++---
 src/procman.cpp                          |    4 +-
 src/procman_gksu.cpp                     |    2 +-
 src/procman_gnomesu.cpp                  |    2 +-
 src/procman_pkexec.cpp                   |    2 +-
 src/procproperties.cpp                   |    8 ++--
 src/procproperties.h                     |    4 +-
 src/proctable.cpp                        |   50 +++++++++++++++---------------
 src/proctable.h                          |   14 ++++----
 src/selinux.cpp                          |    2 +-
 src/selinux.h                            |    2 +-
 src/smooth_refresh.cpp                   |    6 ++--
 src/util.cpp                             |    8 ++--
 34 files changed, 180 insertions(+), 180 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 3174383..dff68e9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,7 +33,7 @@ gnome_system_monitor_cpp_files = \
        lsof.cpp \
        iconthemewrapper.cpp \
        prefsdialog.cpp \
-       procman-app.cpp
+       application.cpp
 
 gnome_system_monitor_c_files = \
        e_date.c \
diff --git a/src/procman-app.cpp b/src/application.cpp
similarity index 91%
rename from src/procman-app.cpp
rename to src/application.cpp
index aadfefb..91aa168 100644
--- a/src/procman-app.cpp
+++ b/src/application.cpp
@@ -6,7 +6,7 @@
 #include <glibtop/close.h>
 #include <signal.h>
 
-#include "procman-app.h"
+#include "application.h"
 #include "procdialogs.h"
 #include "prefsdialog.h"
 #include "interface.h"
@@ -22,7 +22,7 @@
 static void
 cb_solaris_mode_changed (GSettings *settings, const gchar *key, gpointer data)
 {
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
+    GsmApplication *app = static_cast<GsmApplication *>(data);
 
     app->config.solaris_mode = g_settings_get_boolean(settings, key);
     app->cpu_graph->clear_background();
@@ -32,7 +32,7 @@ cb_solaris_mode_changed (GSettings *settings, const gchar *key, gpointer data)
 static void
 cb_draw_stacked_changed (GSettings *settings, const gchar *key, gpointer data)
 {
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
+    GsmApplication *app = static_cast<GsmApplication *>(data);
 
     app->config.draw_stacked = g_settings_get_boolean(settings, key);
     app->cpu_graph->clear_background();
@@ -43,7 +43,7 @@ cb_draw_stacked_changed (GSettings *settings, const gchar *key, gpointer data)
 static void
 cb_network_in_bits_changed (GSettings *settings, const gchar *key, gpointer data)
 {
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
+    GsmApplication *app = static_cast<GsmApplication *>(data);
 
     app->config.network_in_bits = g_settings_get_boolean(settings, key);
     // force scale to be redrawn
@@ -53,7 +53,7 @@ cb_network_in_bits_changed (GSettings *settings, const gchar *key, gpointer data
 static void
 cb_timeouts_changed (GSettings *settings, const gchar *key, gpointer data)
 {
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
+    GsmApplication *app = static_cast<GsmApplication *>(data);
 
     if (strcmp (key, GSM_SETTING_PROCESS_UPDATE_INTERVAL) == 0) {
         app->config.update_interval = g_settings_get_int (settings, key);
@@ -78,7 +78,7 @@ cb_timeouts_changed (GSettings *settings, const gchar *key, gpointer data)
 static void
 apply_cpu_color_settings(GSettings *settings, gpointer data)
 {
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
+    GsmApplication *app = static_cast<GsmApplication *>(data);
 
     GVariant *cpu_colors_var = g_settings_get_value (settings, GSM_SETTING_CPU_COLORS);
     gsize n = g_variant_n_children(cpu_colors_var);
@@ -119,7 +119,7 @@ apply_cpu_color_settings(GSettings *settings, gpointer data)
 static void
 cb_color_changed (GSettings *settings, const gchar *key, gpointer data)
 {
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
+    GsmApplication *app = static_cast<GsmApplication *>(data);
 
     if (strcmp (key, GSM_SETTING_CPU_COLORS) == 0) {
         apply_cpu_color_settings(settings, app);
@@ -150,7 +150,7 @@ cb_color_changed (GSettings *settings, const gchar *key, gpointer data)
 }
 
 void
-ProcmanApp::load_settings()
+GsmApplication::load_settings()
 {
     gchar *color;
     gint i;
@@ -229,22 +229,22 @@ ProcmanApp::load_settings()
     g_free (color);
 }
 
-ProcmanApp::ProcmanApp() : Gtk::Application("org.gnome.SystemMonitor", Gio::APPLICATION_HANDLES_COMMAND_LINE)
+GsmApplication::GsmApplication() : Gtk::Application("org.gnome.SystemMonitor", 
Gio::APPLICATION_HANDLES_COMMAND_LINE)
 {
     Glib::set_application_name(_("System Monitor"));
 }
 
-Glib::RefPtr<ProcmanApp> ProcmanApp::get ()
+Glib::RefPtr<GsmApplication> GsmApplication::get ()
 {
-    static Glib::RefPtr<ProcmanApp> singleton;
+    static Glib::RefPtr<GsmApplication> singleton;
 
     if (!singleton) {
-        singleton = Glib::RefPtr<ProcmanApp>(new ProcmanApp());
+        singleton = Glib::RefPtr<GsmApplication>(new GsmApplication());
     }
     return singleton;
 }
 
-void ProcmanApp::on_activate()
+void GsmApplication::on_activate()
 {
     gtk_window_present (GTK_WINDOW (main_window));
 }
@@ -426,7 +426,7 @@ procman_save_tree_state (GSettings *settings, GtkWidget *tree, const gchar *chil
 }
 
 void
-ProcmanApp::save_config ()
+GsmApplication::save_config ()
 {
     int width, height, xpos, ypos;
     gboolean maximized;
@@ -443,7 +443,7 @@ ProcmanApp::save_config ()
     g_settings_set_boolean (settings, GSM_SETTING_MAXIMIZED, maximized);
 }
 
-int ProcmanApp::on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>& command_line)
+int GsmApplication::on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>& command_line)
 {
     int argc = 0;
     char** argv = command_line->get_arguments(argc);
@@ -481,7 +481,7 @@ int ProcmanApp::on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>&
 }
 
 void
-ProcmanApp::on_help_activate(const Glib::VariantBase&)
+GsmApplication::on_help_activate(const Glib::VariantBase&)
 {
     GError* error = 0;
     if (!g_app_info_launch_default_for_uri("help:gnome-system-monitor", NULL, &error)) {
@@ -491,25 +491,25 @@ ProcmanApp::on_help_activate(const Glib::VariantBase&)
 }
 
 void
-ProcmanApp::on_lsof_activate(const Glib::VariantBase&)
+GsmApplication::on_lsof_activate(const Glib::VariantBase&)
 {
     procman_lsof(this);
 }
 
 void
-ProcmanApp::on_preferences_activate(const Glib::VariantBase&)
+GsmApplication::on_preferences_activate(const Glib::VariantBase&)
 {
     create_preferences_dialog (this);
 }
 
 void
-ProcmanApp::on_quit_activate(const Glib::VariantBase&)
+GsmApplication::on_quit_activate(const Glib::VariantBase&)
 {
     shutdown ();
 }
 
 void
-ProcmanApp::shutdown()
+GsmApplication::shutdown()
 {
     save_config ();
 
@@ -527,26 +527,26 @@ ProcmanApp::shutdown()
     quit();
 }
 
-void ProcmanApp::on_startup()
+void GsmApplication::on_startup()
 {
     Gtk::Application::on_startup();
 
     Glib::RefPtr<Gio::SimpleAction> action;
 
     action = Gio::SimpleAction::create("quit");
-    action->signal_activate().connect(sigc::mem_fun(*this, &ProcmanApp::on_quit_activate));
+    action->signal_activate().connect(sigc::mem_fun(*this, &GsmApplication::on_quit_activate));
     add_action(action);
 
     action = Gio::SimpleAction::create("help");
-    action->signal_activate().connect(sigc::mem_fun(*this, &ProcmanApp::on_help_activate));
+    action->signal_activate().connect(sigc::mem_fun(*this, &GsmApplication::on_help_activate));
     add_action(action);
 
     action = Gio::SimpleAction::create("lsof");
-    action->signal_activate().connect(sigc::mem_fun(*this, &ProcmanApp::on_lsof_activate));
+    action->signal_activate().connect(sigc::mem_fun(*this, &GsmApplication::on_lsof_activate));
     add_action(action);
 
     action = Gio::SimpleAction::create("preferences");
-    action->signal_activate().connect(sigc::mem_fun(*this, &ProcmanApp::on_preferences_activate));
+    action->signal_activate().connect(sigc::mem_fun(*this, &GsmApplication::on_preferences_activate));
     add_action(action);
 
     Glib::RefPtr<Gtk::Builder> builder = 
Gtk::Builder::create_from_resource("/org/gnome/gnome-system-monitor/data/menus.ui");
diff --git a/src/procman-app.h b/src/application.h
similarity index 96%
rename from src/procman-app.h
rename to src/application.h
index 883f3a1..e9a257c 100644
--- a/src/procman-app.h
+++ b/src/application.h
@@ -139,7 +139,7 @@ class ProcInfo
 
 
 
-class ProcmanApp : public Gtk::Application
+class GsmApplication : public Gtk::Application
 {
 private:
     void load_settings();
@@ -149,9 +149,9 @@ private:
     void on_help_activate(const Glib::VariantBase&);
     void on_quit_activate(const Glib::VariantBase&);
 protected:
-    ProcmanApp();
+    GsmApplication();
 public:
-    static Glib::RefPtr<ProcmanApp> get ();
+    static Glib::RefPtr<GsmApplication> get ();
 
     void save_config();
     void shutdown();
@@ -200,14 +200,14 @@ protected:
 
 struct ReniceArgs
 {
-    ProcmanApp *app;
+    GsmApplication *app;
     int nice_value;
 };
 
 
 struct KillArgs
 {
-    ProcmanApp *app;
+    GsmApplication *app;
     int signal;
 };
 
diff --git a/src/cgroups.cpp b/src/cgroups.cpp
index 1d1d463..62f220e 100644
--- a/src/cgroups.cpp
+++ b/src/cgroups.cpp
@@ -4,7 +4,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include "procman-app.h"
+#include "application.h"
 #include "util.h"
 
 gboolean
diff --git a/src/cgroups.h b/src/cgroups.h
index 8061d58..806ee50 100644
--- a/src/cgroups.h
+++ b/src/cgroups.h
@@ -4,7 +4,7 @@
 
 #include <glib.h>
 
-#include "procman-app.h"
+#include "application.h"
 
 void
 get_process_cgroup_info (ProcInfo *info);
diff --git a/src/disks.cpp b/src/disks.cpp
index 0c30262..fe30ecb 100644
--- a/src/disks.cpp
+++ b/src/disks.cpp
@@ -9,7 +9,7 @@
 #include <glib/gi18n.h>
 
 #include "disks.h"
-#include "procman-app.h"
+#include "application.h"
 #include "util.h"
 #include "iconthemewrapper.h"
 #include "settings-keys.h"
@@ -36,7 +36,7 @@ enum DiskColumns
 static void
 cb_sort_changed (GtkTreeSortable *model, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     procman_save_tree_state (app->settings,
                              GTK_WIDGET (app->disk_list),
@@ -223,7 +223,7 @@ add_disk(GtkListStore *list, const glibtop_mountentry *entry, bool show_all_fs)
 }
 
 static void
-mount_changed (GVolumeMonitor *monitor, GMount *mount, ProcmanApp *app)
+mount_changed (GVolumeMonitor *monitor, GMount *mount, GsmApplication *app)
 {
     disks_update(app);
 }
@@ -231,14 +231,14 @@ mount_changed (GVolumeMonitor *monitor, GMount *mount, ProcmanApp *app)
 static gboolean
 cb_timeout (gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
     disks_update (app);
 
     return G_SOURCE_CONTINUE;
 }
 
 void
-disks_update(ProcmanApp *app)
+disks_update(GsmApplication *app)
 {
     GtkListStore *list;
     glibtop_mountentry * entries;
@@ -259,7 +259,7 @@ disks_update(ProcmanApp *app)
 }
 
 static void
-init_volume_monitor (ProcmanApp *app)
+init_volume_monitor (GsmApplication *app)
 {
     GVolumeMonitor *monitor = g_volume_monitor_get ();
 
@@ -269,7 +269,7 @@ init_volume_monitor (ProcmanApp *app)
 }
 
 void
-disks_freeze (ProcmanApp *app)
+disks_freeze (GsmApplication *app)
 {
   if (app->disk_timeout) {
       g_source_remove (app->disk_timeout);
@@ -278,7 +278,7 @@ disks_freeze (ProcmanApp *app)
 }
 
 void
-disks_thaw (ProcmanApp *app)
+disks_thaw (GsmApplication *app)
 {
   if (app->disk_timeout)
       return;
@@ -289,7 +289,7 @@ disks_thaw (ProcmanApp *app)
 }
 
 void
-disks_reset_timeout (ProcmanApp *app)
+disks_reset_timeout (GsmApplication *app)
 {
     disks_freeze (app);
     disks_thaw (app);
@@ -298,7 +298,7 @@ disks_reset_timeout (ProcmanApp *app)
 static void
 cb_disk_columns_changed(GtkTreeView *treeview, gpointer data)
 {
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
+    GsmApplication *app = static_cast<GsmApplication *>(data);
 
     procman_save_tree_state (app->settings,
                              GTK_WIDGET (treeview),
@@ -352,7 +352,7 @@ cb_disk_list_destroying (GtkWidget *self, gpointer data)
 static void
 cb_show_all_fs_changed (GSettings *settings, const gchar *key, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     disks_update (app);
     disks_reset_timeout (app);
@@ -360,7 +360,7 @@ cb_show_all_fs_changed (GSettings *settings, const gchar *key, gpointer data)
 
 
 void
-create_disk_view(ProcmanApp *app, GtkBuilder *builder)
+create_disk_view(GsmApplication *app, GtkBuilder *builder)
 {
     GtkWidget *scrolled;
     GtkWidget *disk_tree;
diff --git a/src/disks.h b/src/disks.h
index 77f1cca..5bf60d8 100644
--- a/src/disks.h
+++ b/src/disks.h
@@ -2,12 +2,12 @@
 #ifndef H_GNOME_SYSTEM_MONITOR_DISKS_1123719137
 #define H_GNOME_SYSTEM_MONITOR_DISKS_1123719137
 
-#include "procman-app.h"
+#include "application.h"
 
-void create_disk_view(ProcmanApp *app, GtkBuilder *builder);
+void create_disk_view(GsmApplication *app, GtkBuilder *builder);
 
-void disks_update (ProcmanApp *app);
-void disks_freeze (ProcmanApp *app);
-void disks_thaw (ProcmanApp *app);
-void disks_reset_timeout (ProcmanApp *app);
+void disks_update (GsmApplication *app);
+void disks_freeze (GsmApplication *app);
+void disks_thaw (GsmApplication *app);
+void disks_reset_timeout (GsmApplication *app);
 #endif /* H_GNOME_SYSTEM_MONITOR_DISKLIST_1123719137 */
diff --git a/src/interface.cpp b/src/interface.cpp
index 0629414..06370d8 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -48,7 +48,7 @@
 static gboolean
 cb_window_key_press_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
-    const char *current_page = gtk_stack_get_visible_child_name (GTK_STACK (ProcmanApp::get()->stack));
+    const char *current_page = gtk_stack_get_visible_child_name (GTK_STACK (GsmApplication::get()->stack));
 
     if (strcmp (current_page, "processes") == 0)
         return gtk_search_bar_handle_event (GTK_SEARCH_BAR (user_data), event);
@@ -59,14 +59,14 @@ cb_window_key_press_event (GtkWidget *widget, GdkEvent *event, gpointer user_dat
 static void
 search_text_changed (GtkEditable *entry, gpointer data)
 {
-    ProcmanApp * const app = static_cast<ProcmanApp *>(data);
+    GsmApplication * const app = static_cast<GsmApplication *>(data);
     gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (gtk_tree_model_sort_get_model (
                                          GTK_TREE_MODEL_SORT (gtk_tree_view_get_model(
                                            GTK_TREE_VIEW (app->tree))))));
 }
 
 static void 
-create_proc_view(ProcmanApp *app, GtkBuilder * builder)
+create_proc_view(GsmApplication *app, GtkBuilder * builder)
 {
     GtkWidget *proctree;
     GtkWidget *scrolled;
@@ -148,7 +148,7 @@ static void change_settings_color(GSettings *settings, const char *key,
 static void
 cb_mem_color_changed (GSMColorButton *cp, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
     change_settings_color (app->settings, GSM_SETTING_MEM_COLOR, cp);
 }
 
@@ -156,26 +156,26 @@ cb_mem_color_changed (GSMColorButton *cp, gpointer data)
 static void
 cb_swap_color_changed (GSMColorButton *cp, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
     change_settings_color (app->settings, GSM_SETTING_SWAP_COLOR, cp);
 }
 
 static void
 cb_net_in_color_changed (GSMColorButton *cp, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
     change_settings_color (app->settings, GSM_SETTING_NET_IN_COLOR, cp);
 }
 
 static void
 cb_net_out_color_changed (GSMColorButton *cp, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
     change_settings_color(app->settings, GSM_SETTING_NET_OUT_COLOR, cp);
 }
 
 static void
-create_sys_view (ProcmanApp *app, GtkBuilder * builder)
+create_sys_view (GsmApplication *app, GtkBuilder * builder)
 {
     GtkWidget *cpu_graph_box, *mem_graph_box, *net_graph_box;
     GtkWidget *cpu_exp, *mem_exp, *net_exp;
@@ -356,7 +356,7 @@ create_sys_view (ProcmanApp *app, GtkBuilder * builder)
 static void
 on_activate_about (GSimpleAction *, GVariant *, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     const gchar * const authors[] = {
         "Kevin Vandersloot",
@@ -404,12 +404,12 @@ on_activate_about (GSimpleAction *, GVariant *, gpointer data)
 static void
 on_activate_refresh (GSimpleAction *, GVariant *, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
     proctable_update (app);
 }
 
 static void
-kill_process_with_confirmation (ProcmanApp *app, int signal) {
+kill_process_with_confirmation (GsmApplication *app, int signal) {
     gboolean kill_dialog = g_settings_get_boolean (app->settings, GSM_SETTING_SHOW_KILL_DIALOG);
 
     if (kill_dialog)
@@ -421,7 +421,7 @@ kill_process_with_confirmation (ProcmanApp *app, int signal) {
 static void
 on_activate_send_signal (GSimpleAction *, GVariant *parameter, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     /* no confirmation */
     gint32 signal = g_variant_get_int32(parameter);
@@ -440,7 +440,7 @@ on_activate_send_signal (GSimpleAction *, GVariant *parameter, gpointer data)
 static void
 on_activate_memory_maps (GSimpleAction *, GVariant *, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     create_memmaps_dialog (app);
 }
@@ -448,7 +448,7 @@ on_activate_memory_maps (GSimpleAction *, GVariant *, gpointer data)
 static void
 on_activate_open_files (GSimpleAction *, GVariant *, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     create_openfiles_dialog (app);
 }
@@ -456,7 +456,7 @@ on_activate_open_files (GSimpleAction *, GVariant *, gpointer data)
 static void
 on_activate_process_properties (GSimpleAction *, GVariant *, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     create_procproperties_dialog (app);
 }
@@ -478,7 +478,7 @@ on_activate_toggle (GSimpleAction *action, GVariant *parameter, gpointer data)
 static void
 change_show_page_state (GSimpleAction *action, GVariant *state, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     g_simple_action_set_state (action, state);
     g_settings_set_value (app->settings, GSM_SETTING_CURRENT_TAB, state);
@@ -487,7 +487,7 @@ change_show_page_state (GSimpleAction *action, GVariant *state, gpointer data)
 static void
 change_show_processes_state (GSimpleAction *action, GVariant *state, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     g_simple_action_set_state (action, state);
     g_settings_set_value (app->settings, GSM_SETTING_SHOW_WHOSE_PROCESSES, state);
@@ -496,7 +496,7 @@ change_show_processes_state (GSimpleAction *action, GVariant *state, gpointer da
 static void
 change_show_dependencies_state (GSimpleAction *action, GVariant *state, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     g_simple_action_set_state (action, state);
     g_settings_set_value (app->settings, GSM_SETTING_SHOW_DEPENDENCIES, state);
@@ -505,7 +505,7 @@ change_show_dependencies_state (GSimpleAction *action, GVariant *state, gpointer
 static void
 on_activate_priority (GSimpleAction *action, GVariant *parameter, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     g_action_change_state (G_ACTION (action), parameter);
 
@@ -528,7 +528,7 @@ change_priority_state (GSimpleAction *action, GVariant *state, gpointer data)
 }
 
 void
-update_page_activities (ProcmanApp *app)
+update_page_activities (GsmApplication *app)
 {
     const char *current_page = gtk_stack_get_visible_child_name (GTK_STACK (app->stack));
 
@@ -578,13 +578,13 @@ update_page_activities (ProcmanApp *app)
 static void
 cb_change_current_page (GtkStack *stack, GParamSpec *pspec, gpointer data)
 {
-    update_page_activities ((ProcmanApp *)data);
+    update_page_activities ((GsmApplication *)data);
 }
 
 static gboolean
 cb_main_window_delete (GtkWidget *window, GdkEvent *event, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     app->shutdown ();
 
@@ -592,7 +592,7 @@ cb_main_window_delete (GtkWidget *window, GdkEvent *event, gpointer data)
 }
 
 void
-create_main_window (ProcmanApp *app)
+create_main_window (GsmApplication *app)
 {
     GtkWidget *main_window;
     GtkWidget *stack;
@@ -695,7 +695,7 @@ create_main_window (ProcmanApp *app)
 }
 
 void
-update_sensitivity(ProcmanApp *app)
+update_sensitivity(GsmApplication *app)
 {
     const char * const selected_actions[] = { "send-signal-stop",
                                               "send-signal-cont",
diff --git a/src/interface.h b/src/interface.h
index b97ad84..bae96cb 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -23,9 +23,9 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include "procman-app.h"
+#include "application.h"
 
-void            create_main_window (ProcmanApp *app);
-void            update_sensitivity (ProcmanApp *app);
+void            create_main_window (GsmApplication *app);
+void            update_sensitivity (GsmApplication *app);
 
 #endif /* _PROCMAN_INTERFACE_H_ */
diff --git a/src/load-graph.cpp b/src/load-graph.cpp
index 1faa622..54250ab 100644
--- a/src/load-graph.cpp
+++ b/src/load-graph.cpp
@@ -23,7 +23,7 @@
 
 #include <algorithm>
 
-#include "procman-app.h"
+#include "application.h"
 #include "load-graph.h"
 #include "util.h"
 #include "gsm_color_button.h"
@@ -91,7 +91,7 @@ void draw_background(LoadGraph *graph) {
                                                            allocation.height);
     cr = cairo_create (graph->background);
 
-    GtkStyleContext *context = gtk_widget_get_style_context (ProcmanApp::get()->stack);
+    GtkStyleContext *context = gtk_widget_get_style_context (GsmApplication::get()->stack);
     
     gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &fg);
 
@@ -133,7 +133,7 @@ void draw_background(LoadGraph *graph) {
         } else {
             // operation orders matters so it's 0 if i == num_bars
             guint max = 100;
-            if (graph->type == LOAD_GRAPH_CPU && !ProcmanApp::get()->config.solaris_mode) {
+            if (graph->type == LOAD_GRAPH_CPU && !GsmApplication::get()->config.solaris_mode) {
                 max = 100 * graph->n;
             }
             caption = g_strdup_printf("%d %%", max - i * (max / num_bars));
@@ -268,7 +268,7 @@ load_graph_draw (GtkWidget *widget,
                      graph->real_draw_height + FRAME_WIDTH - 1);
     cairo_clip(cr);
 
-    bool drawStacked = graph->type == LOAD_GRAPH_CPU && ProcmanApp::get()->config.draw_stacked;
+    bool drawStacked = graph->type == LOAD_GRAPH_CPU && GsmApplication::get()->config.draw_stacked;
     for (j = graph->n-1; j >= 0; j--) {
         gdk_cairo_set_source_rgba (cr, &(graph->colors [j]));
         if (drawStacked) {
@@ -335,7 +335,7 @@ get_load (LoadGraph *graph)
     // that value has no meaning, we just want all the
     // graphs to be aligned, so the CPU graph needs to start
     // immediately
-    bool drawStacked = graph->type == LOAD_GRAPH_CPU && ProcmanApp::get()->config.draw_stacked;
+    bool drawStacked = graph->type == LOAD_GRAPH_CPU && GsmApplication::get()->config.draw_stacked;
 
     for (i = 0; i < graph->n; i++) {
         float load;
@@ -482,7 +482,7 @@ net_scale (LoadGraph *graph, guint64 din, guint64 dout)
 
     const guint64 bak_max(new_max);
 
-    if (ProcmanApp::get()->config.network_in_bits) {
+    if (GsmApplication::get()->config.network_in_bits) {
         // nice number is for the ticks
         unsigned ticks = graph->num_bars();
 
@@ -727,7 +727,7 @@ LoadGraph::LoadGraph(guint type)
     switch (type) {
         case LOAD_GRAPH_CPU:
             memset(&cpu, 0, sizeof cpu);
-            n = ProcmanApp::get()->config.num_cpus;
+            n = GsmApplication::get()->config.num_cpus;
 
             for(guint i = 0; i < G_N_ELEMENTS(labels.cpu); ++i)
                 labels.cpu[i] = gtk_label_new(NULL);
@@ -771,26 +771,26 @@ LoadGraph::LoadGraph(guint type)
             break;
     }
 
-    speed  = ProcmanApp::get()->config.graph_update_interval;
+    speed  = GsmApplication::get()->config.graph_update_interval;
 
     colors.resize(n);
 
     switch (type) {
         case LOAD_GRAPH_CPU:
-            memcpy(&colors[0], ProcmanApp::get()->config.cpu_color,
+            memcpy(&colors[0], GsmApplication::get()->config.cpu_color,
                    n * sizeof colors[0]);
             break;
         case LOAD_GRAPH_MEM:
-            colors[0] = ProcmanApp::get()->config.mem_color;
-            colors[1] = ProcmanApp::get()->config.swap_color;
+            colors[0] = GsmApplication::get()->config.mem_color;
+            colors[1] = GsmApplication::get()->config.swap_color;
             mem_color_picker = gsm_color_button_new (&colors[0],
                                                         GSMCP_TYPE_PIE);
             swap_color_picker = gsm_color_button_new (&colors[1],
                                                          GSMCP_TYPE_PIE);
             break;
         case LOAD_GRAPH_NET:
-            colors[0] = ProcmanApp::get()->config.net_in_color;
-            colors[1] = ProcmanApp::get()->config.net_out_color;
+            colors[0] = GsmApplication::get()->config.net_in_color;
+            colors[1] = GsmApplication::get()->config.net_out_color;
             break;
     }
 
diff --git a/src/lsof.cpp b/src/lsof.cpp
index 69c93b0..e112f13 100644
--- a/src/lsof.cpp
+++ b/src/lsof.cpp
@@ -17,7 +17,7 @@
 
 #include <glibmm/regex.h>
 
-#include "procman-app.h"
+#include "application.h"
 #include "lsof.h"
 #include "util.h"
 
@@ -90,7 +90,7 @@ namespace
         GtkEntry *entry;
         GtkWindow *window;
         GtkLabel *count;
-        ProcmanApp *app;
+        GsmApplication *app;
         bool case_insensitive;
 
 
@@ -236,7 +236,7 @@ namespace
 
 
 
-void procman_lsof(ProcmanApp *app)
+void procman_lsof(GsmApplication *app)
 {
     GtkListStore *model = \
         gtk_list_store_new(PROCMAN_LSOF_NCOLS,
diff --git a/src/lsof.h b/src/lsof.h
index 89cba91..57b97a1 100644
--- a/src/lsof.h
+++ b/src/lsof.h
@@ -3,8 +3,8 @@
 #define H_PROCMAN_LSOF_1161179202
 
 #include <glib.h>
-#include "procman-app.h"
+#include "application.h"
 
-void procman_lsof(ProcmanApp *app);
+void procman_lsof(GsmApplication *app);
 
 #endif /* H_PROCMAN_LSOF_1161179202 */
diff --git a/src/memmaps.cpp b/src/memmaps.cpp
index a554d84..649e2fe 100644
--- a/src/memmaps.cpp
+++ b/src/memmaps.cpp
@@ -15,7 +15,7 @@
 using std::string;
 
 
-#include "procman-app.h"
+#include "application.h"
 #include "memmaps.h"
 #include "proctable.h"
 #include "settings-keys.h"
@@ -331,7 +331,7 @@ dialog_response (GtkDialog * dialog, gint response_id, gpointer data)
 
 
 static MemMapsData*
-create_memmapsdata (ProcmanApp *app)
+create_memmapsdata (GsmApplication *app)
 {
     GtkWidget *tree;
     GtkListStore *model;
@@ -450,7 +450,7 @@ static void
 create_single_memmaps_dialog (GtkTreeModel *model, GtkTreePath *path,
                               GtkTreeIter *iter, gpointer data)
 {
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
+    GsmApplication *app = static_cast<GsmApplication *>(data);
     MemMapsData *mmdata;
     GtkWidget *memmapsdialog;
     GtkWidget *dialog_vbox;
@@ -508,7 +508,7 @@ create_single_memmaps_dialog (GtkTreeModel *model, GtkTreePath *path,
 
 
 void
-create_memmaps_dialog (ProcmanApp *app)
+create_memmaps_dialog (GsmApplication *app)
 {
     /* TODO: do we really want to open multiple dialogs ? */
     gtk_tree_selection_selected_foreach (app->selection, create_single_memmaps_dialog,
diff --git a/src/memmaps.h b/src/memmaps.h
index c42fcb1..65dba7d 100644
--- a/src/memmaps.h
+++ b/src/memmaps.h
@@ -3,8 +3,8 @@
 #define _PROCMAN_MEMMAPS_H_
 
 #include <glib.h>
-#include "procman-app.h"
+#include "application.h"
 
-void            create_memmaps_dialog (ProcmanApp *app);
+void            create_memmaps_dialog (GsmApplication *app);
 
 #endif /* _PROCMAN_MEMMAPS_H_ */
diff --git a/src/openfiles.cpp b/src/openfiles.cpp
index ca122d0..2b5277f 100644
--- a/src/openfiles.cpp
+++ b/src/openfiles.cpp
@@ -10,7 +10,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "procman-app.h"
+#include "application.h"
 #include "openfiles.h"
 #include "proctable.h"
 #include "util.h"
@@ -237,7 +237,7 @@ close_openfiles_dialog (GtkDialog *dialog, gint id, gpointer data)
 
 
 static GtkWidget *
-create_openfiles_tree (ProcmanApp *app)
+create_openfiles_tree (GsmApplication *app)
 {
     GtkWidget *tree;
     GtkListStore *model;
@@ -320,7 +320,7 @@ static void
 create_single_openfiles_dialog (GtkTreeModel *model, GtkTreePath *path,
                                 GtkTreeIter *iter, gpointer data)
 {
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
+    GsmApplication *app = static_cast<GsmApplication *>(data);
     GtkWidget *openfilesdialog;
     GtkWidget *cmd_grid;
     GtkWidget *label;
@@ -373,7 +373,7 @@ create_single_openfiles_dialog (GtkTreeModel *model, GtkTreePath *path,
 
 
 void
-create_openfiles_dialog (ProcmanApp *app)
+create_openfiles_dialog (GsmApplication *app)
 {
     gtk_tree_selection_selected_foreach (app->selection, create_single_openfiles_dialog,
                                          app);
diff --git a/src/openfiles.h b/src/openfiles.h
index 1af6649..86158af 100644
--- a/src/openfiles.h
+++ b/src/openfiles.h
@@ -4,8 +4,8 @@
 
 #include <glib.h>
 
-#include "procman-app.h"
+#include "application.h"
 
-void            create_openfiles_dialog (ProcmanApp *app);
+void            create_openfiles_dialog (GsmApplication *app);
 
 #endif
diff --git a/src/prefsdialog.cpp b/src/prefsdialog.cpp
index 66e9e29..a649464 100644
--- a/src/prefsdialog.cpp
+++ b/src/prefsdialog.cpp
@@ -55,7 +55,7 @@ private:
     {
         int new_value = int(1000 * gtk_spin_button_get_value(spin));
 
-        g_settings_set_int(ProcmanApp::get()->settings,
+        g_settings_set_int(GsmApplication::get()->settings,
                            this->key.c_str(), new_value);
 
         procman_debug("set %s to %d", this->key.c_str(), new_value);
@@ -72,7 +72,7 @@ field_toggled (const gchar *gsettings_parent, GtkCellRendererToggle *cell, gchar
     GtkTreeIter iter;
     GtkTreeViewColumn *column;
     gboolean toggled;
-    GSettings *settings = g_settings_get_child (ProcmanApp::get()->settings, gsettings_parent);
+    GSettings *settings = g_settings_get_child (GsmApplication::get()->settings, gsettings_parent);
     gchar *key;
     int id;
 
@@ -193,7 +193,7 @@ create_field_page(GtkBuilder* builder, GtkWidget *tree, const gchar *widgetname)
 }
 
 void
-create_preferences_dialog (ProcmanApp *app)
+create_preferences_dialog (GsmApplication *app)
 {
     typedef SpinButtonUpdater SBU;
 
diff --git a/src/prefsdialog.h b/src/prefsdialog.h
index d708af0..d52dd76 100644
--- a/src/prefsdialog.h
+++ b/src/prefsdialog.h
@@ -1,5 +1,5 @@
 /* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
-#include "procman-app.h"
+#include "application.h"
 
-void create_preferences_dialog (ProcmanApp *app);
+void create_preferences_dialog (GsmApplication *app);
diff --git a/src/procactions.cpp b/src/procactions.cpp
index 626d0fb..0f192c2 100644
--- a/src/procactions.cpp
+++ b/src/procactions.cpp
@@ -27,7 +27,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include "procactions.h"
-#include "procman-app.h"
+#include "application.h"
 #include "proctable.h"
 #include "procdialogs.h"
 
@@ -91,7 +91,7 @@ renice_single_process (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter
 
 
 void
-renice (ProcmanApp *app, int nice)
+renice (GsmApplication *app, int nice)
 {
     struct ReniceArgs args = { app, nice };
 
@@ -169,7 +169,7 @@ kill_single_process (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
 
 
 void
-kill_process (ProcmanApp *app, int sig)
+kill_process (GsmApplication *app, int sig)
 {
     struct KillArgs args = { app, sig };
 
diff --git a/src/procactions.h b/src/procactions.h
index b956227..07a4643 100644
--- a/src/procactions.h
+++ b/src/procactions.h
@@ -20,10 +20,10 @@
 #ifndef _PROCACTIONS_H_
 #define _PROCACTIONS_H_
 
-#include "procman-app.h"
+#include "application.h"
 
-void            renice (ProcmanApp *app, int nice);
-void            kill_process (ProcmanApp *app, int sig);
+void            renice (GsmApplication *app, int nice);
+void            kill_process (GsmApplication *app, int sig);
 
 #endif
 
diff --git a/src/procdialogs.cpp b/src/procdialogs.cpp
index 15fadab..d38bd35 100644
--- a/src/procdialogs.cpp
+++ b/src/procdialogs.cpp
@@ -55,7 +55,7 @@ kill_dialog_button_pressed (GtkDialog *dialog, gint id, gpointer data)
 }
 
 void
-procdialog_create_kill_dialog (ProcmanApp *app, int signal)
+procdialog_create_kill_dialog (GsmApplication *app, int signal)
 {
     GtkWidget *kill_alert_dialog;
     gchar *primary, *secondary, *button_text;
@@ -149,7 +149,7 @@ renice_scale_changed (GtkAdjustment *adj, gpointer data)
 static void
 renice_dialog_button_pressed (GtkDialog *dialog, gint id, gpointer data)
 {
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
+    GsmApplication *app = static_cast<GsmApplication *>(data);
     if (id == 100) {
         if (new_nice_value == -100)
             return;
@@ -161,7 +161,7 @@ renice_dialog_button_pressed (GtkDialog *dialog, gint id, gpointer data)
 }
 
 void
-procdialog_create_renice_dialog (ProcmanApp *app)
+procdialog_create_renice_dialog (GsmApplication *app)
 {
     ProcInfo *info;
     
@@ -253,7 +253,7 @@ procman_action_to_command(ProcmanActionType type,
  */
 gboolean
 procdialog_create_root_password_dialog(ProcmanActionType type,
-                                       ProcmanApp *app,
+                                       GsmApplication *app,
                                        gint pid,
                                        gint extra_value)
 {
diff --git a/src/procdialogs.h b/src/procdialogs.h
index 2cc9435..2b43b95 100644
--- a/src/procdialogs.h
+++ b/src/procdialogs.h
@@ -22,7 +22,7 @@
 
 
 #include <glib.h>
-#include "procman-app.h"
+#include "application.h"
 
 /* These are the actual range of settable values. Values outside this range
    are scaled back to these limits. So show these limits in the slider
@@ -43,12 +43,12 @@ typedef enum
 } ProcmanActionType;
 
 
-void                    procdialog_create_kill_dialog (ProcmanApp *app, int signal);
-void                    procdialog_create_renice_dialog (ProcmanApp *app);
+void                    procdialog_create_kill_dialog (GsmApplication *app, int signal);
+void                    procdialog_create_renice_dialog (GsmApplication *app);
 gboolean                procdialog_create_root_password_dialog (ProcmanActionType type,
-                                                                ProcmanApp *app,
+                                                                GsmApplication *app,
                                                                 gint pid, gint extra_value);
-void                    procdialog_create_memmaps_dialog (ProcmanApp *app);
+void                    procdialog_create_memmaps_dialog (GsmApplication *app);
 
 #endif
 
diff --git a/src/procman.cpp b/src/procman.cpp
index be5a2e1..ca242b9 100644
--- a/src/procman.cpp
+++ b/src/procman.cpp
@@ -27,7 +27,7 @@
 #include <gtkmm.h>
 #include <glib/gi18n.h>
 
-#include "procman-app.h"
+#include "application.h"
 
 
 int
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
     textdomain (GETTEXT_PACKAGE);
     setlocale (LC_ALL, "");
 
-    Glib::RefPtr<ProcmanApp> application = ProcmanApp::get();
+    Glib::RefPtr<GsmApplication> application = GsmApplication::get();
     return application->run (argc, argv);
 }
 
diff --git a/src/procman_gksu.cpp b/src/procman_gksu.cpp
index 43a8a52..cbdaee1 100644
--- a/src/procman_gksu.cpp
+++ b/src/procman_gksu.cpp
@@ -1,7 +1,7 @@
 /* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include <config.h>
 
-#include "procman-app.h"
+#include "application.h"
 #include "procman_gksu.h"
 #include "util.h"
 
diff --git a/src/procman_gnomesu.cpp b/src/procman_gnomesu.cpp
index 3555ada..661a14b 100644
--- a/src/procman_gnomesu.cpp
+++ b/src/procman_gnomesu.cpp
@@ -3,7 +3,7 @@
 
 #include <glib.h>
 
-#include "procman-app.h"
+#include "application.h"
 #include "procman_gnomesu.h"
 #include "util.h"
 
diff --git a/src/procman_pkexec.cpp b/src/procman_pkexec.cpp
index ae2fe57..252455d 100644
--- a/src/procman_pkexec.cpp
+++ b/src/procman_pkexec.cpp
@@ -1,7 +1,7 @@
 /* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include <config.h>
 
-#include "procman-app.h"
+#include "application.h"
 #include "procman_pkexec.h"
 #include "util.h"
 
diff --git a/src/procproperties.cpp b/src/procproperties.cpp
index e9b8ca0..c3e0316 100644
--- a/src/procproperties.cpp
+++ b/src/procproperties.cpp
@@ -32,7 +32,7 @@
 #include <sys/sysctl.h>
 #endif
 
-#include "procman-app.h"
+#include "application.h"
 #include "procproperties.h"
 #include "proctable.h"
 #include "util.h"
@@ -143,7 +143,7 @@ close_procprop_dialog (GtkDialog *dialog, gint id, gpointer data)
 }
 
 static GtkWidget *
-create_procproperties_tree (ProcmanApp *app, ProcInfo *info)
+create_procproperties_tree (GsmApplication *app, ProcInfo *info)
 {
     GtkWidget *tree;
     GtkListStore *model;
@@ -195,7 +195,7 @@ static void
 create_single_procproperties_dialog (GtkTreeModel *model, GtkTreePath *path,
                                      GtkTreeIter *iter, gpointer data)
 {
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
+    GsmApplication *app = static_cast<GsmApplication *>(data);
 
     GtkWidget *procpropdialog;
     GtkWidget *dialog_vbox, *vbox;
@@ -263,7 +263,7 @@ create_single_procproperties_dialog (GtkTreeModel *model, GtkTreePath *path,
 }
 
 void
-create_procproperties_dialog (ProcmanApp *app)
+create_procproperties_dialog (GsmApplication *app)
 {
     gtk_tree_selection_selected_foreach (app->selection, create_single_procproperties_dialog,
                                          app);
diff --git a/src/procproperties.h b/src/procproperties.h
index 98d8d47..a1f47b9 100644
--- a/src/procproperties.h
+++ b/src/procproperties.h
@@ -24,9 +24,9 @@
 
 #include <glib.h>
 
-#include "procman-app.h"
+#include "application.h"
 
-void create_procproperties_dialog (ProcmanApp *app);
+void create_procproperties_dialog (GsmApplication *app);
 
 #endif
 
diff --git a/src/proctable.cpp b/src/proctable.cpp
index a8a039d..baacfca 100644
--- a/src/proctable.cpp
+++ b/src/proctable.cpp
@@ -54,7 +54,7 @@
 #include <libwnck/libwnck.h>
 #endif
 
-#include "procman-app.h"
+#include "application.h"
 #include "proctable.h"
 #include "prettytable.h"
 #include "util.h"
@@ -77,7 +77,7 @@ ProcInfo* ProcInfo::find(pid_t pid)
 static void
 cb_columns_changed(GtkTreeView *treeview, gpointer data)
 {
-    ProcmanApp * const app = static_cast<ProcmanApp *>(data);
+    GsmApplication * const app = static_cast<GsmApplication *>(data);
 
     procman_save_tree_state (app->settings,
                              GTK_WIDGET(treeview),
@@ -87,7 +87,7 @@ cb_columns_changed(GtkTreeView *treeview, gpointer data)
 static void
 cb_sort_changed (GtkTreeSortable *model, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     procman_save_tree_state (app->settings,
                              GTK_WIDGET (app->tree),
@@ -179,7 +179,7 @@ cb_proctree_destroying (GtkTreeView *self, gpointer data)
 static gboolean
 cb_tree_button_pressed (GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     if (gdk_event_triggers_context_menu ((GdkEvent *) event)) {
         gtk_menu_popup (GTK_MENU (app->popup_menu),
@@ -194,7 +194,7 @@ cb_tree_button_pressed (GtkWidget *widget, GdkEventButton *event, gpointer data)
 static gboolean
 cb_tree_popup_menu (GtkWidget *widget, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     gtk_menu_popup (GTK_MENU (app->popup_menu),
                     NULL, NULL, NULL, NULL,
@@ -215,7 +215,7 @@ get_last_selected (GtkTreeModel *model, GtkTreePath *path,
 void
 cb_row_selected (GtkTreeSelection *selection, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     app->selection = selection;
 
@@ -251,7 +251,7 @@ cb_row_selected (GtkTreeSelection *selection, gpointer data)
 static gint
 cb_timeout (gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
     guint new_interval;
 
     proctable_update (app);
@@ -269,7 +269,7 @@ cb_timeout (gpointer data)
 static void
 cb_refresh_icons (GtkIconTheme *theme, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     if(app->timeout) {
         g_source_remove (app->timeout);
@@ -305,7 +305,7 @@ iter_matches_search_key (GtkTreeModel *model, GtkTreeIter *iter, const gchar *ke
 static gboolean
 process_visibility_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 {
-    ProcmanApp * const app = static_cast<ProcmanApp *>(data);
+    GsmApplication * const app = static_cast<GsmApplication *>(data);
     const gchar * search_text = app->search_entry == NULL ? "" : gtk_entry_get_text (GTK_ENTRY 
(app->search_entry));
     GtkTreePath *tree_path = gtk_tree_model_get_path (model, iter);
 
@@ -342,7 +342,7 @@ process_visibility_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 }
 
 static void
-proctable_clear_tree (ProcmanApp * const app)
+proctable_clear_tree (GsmApplication * const app)
 {
     GtkTreeModel *model;
 
@@ -360,7 +360,7 @@ proctable_clear_tree (ProcmanApp * const app)
 static void
 cb_show_dependencies_changed (GSettings *settings, const gchar *key, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     gtk_tree_view_set_show_expanders (GTK_TREE_VIEW (app->tree),
                                       g_settings_get_boolean (settings, GSM_SETTING_SHOW_DEPENDENCIES));
@@ -372,14 +372,14 @@ cb_show_dependencies_changed (GSettings *settings, const gchar *key, gpointer da
 static void
 cb_show_whose_processes_changed (GSettings *settings, const gchar *key, gpointer data)
 {
-    ProcmanApp *app = (ProcmanApp *) data;
+    GsmApplication *app = (GsmApplication *) data;
 
     proctable_clear_tree (app);
     proctable_update (app);
 }
 
 GtkWidget *
-proctable_new (ProcmanApp * const app)
+proctable_new (GsmApplication * const app)
 {
     GtkWidget *proctree;
     GtkTreeStore *model;
@@ -814,7 +814,7 @@ update_info_mutable_cols(ProcInfo *info)
     GtkTreeModel *model;
     model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (
             gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(
-            gtk_tree_view_get_model (GTK_TREE_VIEW(ProcmanApp::get()->tree))))));
+            gtk_tree_view_get_model (GTK_TREE_VIEW(GsmApplication::get()->tree))))));
 
     using procman::tree_store_update;
 
@@ -840,7 +840,7 @@ update_info_mutable_cols(ProcInfo *info)
 }
 
 static void
-insert_info_to_tree (ProcInfo *info, ProcmanApp *app, bool forced = false)
+insert_info_to_tree (ProcInfo *info, GsmApplication *app, bool forced = false)
 {
     GtkTreeModel *model;
     GtkTreeModel *filtered;
@@ -902,7 +902,7 @@ insert_info_to_tree (ProcInfo *info, ProcmanApp *app, bool forced = false)
 */
 template<typename List>
 static void
-remove_info_from_tree (ProcmanApp *app, GtkTreeModel *model,
+remove_info_from_tree (GsmApplication *app, GtkTreeModel *model,
                        ProcInfo *current, List &orphans, unsigned lvl = 0)
 {
     GtkTreeIter child_node;
@@ -963,7 +963,7 @@ get_process_systemd_info(ProcInfo *info)
 }
 
 static void
-update_info (ProcmanApp *app, ProcInfo *info)
+update_info (GsmApplication *app, ProcInfo *info)
 {
     glibtop_proc_state procstate;
     glibtop_proc_uid procuid;
@@ -1053,7 +1053,7 @@ ProcInfo::ProcInfo(pid_t pid)
 }
 
 static void
-refresh_list (ProcmanApp *app, const pid_t* pid_list, const guint n)
+refresh_list (GsmApplication *app, const pid_t* pid_list, const guint n)
 {
     typedef std::list<ProcInfo*> ProcList;
     ProcList addition;
@@ -1174,7 +1174,7 @@ refresh_list (ProcmanApp *app, const pid_t* pid_list, const guint n)
 }
 
 static void
-proctable_update_list (ProcmanApp *app)
+proctable_update_list (GsmApplication *app)
 {
     pid_t* pid_list;
     glibtop_proclist proclist;
@@ -1238,7 +1238,7 @@ proctable_update_list (ProcmanApp *app)
 }
 
 void
-proctable_update (ProcmanApp * const app)
+proctable_update (GsmApplication * const app)
 {
     char* string;
 
@@ -1250,7 +1250,7 @@ proctable_update (ProcmanApp * const app)
 }
 
 void
-proctable_free_table (ProcmanApp * const app)
+proctable_free_table (GsmApplication * const app)
 {
     for (ProcInfo::Iterator it(ProcInfo::begin()); it != ProcInfo::end(); ++it)
         delete it->second;
@@ -1281,14 +1281,14 @@ ProcInfo::set_icon(Glib::RefPtr<Gdk::Pixbuf> icon)
     GtkTreeModel *model;
     model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (
             gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(
-            gtk_tree_view_get_model (GTK_TREE_VIEW(ProcmanApp::get()->tree))))));
+            gtk_tree_view_get_model (GTK_TREE_VIEW(GsmApplication::get()->tree))))));
     gtk_tree_store_set(GTK_TREE_STORE(model), &this->node,
                        COL_PIXBUF, (this->pixbuf ? this->pixbuf->gobj() : NULL),
                        -1);
 }
 
 void
-proctable_freeze (ProcmanApp *app)
+proctable_freeze (GsmApplication *app)
 {
     if (app->timeout) {
       g_source_remove (app->timeout);
@@ -1297,7 +1297,7 @@ proctable_freeze (ProcmanApp *app)
 }
 
 void
-proctable_thaw (ProcmanApp *app)
+proctable_thaw (GsmApplication *app)
 {
     app->timeout = g_timeout_add (app->config.update_interval,
                                   cb_timeout,
@@ -1305,7 +1305,7 @@ proctable_thaw (ProcmanApp *app)
 }
 
 void
-proctable_reset_timeout (ProcmanApp *app)
+proctable_reset_timeout (GsmApplication *app)
 {
     proctable_freeze (app);
     proctable_thaw (app);
diff --git a/src/proctable.h b/src/proctable.h
index d81a797..6446ea9 100644
--- a/src/proctable.h
+++ b/src/proctable.h
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include "procman-app.h"
+#include "application.h"
 
 enum
 {
@@ -57,12 +57,12 @@ enum
 };
 
 
-GtkWidget*      proctable_new (ProcmanApp *app);
-void            proctable_update (ProcmanApp *app);
-void            proctable_free_table (ProcmanApp *app);
-void            proctable_freeze (ProcmanApp *app);
-void            proctable_thaw (ProcmanApp *app);
-void            proctable_reset_timeout (ProcmanApp *app);
+GtkWidget*      proctable_new (GsmApplication *app);
+void            proctable_update (GsmApplication *app);
+void            proctable_free_table (GsmApplication *app);
+void            proctable_freeze (GsmApplication *app);
+void            proctable_thaw (GsmApplication *app);
+void            proctable_reset_timeout (GsmApplication *app);
 
 GSList*         proctable_get_columns_order(GtkTreeView *treeview);
 void            proctable_set_columns_order(GtkTreeView *treeview, GSList *order);
diff --git a/src/selinux.cpp b/src/selinux.cpp
index 4c45cad..a9596d5 100644
--- a/src/selinux.cpp
+++ b/src/selinux.cpp
@@ -4,7 +4,7 @@
 #include <glib.h>
 
 #include "selinux.h"
-#include "procman-app.h"
+#include "application.h"
 #include "util.h"
 
 
diff --git a/src/selinux.h b/src/selinux.h
index 0d6529f..be75af7 100644
--- a/src/selinux.h
+++ b/src/selinux.h
@@ -4,7 +4,7 @@
 
 #include <glib.h>
 
-#include "procman-app.h"
+#include "application.h"
 
 void
 get_process_selinux_context (ProcInfo *info);
diff --git a/src/smooth_refresh.cpp b/src/smooth_refresh.cpp
index ed347e0..38737d1 100644
--- a/src/smooth_refresh.cpp
+++ b/src/smooth_refresh.cpp
@@ -12,7 +12,7 @@
 #include <algorithm>
 
 #include "smooth_refresh.h"
-#include "procman-app.h"
+#include "application.h"
 #include "settings-keys.h"
 #include "util.h"
 
@@ -85,7 +85,7 @@ void SmoothRefresh::reset()
     glibtop_get_cpu(&cpu);
     glibtop_get_proc_time(&proctime, getpid());
 
-    this->interval = ProcmanApp::get()->config.update_interval;
+    this->interval = GsmApplication::get()->config.update_interval;
     this->last_pcpu = PCPU_LO;
     this->last_total_time = cpu.total;
     this->last_cpu_time = proctime.rtime;
@@ -104,7 +104,7 @@ SmoothRefresh::~SmoothRefresh()
 bool
 SmoothRefresh::get(guint &new_interval)
 {
-    const unsigned config_interval = ProcmanApp::get()->config.update_interval;
+    const unsigned config_interval = GsmApplication::get()->config.update_interval;
 
     g_assert(this->interval >= config_interval);
 
diff --git a/src/util.cpp b/src/util.cpp
index d0389ad..71d9e78 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -13,7 +13,7 @@
 #include <cstring>
 
 #include "util.h"
-#include "procman-app.h"
+#include "application.h"
 
 extern "C" {
 #include "e_date.h"
@@ -504,7 +504,7 @@ namespace procman
 
         g_value_unset(&value);
 
-        time = 100 * time / ProcmanApp::get()->frequency;
+        time = 100 * time / GsmApplication::get()->frequency;
         char *str = format_duration_for_display(time);
         g_object_set(renderer, "text", str, NULL);
         g_free(str);
@@ -638,7 +638,7 @@ namespace procman
 
     std::string format_network(guint64 rate, guint64 max_rate)
     {
-        char* bytes = procman::format_size(rate, max_rate, ProcmanApp::get()->config.network_in_bits);
+        char* bytes = procman::format_size(rate, max_rate, GsmApplication::get()->config.network_in_bits);
         std::string formatted(bytes);
         g_free(bytes);
         return formatted;
@@ -647,7 +647,7 @@ namespace procman
 
     std::string format_network_rate(guint64 rate, guint64 max_rate)
     {
-        return procman::format_rate(rate, max_rate, ProcmanApp::get()->config.network_in_bits);
+        return procman::format_rate(rate, max_rate, GsmApplication::get()->config.network_in_bits);
     }
 
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]