diff options
| author | Stefano Karapetsas <[email protected]> | 2012-07-12 15:33:28 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-07-12 15:33:28 +0200 |
| commit | 4f9e5e2320f0a27fe676962b71d5160efec479a7 (patch) | |
| tree | efdcf581bf8c93067dd739841d0a3f2b0761ea6f /src/prettytable.h | |
| parent | 45959215873762f93accd1384d40b145c007f100 (diff) | |
| parent | 3fa35a8281ee5088b7e2222b683e5d9191cfd902 (diff) | |
| download | mate-system-monitor-4f9e5e2320f0a27fe676962b71d5160efec479a7.tar.bz2 mate-system-monitor-4f9e5e2320f0a27fe676962b71d5160efec479a7.tar.xz | |
Merge branch 'master' of github.com:mate-desktop/mate-system-monitor
Diffstat (limited to 'src/prettytable.h')
| -rw-r--r-- | src/prettytable.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/prettytable.h b/src/prettytable.h index 7884cdd..bfb45f5 100644 --- a/src/prettytable.h +++ b/src/prettytable.h @@ -12,8 +12,7 @@ #include <string> extern "C" { -#define WNCK_I_KNOW_THIS_IS_UNSTABLE -#include <libwnck/libwnck.h> +#include <libmatewnck/libmatewnck.h> } #include "iconthemewrapper.h" @@ -34,8 +33,8 @@ class PrettyTable private: - static void on_application_opened(WnckScreen* screen, WnckApplication* app, gpointer data); - static void on_application_closed(WnckScreen* screen, WnckApplication* app, gpointer data); + static void on_application_opened(MatewnckScreen* screen, MatewnckApplication* app, gpointer data); + static void on_application_closed(MatewnckScreen* screen, MatewnckApplication* app, gpointer data); void register_application(pid_t pid, Glib::RefPtr<Gdk::Pixbuf> icon); void unregister_application(pid_t pid); @@ -43,7 +42,7 @@ private: Glib::RefPtr<Gdk::Pixbuf> get_icon_from_theme(const ProcInfo &); Glib::RefPtr<Gdk::Pixbuf> get_icon_from_default(const ProcInfo &); - Glib::RefPtr<Gdk::Pixbuf> get_icon_from_wnck(const ProcInfo &); + Glib::RefPtr<Gdk::Pixbuf> get_icon_from_matewnck(const ProcInfo &); Glib::RefPtr<Gdk::Pixbuf> get_icon_from_name(const ProcInfo &); Glib::RefPtr<Gdk::Pixbuf> get_icon_for_kernel(const ProcInfo &); Glib::RefPtr<Gdk::Pixbuf> get_icon_dummy(const ProcInfo &); |