gnome-system-monitor r2402 - in branches/gnome-2-22: . src

[bdejean svn gnome org]

Author: bdejean
Date: Wed Apr 23 17:59:56 2008
New Revision: 2402
URL: http://svn.gnome.org/viewvc/gnome-system-monitor?rev=2402&view=rev

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


Modified:
   branches/gnome-2-22/configure.in
   branches/gnome-2-22/src/defaulttable.h
   branches/gnome-2-22/src/iconthemewrapper.cpp
   branches/gnome-2-22/src/iconthemewrapper.h
   branches/gnome-2-22/src/load-graph.cpp
   branches/gnome-2-22/src/load-graph.h
   branches/gnome-2-22/src/lsof.cpp
   branches/gnome-2-22/src/prettytable.cpp
   branches/gnome-2-22/src/prettytable.h
   branches/gnome-2-22/src/procman.cpp
   branches/gnome-2-22/src/procman.h

Modified: branches/gnome-2-22/configure.in
==============================================================================
--- branches/gnome-2-22/configure.in	(original)
+++ branches/gnome-2-22/configure.in	Wed Apr 23 17:59:56 2008
@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.52)
 
-AC_INIT([gnome-system-monitor], [2.22.1],
+AC_INIT([gnome-system-monitor], [2.22.2],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor])
 AC_CONFIG_SRCDIR(configure.in)
 AC_CONFIG_HEADERS(config.h)

Modified: branches/gnome-2-22/src/defaulttable.h
==============================================================================
--- branches/gnome-2-22/src/defaulttable.h	(original)
+++ branches/gnome-2-22/src/defaulttable.h	Wed Apr 23 17:59:56 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: branches/gnome-2-22/src/iconthemewrapper.cpp
==============================================================================
--- branches/gnome-2-22/src/iconthemewrapper.cpp	(original)
+++ branches/gnome-2-22/src/iconthemewrapper.cpp	Wed Apr 23 17:59:56 2008
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <gtkmm.h>
+#include <gtkmm/icontheme.h>
 
 #include "iconthemewrapper.h"
 

Modified: branches/gnome-2-22/src/iconthemewrapper.h
==============================================================================
--- branches/gnome-2-22/src/iconthemewrapper.h	(original)
+++ branches/gnome-2-22/src/iconthemewrapper.h	Wed Apr 23 17:59:56 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: branches/gnome-2-22/src/load-graph.cpp
==============================================================================
--- branches/gnome-2-22/src/load-graph.cpp	(original)
+++ branches/gnome-2-22/src/load-graph.cpp	Wed Apr 23 17:59:56 2008
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <gtkmm.h>
+#include <gdkmm/pixbuf.h>
 
 #include <stdio.h>
 #include <sys/stat.h>

Modified: branches/gnome-2-22/src/load-graph.h
==============================================================================
--- branches/gnome-2-22/src/load-graph.h	(original)
+++ branches/gnome-2-22/src/load-graph.h	Wed Apr 23 17:59:56 2008
@@ -3,6 +3,7 @@
 
 #include <glib/gtypes.h>
 #include <glibtop/cpu.h>
+#include <vector>
 
 enum
 {

Modified: branches/gnome-2-22/src/lsof.cpp
==============================================================================
--- branches/gnome-2-22/src/lsof.cpp	(original)
+++ branches/gnome-2-22/src/lsof.cpp	Wed Apr 23 17:59:56 2008
@@ -1,5 +1,6 @@
 #include <config.h>
 
+#include <gtkmm/messagedialog.h>
 #include <glib/gi18n.h>
 #include <glibtop/procopenfiles.h>
 

Modified: branches/gnome-2-22/src/prettytable.cpp
==============================================================================
--- branches/gnome-2-22/src/prettytable.cpp	(original)
+++ branches/gnome-2-22/src/prettytable.cpp	Wed Apr 23 17:59:56 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: branches/gnome-2-22/src/prettytable.h
==============================================================================
--- branches/gnome-2-22/src/prettytable.h	(original)
+++ branches/gnome-2-22/src/prettytable.h	Wed Apr 23 17:59:56 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: branches/gnome-2-22/src/procman.cpp
==============================================================================
--- branches/gnome-2-22/src/procman.cpp	(original)
+++ branches/gnome-2-22/src/procman.cpp	Wed Apr 23 17:59:56 2008
@@ -21,7 +21,7 @@
 
 #include <stdlib.h>
 
-#include <gtkmm.h>
+#include <gtkmm/main.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

Modified: branches/gnome-2-22/src/procman.h
==============================================================================
--- branches/gnome-2-22/src/procman.h	(original)
+++ branches/gnome-2-22/src/procman.h	Wed Apr 23 17:59:56 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>