From 3fa35a8281ee5088b7e2222b683e5d9191cfd902 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Thu, 14 Jun 2012 22:27:13 +0200 Subject: [PATCH] port to libmatewnck --- configure.in | 4 ++-- distro/archlinux/PKGBUILD | 2 +- src/prettytable.cpp | 23 +++++++++++------------ src/prettytable.h | 9 ++++----- src/procman.h | 2 +- src/proctable.cpp | 4 ++-- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/configure.in b/configure.in index 78b30a50..eca7e3b1 100644 --- a/configure.in +++ b/configure.in @@ -26,7 +26,7 @@ MATE_COMPILE_WARNINGS GLIB_REQUIRED=2.16.0 MATECONF_REQUIRED=1.1.0 -LIBWNCK_REQUIRED=2.5.0 +LIBMATEWNCK_REQUIRED=1.3.0 LIBGTOP_REQUIRED=2.23.1 GTK_REQUIRED=2.20.0 MATE_ICON_THEME_REQUIRED=1.1.0 @@ -38,7 +38,7 @@ RSVG_REQUIRED=2.12 DBUS_REQUIRED=0.7 PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) -PKG_CHECK_MODULES(PROCMAN,$GMODULE_ADD glib-2.0 >= $GLIB_REQUIRED mateconf-2.0 >= $MATECONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mate-icon-theme >= $MATE_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED) +PKG_CHECK_MODULES(PROCMAN,$GMODULE_ADD glib-2.0 >= $GLIB_REQUIRED mateconf-2.0 >= $MATECONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libmatewnck >= $LIBMATEWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mate-icon-theme >= $MATE_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED) AC_ARG_ENABLE(more-warnings, diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD index 7933748a..6c2114f1 100644 --- a/distro/archlinux/PKGBUILD +++ b/distro/archlinux/PKGBUILD @@ -4,7 +4,7 @@ pkgrel=1 pkgdesc="A system monitor for MATE" arch=(i686 x86_64) license=('GPL') -depends=('libwnck' 'libgtop' 'gtkmm' 'librsvg' 'mate-icon-theme') +depends=('libmatewnck' 'libgtop' 'gtkmm' 'librsvg' 'mate-icon-theme') makedepends=('mate-doc-utils' 'pkgconfig' 'intltool') groups=('mate-extras') options=(!emptydirs !libtool) diff --git a/src/prettytable.cpp b/src/prettytable.cpp index 25f66251..a3c39470 100644 --- a/src/prettytable.cpp +++ b/src/prettytable.cpp @@ -1,6 +1,5 @@ #include -#define WNCK_I_KNOW_THIS_IS_UNSTABLE -#include +#include #include #include #include @@ -24,7 +23,7 @@ namespace PrettyTable::PrettyTable() { - WnckScreen* screen = wnck_screen_get_default(); + MatewnckScreen* screen = matewnck_screen_get_default(); g_signal_connect(G_OBJECT(screen), "application_opened", G_CALLBACK(PrettyTable::on_application_opened), this); g_signal_connect(G_OBJECT(screen), "application_closed", @@ -38,16 +37,16 @@ PrettyTable::~PrettyTable() void -PrettyTable::on_application_opened(WnckScreen* screen, WnckApplication* app, gpointer data) +PrettyTable::on_application_opened(MatewnckScreen* screen, MatewnckApplication* app, gpointer data) { PrettyTable * const that = static_cast(data); - pid_t pid = wnck_application_get_pid(app); + pid_t pid = matewnck_application_get_pid(app); if (pid == 0) return; - const char* icon_name = wnck_application_get_icon_name(app); + const char* icon_name = matewnck_application_get_icon_name(app); Glib::RefPtr icon; @@ -55,7 +54,7 @@ PrettyTable::on_application_opened(WnckScreen* screen, WnckApplication* app, gpo icon = that->theme->load_icon(icon_name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN); if (not icon) { - icon = Glib::wrap(wnck_application_get_icon(app), /* take_copy */ true); + icon = Glib::wrap(matewnck_application_get_icon(app), /* take_copy */ true); icon = icon->scale_simple(APP_ICON_SIZE, APP_ICON_SIZE, Gdk::INTERP_HYPER); } @@ -77,16 +76,16 @@ PrettyTable::register_application(pid_t pid, Glib::RefPtr icon) info->set_icon(icon); // move the ref to the map this->apps[pid] = icon; - procman_debug("WNCK OK for %u", unsigned(pid)); + procman_debug("MATEWNCK OK for %u", unsigned(pid)); } } void -PrettyTable::on_application_closed(WnckScreen* screen, WnckApplication* app, gpointer data) +PrettyTable::on_application_closed(MatewnckScreen* screen, MatewnckApplication* app, gpointer data) { - pid_t pid = wnck_application_get_pid(app); + pid_t pid = matewnck_application_get_pid(app); if (pid == 0) return; @@ -156,7 +155,7 @@ PrettyTable::get_icon_from_default(const ProcInfo &info) Glib::RefPtr -PrettyTable::get_icon_from_wnck(const ProcInfo &info) +PrettyTable::get_icon_from_matewnck(const ProcInfo &info) { Glib::RefPtr icon; @@ -223,7 +222,7 @@ PrettyTable::set_icon(ProcInfo &info) if (getters.empty()) { - getters.push_back(&PrettyTable::get_icon_from_wnck); + getters.push_back(&PrettyTable::get_icon_from_matewnck); getters.push_back(&PrettyTable::get_icon_from_theme); getters.push_back(&PrettyTable::get_icon_from_default); getters.push_back(&PrettyTable::get_icon_from_name); diff --git a/src/prettytable.h b/src/prettytable.h index 7884cdd6..bfb45f58 100644 --- a/src/prettytable.h +++ b/src/prettytable.h @@ -12,8 +12,7 @@ #include extern "C" { -#define WNCK_I_KNOW_THIS_IS_UNSTABLE -#include +#include } #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 icon); void unregister_application(pid_t pid); @@ -43,7 +42,7 @@ class PrettyTable Glib::RefPtr get_icon_from_theme(const ProcInfo &); Glib::RefPtr get_icon_from_default(const ProcInfo &); - Glib::RefPtr get_icon_from_wnck(const ProcInfo &); + Glib::RefPtr get_icon_from_matewnck(const ProcInfo &); Glib::RefPtr get_icon_from_name(const ProcInfo &); Glib::RefPtr get_icon_for_kernel(const ProcInfo &); Glib::RefPtr get_icon_dummy(const ProcInfo &); diff --git a/src/procman.h b/src/procman.h index 76c998f7..feb1b4a0 100644 --- a/src/procman.h +++ b/src/procman.h @@ -114,7 +114,7 @@ struct MutableProcInfo gulong memwritable; gulong mem; - // wnck gives an unsigned long + // matewnck gives an unsigned long gulong memxserver; gulong start_time; diff --git a/src/proctable.cpp b/src/proctable.cpp index 7f192b2d..5a8cd7be 100644 --- a/src/proctable.cpp +++ b/src/proctable.cpp @@ -512,9 +512,9 @@ static void get_process_memory_info(ProcInfo *info) { glibtop_proc_mem procmem; - WnckResourceUsage xresources; + MatewnckResourceUsage xresources; - wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()), + matewnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()), info->pid, &xresources);