gnome-system-monitor r2386 - trunk/src

[bdejean svn gnome org]

Author: bdejean
Date: Mon Apr 14 17:30:09 2008
New Revision: 2386
URL: http://svn.gnome.org/viewvc/gnome-system-monitor?rev=2386&view=rev

Log:
Try to get wnck icon in a smarter way.


Modified:
   trunk/src/prettytable.cpp

Modified: trunk/src/prettytable.cpp
==============================================================================
--- trunk/src/prettytable.cpp	(original)
+++ trunk/src/prettytable.cpp	Mon Apr 14 17:30:09 2008
@@ -41,31 +41,29 @@
 void
 PrettyTable::on_application_opened(WnckScreen* screen, WnckApplication* app, gpointer data)
 {
+  PrettyTable * const that = static_cast<PrettyTable*>(data);
+
   pid_t pid = wnck_application_get_pid(app);
 
   if (pid == 0)
     return;
 
-  // we don't own it
-  GList* list = wnck_application_get_windows(app);
+  const char* icon_name = wnck_application_get_icon_name(app);
 
-  if (not list)
-    return;
 
-  WnckWindow* win = static_cast<WnckWindow*>(list->data);
+  Glib::RefPtr<Gdk::Pixbuf> icon;
 
-  Glib::RefPtr<Gdk::Pixbuf> icon(Glib::wrap(wnck_window_get_icon(win),
-					    /* take_copy */ true));
+  icon = that->theme->load_icon(icon_name, APP_ICON_SIZE, Gtk::ICON_LOOKUP_USE_BUILTIN);
 
-  if (not icon)
-    return;
-
-  icon = icon->scale_simple(APP_ICON_SIZE, APP_ICON_SIZE, Gdk::INTERP_HYPER);
+  if (not icon) {
+    icon = Glib::wrap(wnck_application_get_icon(app), /* take_copy */ true);
+    icon = icon->scale_simple(APP_ICON_SIZE, APP_ICON_SIZE, Gdk::INTERP_HYPER);
+  }
 
   if (not icon)
     return;
 
-  static_cast<PrettyTable*>(data)->register_application(pid, icon);
+  that->register_application(pid, icon);
 }
 
 
@@ -80,6 +78,7 @@
       info->set_icon(icon);
       // move the ref to the map
       this->apps[pid] = icon;
+      procman_debug("WNCK OK for %u", unsigned(pid));
     }
 }