tracker r2746 - in trunk: . src/libtracker-common src/libtracker-data src/libtracker-gtk src/tracker-applet src/tracker-search-tool tests/libtracker-common tests/libtracker-db tests/trackerd

[ifrade svn gnome org]

Author: ifrade
Date: Mon Dec 29 14:11:14 2008
New Revision: 2746
URL: http://svn.gnome.org/viewvc/tracker?rev=2746&view=rev

Log:
Cleaned up gtk and glib includes. Gnome Goal. Fixes 565218

Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-os-dependant-unix.c
   trunk/src/libtracker-common/tracker-os-dependant-win.c
   trunk/src/libtracker-data/tracker-rdf-query.c
   trunk/src/libtracker-gtk/tracker-keyword-store.h
   trunk/src/tracker-applet/tracker-applet.h
   trunk/src/tracker-search-tool/sexy-icon-entry.h
   trunk/src/tracker-search-tool/tracker-search-tool-support.c
   trunk/src/tracker-search-tool/tracker-search-tool.c
   trunk/tests/libtracker-common/tracker-dbus-test.c
   trunk/tests/libtracker-common/tracker-field-test.c
   trunk/tests/libtracker-common/tracker-file-utils-test.c
   trunk/tests/libtracker-common/tracker-ontology-test.c
   trunk/tests/libtracker-common/tracker-parser-test.c
   trunk/tests/libtracker-common/tracker-type-utils-test.c
   trunk/tests/libtracker-db/tracker-db-dbus-test.c
   trunk/tests/libtracker-db/tracker-db-manager-test-attach.c
   trunk/tests/libtracker-db/tracker-db-manager-test-custom.c
   trunk/tests/libtracker-db/tracker-db-manager-test-unattach.c
   trunk/tests/libtracker-db/tracker-index-reader-test.c
   trunk/tests/libtracker-db/tracker-index-writer-test.c
   trunk/tests/libtracker-db/union-performance.c
   trunk/tests/trackerd/tracker-xesam-hit-test.c
   trunk/tests/trackerd/tracker-xesam-hits-test.c
   trunk/tests/trackerd/tracker-xesam-session-test.c
   trunk/tests/trackerd/tracker-xesam-test.c

Modified: trunk/src/libtracker-common/tracker-os-dependant-unix.c
==============================================================================
--- trunk/src/libtracker-common/tracker-os-dependant-unix.c	(original)
+++ trunk/src/libtracker-common/tracker-os-dependant-unix.c	Mon Dec 29 14:11:14 2008
@@ -26,8 +26,6 @@
 #include <sys/resource.h>
 
 #include <glib.h>
-#include <glib/gspawn.h>
-#include <glib/gstring.h>
 
 #include "tracker-log.h"
 #include "tracker-os-dependant.h"

Modified: trunk/src/libtracker-common/tracker-os-dependant-win.c
==============================================================================
--- trunk/src/libtracker-common/tracker-os-dependant-win.c	(original)
+++ trunk/src/libtracker-common/tracker-os-dependant-win.c	Mon Dec 29 14:11:14 2008
@@ -21,8 +21,7 @@
 
 #include "config.h"
 
-#include <glib/gspawn.h>
-#include <glib/gstring.h>
+#include <glib.h>
 
 #include "mingw-compat.h"
 

Modified: trunk/src/libtracker-data/tracker-rdf-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-rdf-query.c	(original)
+++ trunk/src/libtracker-data/tracker-rdf-query.c	Mon Dec 29 14:11:14 2008
@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
-#include <glib/ghash.h>
+#include <glib.h>
 
 #include <libtracker-common/tracker-field-data.h>
 #include <libtracker-common/tracker-log.h>

Modified: trunk/src/libtracker-gtk/tracker-keyword-store.h
==============================================================================
--- trunk/src/libtracker-gtk/tracker-keyword-store.h	(original)
+++ trunk/src/libtracker-gtk/tracker-keyword-store.h	Mon Dec 29 14:11:14 2008
@@ -25,7 +25,7 @@
 #ifndef TRACKER_KEYWORD_STORE_H
 #define TRACKER_KEYWORD_STORE_H
 
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #include <tracker.h>
 

Modified: trunk/src/tracker-applet/tracker-applet.h
==============================================================================
--- trunk/src/tracker-applet/tracker-applet.h	(original)
+++ trunk/src/tracker-applet/tracker-applet.h	Mon Dec 29 14:11:14 2008
@@ -23,13 +23,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkstatusicon.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
+#include <gtk/gtk.h>
 
 #define TYPE_TRAY_ICON		    (tray_icon_get_type())
 #define TRAY_ICON(obj)		    (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_TRAY_ICON, TrayIcon))

