cheese r1140 - in trunk: . src

[jhaitsma svn gnome org]

Author: jhaitsma
Date: Fri Nov 21 07:14:44 2008
New Revision: 1140
URL: http://svn.gnome.org/viewvc/cheese?rev=1140&view=rev

Log:
Remove unnecesary include files, to meet GnomeGoal http://live.gnome.org/GnomeGoals/CleanupGTKIncludes Don't know if I completed in entirely because make CFLAGS+="-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" somehow fails somewhere on includes done by gtk files themselves :-(


Modified:
   trunk/ChangeLog
   trunk/src/cheese-dbus.c
   trunk/src/cheese-fileutil.c
   trunk/src/cheese-webcam.c
   trunk/src/cheese.c

Modified: trunk/src/cheese-dbus.c
==============================================================================
--- trunk/src/cheese-dbus.c	(original)
+++ trunk/src/cheese-dbus.c	Fri Nov 21 07:14:44 2008
@@ -27,14 +27,13 @@
 #include <dbus/dbus-glib-bindings.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus.h>
-#include "cheese-dbus.h"
-#include "cheese-dbus-infos.h"
 #include <glib.h>
-#include <glib-object.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
+#include "cheese-dbus.h"
 #include "cheese-window.h"
+#include "cheese-dbus-infos.h"
 
 gpointer window_pointer;
 

Modified: trunk/src/cheese-fileutil.c
==============================================================================
--- trunk/src/cheese-fileutil.c	(original)
+++ trunk/src/cheese-fileutil.c	Fri Nov 21 07:14:44 2008
@@ -25,8 +25,6 @@
 
 #include <glib.h>
 #include <gio/gio.h>
-#include <stdlib.h>
-
 #include <string.h>
 
 #include "cheese-fileutil.h"

Modified: trunk/src/cheese-webcam.c
==============================================================================
--- trunk/src/cheese-webcam.c	(original)
+++ trunk/src/cheese-webcam.c	Fri Nov 21 07:14:44 2008
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <glib-object.h>
 #include <glib.h>
-#include <glib/gstring.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>

Modified: trunk/src/cheese.c
==============================================================================
--- trunk/src/cheese.c	(original)
+++ trunk/src/cheese.c	Fri Nov 21 07:14:44 2008
@@ -23,7 +23,6 @@
   #include <cheese-config.h>
 #endif
 
-#include <stdio.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
@@ -132,7 +131,7 @@
       source_filename = g_build_filename (path_from_before_224, name, NULL);
       source          = g_file_new_for_path (source_filename);
       target          = g_file_new_for_path (target_filename);
-      printf ("copying %s to %s\n", source_filename, target_filename);
+      g_print ("copying %s to %s\n", source_filename, target_filename);
       g_file_move (source, target, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, NULL);
       g_free (source_filename);
       g_free (target_filename);