gnome-system-monitor r2403 - trunk/src

[bdejean svn gnome org]

Author: bdejean
Date: Fri Apr 25 17:47:07 2008
New Revision: 2403
URL: http://svn.gnome.org/viewvc/gnome-system-monitor?rev=2403&view=rev

Log:
Don't include g(tk|lib)mm.h.
Try to fix #529515.


Modified:
   trunk/src/argv.cpp
   trunk/src/argv.h
   trunk/src/defaulttable.h
   trunk/src/iconthemewrapper.cpp
   trunk/src/iconthemewrapper.h
   trunk/src/load-graph.cpp
   trunk/src/lsof.cpp
   trunk/src/prettytable.cpp
   trunk/src/prettytable.h
   trunk/src/procman.cpp
   trunk/src/procman.h

Modified: trunk/src/argv.cpp
==============================================================================
--- trunk/src/argv.cpp	(original)
+++ trunk/src/argv.cpp	Fri Apr 25 17:47:07 2008
@@ -1,7 +1,8 @@
 #include <config.h>
 
-#include <glibmm.h>
 #include <glib/gi18n.h>
+#include <glibmm/optionentry.h>
+
 
 #include "argv.h"
 

Modified: trunk/src/argv.h
==============================================================================
--- trunk/src/argv.h	(original)
+++ trunk/src/argv.h	Fri Apr 25 17:47:07 2008
@@ -1,7 +1,7 @@
 #ifndef H_PROCMAN_ARGV_1205873424
 #define H_PROCMAN_ARGV_1205873424
 
-#include <glibmm.h>
+#include <glibmm/optiongroup.h>
 
 namespace procman
 {

Modified: trunk/src/defaulttable.h
==============================================================================
--- trunk/src/defaulttable.h	(original)
+++ trunk/src/defaulttable.h	Fri Apr 25 17:47:07 2008
@@ -2,7 +2,8 @@
 #define _PROCMAN_DEFAULTTABLE_H_
 
 #include <string>
-#include <glibmm.h>
+#include <glibmm/refptr.h>
+#include <glibmm/regex.h>
 
 /* This file contains prettynames and icons for well-known applications, that by default has no .desktop entry */
 

Modified: trunk/src/iconthemewrapper.cpp
==============================================================================
--- trunk/src/iconthemewrapper.cpp	(original)
+++ trunk/src/iconthemewrapper.cpp	Fri Apr 25 17:47:07 2008
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <gtkmm.h>
+#include <gtkmm/icontheme.h>
 
 #include "iconthemewrapper.h"
 

Modified: trunk/src/iconthemewrapper.h
==============================================================================
--- trunk/src/iconthemewrapper.h	(original)
+++ trunk/src/iconthemewrapper.h	Fri Apr 25 17:47:07 2008
@@ -1,7 +1,10 @@
 #ifndef H_PROCMAN_ICONTHEMEWRAPPER_H_1185707711
 #define H_PROCMAN_ICONTHEMEWRAPPER_H_1185707711
 
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <glibmm/ustring.h>
+#include <gtkmm/icontheme.h>
+#include <gdkmm/pixbuf.h>
 
 namespace procman
 {

Modified: trunk/src/load-graph.cpp
==============================================================================
--- trunk/src/load-graph.cpp	(original)
+++ trunk/src/load-graph.cpp	Fri Apr 25 17:47:07 2008
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <gtkmm.h>
+#include <gdkmm/pixbuf.h>
 
 #include <stdio.h>
 #include <sys/stat.h>

Modified: trunk/src/lsof.cpp
==============================================================================
--- trunk/src/lsof.cpp	(original)
+++ trunk/src/lsof.cpp	Fri Apr 25 17:47:07 2008
@@ -1,5 +1,6 @@
 #include <config.h>
 
+#include <gtkmm/messagedialog.h>
 #include <glib/gi18n.h>
 #include <glibtop/procopenfiles.h>
 

Modified: trunk/src/prettytable.cpp
==============================================================================
--- trunk/src/prettytable.cpp	(original)
+++ trunk/src/prettytable.cpp	Fri Apr 25 17:47:07 2008
@@ -6,7 +6,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtkmm.h>
 #include <glibtop/procstate.h>
 
 #include <vector>

Modified: trunk/src/prettytable.h
==============================================================================
--- trunk/src/prettytable.h	(original)
+++ trunk/src/prettytable.h	Fri Apr 25 17:47:07 2008
@@ -3,10 +3,10 @@
 #ifndef _PROCMAN_PRETTYTABLE_H_
 #define _PROCMAN_PRETTYTABLE_H_
 
-#include <gtkmm/icontheme.h>
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <gdkmm/pixbuf.h>
 
 #include <map>
 #include <string>

Modified: trunk/src/procman.cpp
==============================================================================
--- trunk/src/procman.cpp	(original)
+++ trunk/src/procman.cpp	Fri Apr 25 17:47:07 2008
@@ -21,8 +21,9 @@
 
 #include <stdlib.h>
 
-#include <gtkmm.h>
-#include <giomm.h>
+#include <gtkmm/main.h>
+#include <giomm/volumemonitor.h>
+#include <giomm/init.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

Modified: trunk/src/procman.h
==============================================================================
--- trunk/src/procman.h	(original)
+++ trunk/src/procman.h	Fri Apr 25 17:47:07 2008
@@ -20,8 +20,7 @@
 #define _PROCMAN_PROCMAN_H_
 
 
-#include <gtkmm.h>
-
+#include <glibmm/refptr.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib.h>
 #include <gtk/gtk.h>