Modified: trunk/src/tracker-search-tool/sexy-icon-entry.h
==============================================================================
--- trunk/src/tracker-search-tool/sexy-icon-entry.h	(original)
+++ trunk/src/tracker-search-tool/sexy-icon-entry.h	Mon Dec 29 14:11:14 2008
@@ -25,8 +25,7 @@
 typedef struct _SexyIconEntryClass SexyIconEntryClass;
 typedef struct _SexyIconEntryPriv  SexyIconEntryPriv;
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 
 #define SEXY_TYPE_ICON_ENTRY (sexy_icon_entry_get_type())
 #define SEXY_ICON_ENTRY(obj) \

Modified: trunk/src/tracker-search-tool/tracker-search-tool-support.c
==============================================================================
--- trunk/src/tracker-search-tool/tracker-search-tool-support.c	(original)
+++ trunk/src/tracker-search-tool/tracker-search-tool-support.c	Mon Dec 29 14:11:14 2008
@@ -31,7 +31,7 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <glib/gdate.h>
+#include <glib.h>
 #include <regex.h>
 #include <gdk/gdkx.h>
 #include <libart_lgpl/art_rgb.h>

Modified: trunk/src/tracker-search-tool/tracker-search-tool.c
==============================================================================
--- trunk/src/tracker-search-tool/tracker-search-tool.c	(original)
+++ trunk/src/tracker-search-tool/tracker-search-tool.c	Mon Dec 29 14:11:14 2008
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <glib/gi18n.h>
-#include <gdk/gdkcursor.h>
+#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 

Modified: trunk/tests/libtracker-common/tracker-dbus-test.c
==============================================================================
--- trunk/tests/libtracker-common/tracker-dbus-test.c	(original)
+++ trunk/tests/libtracker-common/tracker-dbus-test.c	Mon Dec 29 14:11:14 2008
@@ -18,7 +18,6 @@
  * Boston, MA  02110-1301, USA.
  */
 #include <glib.h>
-#include <glib/gtestutils.h>
 
 #include <libtracker-common/tracker-dbus.h>
 

Modified: trunk/tests/libtracker-common/tracker-field-test.c
==============================================================================
--- trunk/tests/libtracker-common/tracker-field-test.c	(original)
+++ trunk/tests/libtracker-common/tracker-field-test.c	Mon Dec 29 14:11:14 2008
@@ -1,5 +1,4 @@
 #include <glib.h>
-#include <glib/gtestutils.h>
 #include <libtracker-common/tracker-field.h>
 #include <tracker-test-helpers.h>
 

Modified: trunk/tests/libtracker-common/tracker-file-utils-test.c
==============================================================================
--- trunk/tests/libtracker-common/tracker-file-utils-test.c	(original)
+++ trunk/tests/libtracker-common/tracker-file-utils-test.c	Mon Dec 29 14:11:14 2008
@@ -21,7 +21,6 @@
 #include <string.h>
 
 #include <glib.h>
-#include <glib/gtestutils.h>
 #include <gio/gio.h>
 
 #include <libtracker-common/tracker-file-utils.h>

Modified: trunk/tests/libtracker-common/tracker-ontology-test.c
==============================================================================
--- trunk/tests/libtracker-common/tracker-ontology-test.c	(original)
+++ trunk/tests/libtracker-common/tracker-ontology-test.c	Mon Dec 29 14:11:14 2008
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #include <glib.h>
-#include <glib/gtestutils.h>
 
 #include <libtracker-common/tracker-service.h>
 #include <libtracker-common/tracker-field.h>

Modified: trunk/tests/libtracker-common/tracker-parser-test.c
==============================================================================
--- trunk/tests/libtracker-common/tracker-parser-test.c	(original)
+++ trunk/tests/libtracker-common/tracker-parser-test.c	Mon Dec 29 14:11:14 2008
@@ -1,5 +1,4 @@
 #include <glib.h>
-#include <glib/gtestutils.h>
 #include <string.h>
 
 #include <libtracker-common/tracker-config.h>

Modified: trunk/tests/libtracker-common/tracker-type-utils-test.c
==============================================================================
--- trunk/tests/libtracker-common/tracker-type-utils-test.c	(original)
+++ trunk/tests/libtracker-common/tracker-type-utils-test.c	Mon Dec 29 14:11:14 2008
@@ -23,7 +23,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <glib/gtestutils.h>
 
 #include <libtracker-common/tracker-type-utils.h>
 

Modified: trunk/tests/libtracker-db/tracker-db-dbus-test.c
==============================================================================
--- trunk/tests/libtracker-db/tracker-db-dbus-test.c	(original)
+++ trunk/tests/libtracker-db/tracker-db-dbus-test.c	Mon Dec 29 14:11:14 2008
@@ -18,7 +18,6 @@
  * Boston, MA  02110-1301, USA.
  */
 #include <glib.h>
-#include <glib/gtestutils.h>
 
 #include <libtracker-db/tracker-db-dbus.h>
 #include <libtracker-db/tracker-db-interface.h>

Modified: trunk/tests/libtracker-db/tracker-db-manager-test-attach.c
==============================================================================
--- trunk/tests/libtracker-db/tracker-db-manager-test-attach.c	(original)
+++ trunk/tests/libtracker-db/tracker-db-manager-test-attach.c	Mon Dec 29 14:11:14 2008
@@ -18,7 +18,6 @@
  * Boston, MA  02110-1301, USA.
  */
 #include <glib.h>
-#include <glib/gtestutils.h>
 
 #include <libtracker-db/tracker-db-manager.h>
 #include "tracker-db-manager-common.h"

Modified: trunk/tests/libtracker-db/tracker-db-manager-test-custom.c
==============================================================================
--- trunk/tests/libtracker-db/tracker-db-manager-test-custom.c	(original)
+++ trunk/tests/libtracker-db/tracker-db-manager-test-custom.c	Mon Dec 29 14:11:14 2008
@@ -18,8 +18,6 @@
  * Boston, MA  02110-1301, USA.
  */
 #include <glib.h>
-#include <glib/gtestutils.h>
-
 
 #include <libtracker-db/tracker-db-manager.h>
 #include "tracker-db-manager-common.h"

Modified: trunk/tests/libtracker-db/tracker-db-manager-test-unattach.c
==============================================================================
--- trunk/tests/libtracker-db/tracker-db-manager-test-unattach.c	(original)
+++ trunk/tests/libtracker-db/tracker-db-manager-test-unattach.c	Mon Dec 29 14:11:14 2008
@@ -18,8 +18,6 @@
  * Boston, MA  02110-1301, USA.
  */
 #include <glib.h>
-#include <glib/gtestutils.h>
-
 
 #include <libtracker-db/tracker-db-manager.h>
 #include "tracker-db-manager-common.h"

Modified: trunk/tests/libtracker-db/tracker-index-reader-test.c
==============================================================================
--- trunk/tests/libtracker-db/tracker-index-reader-test.c	(original)
+++ trunk/tests/libtracker-db/tracker-index-reader-test.c	Mon Dec 29 14:11:14 2008
@@ -1,5 +1,4 @@
 #include <glib.h>
-#include <glib/gtestutils.h>
 #include <tracker-test-helpers.h>
 #include <gio/gio.h>
 

Modified: trunk/tests/libtracker-db/tracker-index-writer-test.c
==============================================================================
--- trunk/tests/libtracker-db/tracker-index-writer-test.c	(original)
+++ trunk/tests/libtracker-db/tracker-index-writer-test.c	Mon Dec 29 14:11:14 2008
@@ -22,7 +22,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <glib/gtestutils.h>
 #include <glib/gstdio.h>
 
 #include <libtracker-db/tracker-db-index.h>

Modified: trunk/tests/libtracker-db/union-performance.c
==============================================================================
--- trunk/tests/libtracker-db/union-performance.c	(original)
+++ trunk/tests/libtracker-db/union-performance.c	Mon Dec 29 14:11:14 2008
@@ -18,8 +18,6 @@
  * Boston, MA  02110-1301, USA.
  */
 #include <glib.h>
-#include <glib/gtestutils.h>
-
 
 #include <libtracker-db/tracker-db-manager.h>
 #include "tracker-db-manager-common.h"

Modified: trunk/tests/trackerd/tracker-xesam-hit-test.c
==============================================================================
--- trunk/tests/trackerd/tracker-xesam-hit-test.c	(original)
+++ trunk/tests/trackerd/tracker-xesam-hit-test.c	Mon Dec 29 14:11:14 2008
@@ -15,7 +15,6 @@
  */
 
 #include <glib.h>
-#include <glib/gtestutils.h>
 #include <glib-object.h>
 
 #include <xesam-glib/xesam-glib.h>

Modified: trunk/tests/trackerd/tracker-xesam-hits-test.c
==============================================================================
--- trunk/tests/trackerd/tracker-xesam-hits-test.c	(original)
+++ trunk/tests/trackerd/tracker-xesam-hits-test.c	Mon Dec 29 14:11:14 2008
@@ -15,7 +15,6 @@
  */
 
 #include <glib.h>
-#include <glib/gtestutils.h>
 #include <glib-object.h>
 
 #include <xesam-glib/xesam-glib.h>

Modified: trunk/tests/trackerd/tracker-xesam-session-test.c
==============================================================================
--- trunk/tests/trackerd/tracker-xesam-session-test.c	(original)
+++ trunk/tests/trackerd/tracker-xesam-session-test.c	Mon Dec 29 14:11:14 2008
@@ -15,7 +15,6 @@
  */
 
 #include <glib.h>
-#include <glib/gtestutils.h>
 #include <glib-object.h>
 
 #include <xesam-glib/xesam-glib.h>

Modified: trunk/tests/trackerd/tracker-xesam-test.c
==============================================================================
--- trunk/tests/trackerd/tracker-xesam-test.c	(original)
+++ trunk/tests/trackerd/tracker-xesam-test.c	Mon Dec 29 14:11:14 2008
@@ -18,7 +18,6 @@
  * Boston, MA  02110-1301, USA.
  */
 #include <glib.h>
-#include <glib/gtestutils.h>
 
 #include <dbus/dbus-glib-bindings.h>