marlin r1348 - in trunk: marlin plugins src src/dialogs src/libegg src/other

From: iain svn gnome org
To: svn-commits-list gnome org
Subject: marlin r1348 - in trunk: marlin plugins src src/dialogs src/libegg src/other
Date: Sat, 27 Dec 2008 23:43:09 +0000 (UTC)
Author: iain
Date: Sat Dec 27 23:43:09 2008
New Revision: 1348
URL: http://svn.gnome.org/viewvc/marlin?rev=1348&view=rev

Log:
Fix weird gtk includes thing
Fix window icon warning

Modified:
   trunk/marlin/marlin-a11y-helper.h
   trunk/marlin/marlin-cross-fader.c
   trunk/marlin/marlin-cursors.h
   trunk/marlin/marlin-file-chooser.c
   trunk/marlin/marlin-file-chooser.h
   trunk/marlin/marlin-grid.h
   trunk/marlin/marlin-level-ruler.h
   trunk/marlin/marlin-marker-view.c
   trunk/marlin/marlin-marker-view.h
   trunk/marlin/marlin-overview-bar.c
   trunk/marlin/marlin-overview-bar.h
   trunk/marlin/marlin-plugin.h
   trunk/marlin/marlin-position-spinner.c
   trunk/marlin/marlin-position-spinner.h
   trunk/marlin/marlin-progress-dialog.c
   trunk/marlin/marlin-progress-dialog.h
   trunk/marlin/marlin-sample-drawing.h
   trunk/marlin/marlin-sample-view.c
   trunk/marlin/marlin-sample-view.h
   trunk/marlin/marlin-stock.c
   trunk/marlin/marlin-x-utils.h
   trunk/plugins/marlin-burn.c
   trunk/plugins/marlin-piano.h
   trunk/src/dialogs/marlin-add-marker-dialog.c
   trunk/src/dialogs/marlin-add-marker-dialog.h
   trunk/src/dialogs/marlin-adjust-channel-dialogs.c
   trunk/src/dialogs/marlin-adjust-channel-dialogs.h
   trunk/src/dialogs/marlin-burn-dialog.h
   trunk/src/dialogs/marlin-crossfade-dialog.c
   trunk/src/dialogs/marlin-crossfade-dialog.h
   trunk/src/dialogs/marlin-edit-marker-dialog.c
   trunk/src/dialogs/marlin-edit-marker-dialog.h
   trunk/src/dialogs/marlin-information-dialog.c
   trunk/src/dialogs/marlin-information-dialog.h
   trunk/src/dialogs/marlin-move-cursor-dialog.c
   trunk/src/dialogs/marlin-move-cursor-dialog.h
   trunk/src/dialogs/marlin-mp3-dialog.c
   trunk/src/dialogs/marlin-mp3-dialog.h
   trunk/src/dialogs/marlin-new-dialog.c
   trunk/src/dialogs/marlin-select-region-dialog.c
   trunk/src/dialogs/marlin-select-region-dialog.h
   trunk/src/dialogs/marlin-undo-history-dialog.c
   trunk/src/dialogs/marlin-undo-history-dialog.h
   trunk/src/dialogs/marlin-vorbis-dialog.c
   trunk/src/dialogs/marlin-vorbis-dialog.h
   trunk/src/libegg/egg-editable-toolbar.c
   trunk/src/libegg/egg-editable-toolbar.h
   trunk/src/libegg/egg-toolbar-editor.c
   trunk/src/libegg/egg-toolbar-editor.h
   trunk/src/marlin-cdda-record.h
   trunk/src/marlin-clipboard-info.c
   trunk/src/marlin-clipboard-info.h
   trunk/src/marlin-generate-tone.h
   trunk/src/marlin-progress-window.c
   trunk/src/marlin-progress-window.h
   trunk/src/marlin-recent-action.c
   trunk/src/marlin-recent-action.h
   trunk/src/marlin-record.h
   trunk/src/marlin-toolbar.c
   trunk/src/marlin-window-menu.c
   trunk/src/marlin-window.c
   trunk/src/marlin-window.h
   trunk/src/other/gtkvumeter.h
   trunk/src/other/koto-undo-action.h

Modified: trunk/marlin/marlin-a11y-helper.h
==============================================================================
--- trunk/marlin/marlin-a11y-helper.h	(original)
+++ trunk/marlin/marlin-a11y-helper.h	Sat Dec 27 23:43:09 2008
@@ -23,7 +23,7 @@
 #ifndef __MARLIN_A11Y_HELPER_H__
 #define __MARLIN_A11Y_HELPER_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 void marlin_add_paired_relations (GtkWidget *target1,
 				  AtkRelationType target1_type,

Modified: trunk/marlin/marlin-cross-fader.c
==============================================================================
--- trunk/marlin/marlin-cross-fader.c	(original)
+++ trunk/marlin/marlin-cross-fader.c	Sat Dec 27 23:43:09 2008
@@ -30,8 +30,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkwindow.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-cross-fader.h>
 #include <marlin/marlin-cursors.h>

Modified: trunk/marlin/marlin-cursors.h
==============================================================================
--- trunk/marlin/marlin-cursors.h	(original)
+++ trunk/marlin/marlin-cursors.h	Sat Dec 27 23:43:09 2008
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_CURSORS_H__
 #define __MARLIN_CURSORS_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 typedef enum {
 	I_BEAM,

Modified: trunk/marlin/marlin-file-chooser.c
==============================================================================
--- trunk/marlin/marlin-file-chooser.c	(original)
+++ trunk/marlin/marlin-file-chooser.c	Sat Dec 27 23:43:09 2008
@@ -24,13 +24,7 @@
 
 #include <gio/gio.h>
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include <gst/gst.h>
 

Modified: trunk/marlin/marlin-file-chooser.h
==============================================================================
--- trunk/marlin/marlin-file-chooser.h	(original)
+++ trunk/marlin/marlin-file-chooser.h	Sat Dec 27 23:43:09 2008
@@ -23,8 +23,7 @@
 #ifndef __MARLIN_FILE_CHOOSER_H__
 #define __MARLIN_FILE_CHOOSER_H__
 
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 GtkWidget *marlin_file_open_dialog_new (GtkWindow *parent_window);
 GtkWidget *marlin_file_save_dialog_new (GtkWindow *parent_window);

Modified: trunk/marlin/marlin-grid.h
==============================================================================
--- trunk/marlin/marlin-grid.h	(original)
+++ trunk/marlin/marlin-grid.h	Sat Dec 27 23:43:09 2008
@@ -23,7 +23,7 @@
 #ifndef __MARLIN_GRID_H__
 #define __MARLIN_GRID_H__
 
-#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-list.h>
 #include <marlin/marlin-grid-point.h>

Modified: trunk/marlin/marlin-level-ruler.h
==============================================================================
--- trunk/marlin/marlin-level-ruler.h	(original)
+++ trunk/marlin/marlin-level-ruler.h	Sat Dec 27 23:43:09 2008
@@ -23,7 +23,7 @@
 #ifndef __MARLIN_LEVEL_RULER_H__
 #define __MARLIN_LEVEL_RULER_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/marlin/marlin-marker-view.c
==============================================================================
--- trunk/marlin/marlin-marker-view.c	(original)
+++ trunk/marlin/marlin-marker-view.c	Sat Dec 27 23:43:09 2008
@@ -31,16 +31,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-cursors.h>
 #include <marlin/marlin-sample.h>

Modified: trunk/marlin/marlin-marker-view.h
==============================================================================
--- trunk/marlin/marlin-marker-view.h	(original)
+++ trunk/marlin/marlin-marker-view.h	Sat Dec 27 23:43:09 2008
@@ -23,8 +23,7 @@
 #ifndef __MARLIN_MARKER_VIEW_H__
 #define __MARLIN_MARKER_VIEW_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkadjustment.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-sample.h>
 #include <marlin/marlin-marker-model.h>

Modified: trunk/marlin/marlin-overview-bar.c
==============================================================================
--- trunk/marlin/marlin-overview-bar.c	(original)
+++ trunk/marlin/marlin-overview-bar.c	Sat Dec 27 23:43:09 2008
@@ -30,7 +30,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include <gtk/gtkbindings.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-cursors.h>
 #include <marlin/marlin-overview-bar.h>

Modified: trunk/marlin/marlin-overview-bar.h
==============================================================================
--- trunk/marlin/marlin-overview-bar.h	(original)
+++ trunk/marlin/marlin-overview-bar.h	Sat Dec 27 23:43:09 2008
@@ -23,7 +23,7 @@
 #ifndef __MARLIN_OVERVIEW_BAR_H__
 #define __MARLIN_OVERVIEW_BAR_H__
 
-#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-sample.h>
 #include <marlin/marlin-sample-selection.h>

Modified: trunk/marlin/marlin-plugin.h
==============================================================================
--- trunk/marlin/marlin-plugin.h	(original)
+++ trunk/marlin/marlin-plugin.h	Sat Dec 27 23:43:09 2008
@@ -25,7 +25,7 @@
 
 #include <gmodule.h>
 
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-base-window.h>
 
@@ -48,7 +48,7 @@
 
 typedef struct _MarlinPluginInfo {
 	GModule *module;
-	
+
 	char *name; /* The name of the plugin */
 	char *author; /* Author of the plugin */
 	char *description; /* Description of the plugin */
@@ -60,7 +60,7 @@
 } MarlinPluginInfo;
 
 typedef enum {
-	MARLIN_PLUGIN_NOT_SUPPORTED, /* Plugins are not supported 
+	MARLIN_PLUGIN_NOT_SUPPORTED, /* Plugins are not supported
 					on this system */
 	MARLIN_PLUGIN_IO_ERROR, /* Could not load the plugin */
 	MARLIN_PLUGIN_WRONG_VERSION, /* Plugin was compiled for a different

Modified: trunk/marlin/marlin-position-spinner.c
==============================================================================
--- trunk/marlin/marlin-position-spinner.c	(original)
+++ trunk/marlin/marlin-position-spinner.c	Sat Dec 27 23:43:09 2008
@@ -28,10 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-sample.h>
 #include <marlin/marlin-position-spinner.h>

Modified: trunk/marlin/marlin-position-spinner.h
==============================================================================
--- trunk/marlin/marlin-position-spinner.h	(original)
+++ trunk/marlin/marlin-position-spinner.h	Sat Dec 27 23:43:09 2008
@@ -2,7 +2,7 @@
 /*
  *  Authors: Iain Holmes <iain gnome org>
  *
- *  Copyright 2002 - 2006 Iain Holmes
+ *  Copyright 2002 - 2008 Iain Holmes
  *
  *  This file is free software; you can redistribute it and/or
  *  modify it under the terms of version 2 of the GNU Library General Public
@@ -23,7 +23,7 @@
 #ifndef __MARLIN_POSITION_SPINNER_H__
 #define __MARLIN_POSITION_SPINNER_H__
 
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
 
 #define MARLIN_POSITION_SPINNER_TYPE (marlin_position_spinner_get_type ())
 #define MARLIN_POSITION_SPINNER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MARLIN_POSITION_SPINNER_TYPE, MarlinPositionSpinner))

Modified: trunk/marlin/marlin-progress-dialog.c
==============================================================================
--- trunk/marlin/marlin-progress-dialog.c	(original)
+++ trunk/marlin/marlin-progress-dialog.c	Sat Dec 27 23:43:09 2008
@@ -22,14 +22,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-sample.h>
 #include <marlin/marlin-utils.h>

Modified: trunk/marlin/marlin-progress-dialog.h
==============================================================================
--- trunk/marlin/marlin-progress-dialog.h	(original)
+++ trunk/marlin/marlin-progress-dialog.h	Sat Dec 27 23:43:09 2008
@@ -23,8 +23,7 @@
 #ifndef __MARLIN_PROGRESS_WINDOW_H__
 #define __MARLIN_PROGRESS_WINDOW_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-sample.h>
 #include <marlin/marlin-operation.h>

Modified: trunk/marlin/marlin-sample-drawing.h
==============================================================================
--- trunk/marlin/marlin-sample-drawing.h	(original)
+++ trunk/marlin/marlin-sample-drawing.h	Sat Dec 27 23:43:09 2008
@@ -2,7 +2,7 @@
 /*
  *  Authors: Iain Holmes <iain gnome org>
  *
- *  Copyright 2003 - 2006 Iain Holmes
+ *  Copyright 2003 - 2008 Iain Holmes
  *
  *  This file is free software; you can redistribute it and/or
  *  modify it under the terms of version 2 of the GNU Library General Public
@@ -23,7 +23,7 @@
 #ifndef __MARLIN_SAMPLE_DRAWING_H__
 #define __MARLIN_SAMPLE_DRAWING_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <marlin/marlin-sample.h>
 
 typedef struct _MarlinSampleDrawContext {
@@ -32,7 +32,7 @@
 	GdkDrawable *drawable;
 
 	gboolean draw_average;
-	
+
 	guint fpp;
 	int base_offset;
 	float vmax, vmin;

Modified: trunk/marlin/marlin-sample-view.c
==============================================================================
--- trunk/marlin/marlin-sample-view.c	(original)
+++ trunk/marlin/marlin-sample-view.c	Sat Dec 27 23:43:09 2008
@@ -30,14 +30,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-marshal.h>
 #include <marlin/marlin-sample.h>
@@ -362,7 +355,7 @@
 		xofs = MAX (priv->xofs - dw, 0);
 
 		gtk_adjustment_changed (priv->hadj);
-		
+
 		if (priv->hadj->value != xofs) {
 			gtk_adjustment_set_value (priv->hadj, (double) xofs);
 			priv->xofs = xofs;
@@ -383,7 +376,7 @@
 		rect.y = 0;
 		rect.width = widget->allocation.width;
 		rect.height = widget->allocation.height;
-		
+
 		gdk_window_invalidate_rect (widget->window,
 					    &rect, FALSE);
 	}
@@ -409,7 +402,7 @@
 	guint64 frames;
 
 	widget = GTK_WIDGET (view);
-	
+
 	if (strcmp (pspec->name, "total-frames") == 0) {
 		g_object_get (G_OBJECT (sample),
 			      "total_frames", &frames,
@@ -424,7 +417,7 @@
 
 		return;
 	}
-	
+
 	if (strcmp (pspec->name, "channels") == 0) {
 		g_object_get (G_OBJECT (sample),
 			      "channels", &view->priv->number_of_channels,
@@ -452,15 +445,15 @@
 	GtkWidget *widget = (GtkWidget *) view;
 
 	priv = view->priv;
-	
+
 	vm = g_new (struct _VMarker, 1);
 	vm->marker = marker;
 	vm->real_position = marker->position;
 	vm->real_name = g_strdup (marker->name);
-	
+
 	g_hash_table_insert (priv->marker_to_view, marker, vm);
 	priv->markers = g_list_prepend (priv->markers, vm);
-	
+
 	if (GTK_WIDGET_DRAWABLE (widget)) {
 		GdkRectangle area;
 		PangoRectangle logical;
@@ -500,9 +493,9 @@
 	GtkWidget *widget = (GtkWidget *) view;
 	struct _VMarker *vm;
 	guint64 pos;
-	
+
 	priv = view->priv;
-	
+
 	vm = g_hash_table_lookup (priv->marker_to_view, marker);
 	g_assert (vm != NULL);
 
@@ -549,13 +542,13 @@
 	struct _VMarker *vm;
 	guint64 pos;
 	char *name;
-	
+
 	vm = g_hash_table_lookup (view->priv->marker_to_view, marker);
 	g_assert (vm != NULL);
 
 	pos = vm->real_position;
 	vm->real_position = marker->position;
-	
+
 	name = vm->real_name;
 	vm->real_name = g_strdup (marker->name);
 
@@ -564,7 +557,7 @@
 		PangoRectangle logical;
 
 		/* First redraw the old position */
-		
+
 		/* Invalidate for the dotted line */
 		area.x = (pos / view->priv->frames_per_pixel) - view->priv->xofs;
 		area.y = 0;
@@ -582,13 +575,13 @@
 		area.y = PANGO_PIXELS (logical.y);
 		area.width = PANGO_PIXELS (logical.width);
 		area.height = PANGO_PIXELS (logical.height + view->priv->digital_offset);
-		
+
 		gdk_window_invalidate_rect (widget->window, &area, FALSE);
-		
+
 		area.x = (marker->position / view->priv->frames_per_pixel) - view->priv->xofs;
 		area.y = 0;
 		area.height = widget->allocation.height;
-		
+
 		pango_layout_set_text (view->priv->marker_layout,
 				       marker->name, -1);
 		pango_layout_get_extents (view->priv->marker_layout,
@@ -636,7 +629,7 @@
 	int width, best_fit, factor;
 	float dofs;
 	GList *marks;
-	
+
 	widget = GTK_WIDGET (object);
 	view = MARLIN_SAMPLE_VIEW (object);
 	priv = view->priv;
@@ -647,7 +640,7 @@
 			g_signal_handler_disconnect (G_OBJECT (priv->selection),
 						     priv->changed_id);
 		}
-		
+
 		if (priv->move_id > 0) {
 			g_signal_handler_disconnect (G_OBJECT (priv->model),
 						     priv->move_id);
@@ -664,7 +657,7 @@
 		if (priv->sample != NULL) {
 			g_object_unref (G_OBJECT (priv->sample));
 		}
-		
+
 		priv->sample = g_value_get_object (value);
 		g_object_ref (G_OBJECT (priv->sample));
 
@@ -672,7 +665,7 @@
 		priv->dc->sample = priv->sample;
 
 		clear_markers (view);
-		
+
 		g_object_get (G_OBJECT (priv->sample),
 			      "total_frames", &priv->number_of_frames,
 			      "channels", &priv->number_of_channels,
@@ -685,12 +678,12 @@
 			      NULL);
 
 		add_markers (view, marks);
-		
+
 		priv->changed_id = g_signal_connect (G_OBJECT (priv->selection),
 						     "changed",
-						     G_CALLBACK (sample_selection_changed), 
+						     G_CALLBACK (sample_selection_changed),
 						     view);
-		priv->add_id = g_signal_connect (G_OBJECT (priv->model), 
+		priv->add_id = g_signal_connect (G_OBJECT (priv->model),
 						 "marker-added",
 						 G_CALLBACK (add_marker), view);
 		priv->remove_id = g_signal_connect (G_OBJECT (priv->model),
@@ -701,13 +694,13 @@
 						  "marker-changed",
 						  G_CALLBACK (change_marker),
 						  view);
-					   
+
 		width = GTK_WIDGET (view)->allocation.width;
 		if (priv->number_of_frames == 0) {
 			best_fit = DEFAULT_FRAMES_PER_PIXEL;
 		} else {
 			best_fit = CLAMP (priv->number_of_frames / width, 1, 4096);
-			
+
 			for (factor = 1; factor <= 4096; factor *= 2) {
 				if (best_fit <= factor) {
 					best_fit = factor;
@@ -715,24 +708,24 @@
 				}
 			}
 		}
-		
+
 		priv->frames_per_pixel = best_fit;
 		priv->dc->fpp = best_fit;
 
-		g_signal_emit (G_OBJECT (view), 
+		g_signal_emit (G_OBJECT (view),
 			       signals[FRAMES_PER_PIXEL_CHANGED], 0,
 			       priv->frames_per_pixel);
-		
+
 		sample_frames_changed (view, priv->number_of_frames);
-		
+
 		/* And we can listen for the frame length changing */
-		priv->notify_id = g_signal_connect (G_OBJECT (priv->sample), 
+		priv->notify_id = g_signal_connect (G_OBJECT (priv->sample),
 						    "notify",
 						    G_CALLBACK (sample_notify),
 						    view);
-		
+
 		break;
-		
+
 	case PROP_FRAMES_PER_PIXEL:
 		old_frames_per_pixel = priv->frames_per_pixel;
 		priv->frames_per_pixel = g_value_get_uint (value);
@@ -742,7 +735,7 @@
 		}
 
 		dofs = (float) (old_frames_per_pixel) / (float) (priv->frames_per_pixel);
-		
+
 		priv->xofs *= dofs;
 
 		priv->dc->fpp = priv->frames_per_pixel;
@@ -754,13 +747,13 @@
 			rect.y = 0;
 			rect.width = widget->allocation.width;
 			rect.height = widget->allocation.height;
-			
+
 			gdk_window_invalidate_rect (widget->window,
 						    &rect, FALSE);
 		}
 
 		set_scroll_values (view, 0);
-		
+
 		g_signal_emit (object, signals[FRAMES_PER_PIXEL_CHANGED], 0,
 			       priv->frames_per_pixel);
 		break;
@@ -772,18 +765,17 @@
 
 	case PROP_CURSOR_COVERAGE:
 		priv->cursor->coverage = g_value_get_enum (value);
-		if (GTK_WIDGET_DRAWABLE (widget) && 
+		if (GTK_WIDGET_DRAWABLE (widget) &&
 		    priv->play_cursor->visible) {
 			GdkRectangle rect;
-			
+
 			rect.x = priv->play_cursor->position / priv->frames_per_pixel;
 			rect.y = 0;
 			rect.width = 1;
 			rect.height = widget->allocation.height;
-			
+
 			gdk_window_invalidate_rect (widget->window, &rect, FALSE);
 		}
-		
 		break;
 
 	case PROP_PLAY_POSITION:
@@ -892,7 +884,7 @@
 
 	dw = (allocation->width > old_width ? allocation->width - old_width : 0);
 	set_scroll_values (view, dw);
-	
+
 #if 0
 	if (priv->vadj != NULL) {
 		priv->vadj->page_size = allocation->height;
@@ -921,8 +913,8 @@
 	g_object_get (G_OBJECT (settings),
 		      "gtk-cursor-blink-time", &time,
 		      NULL);
-/* 	g_object_unref (G_OBJECT (settings)); */
-	
+        /* g_object_unref (G_OBJECT (settings)); */
+
 	return time;
 }
 
@@ -930,11 +922,11 @@
 real_redraw_cursor (MarlinSampleView *view)
 {
 	GtkWidget *widget = GTK_WIDGET (view);
-	
+
 	if (GTK_WIDGET_DRAWABLE (widget)) {
 		guint position;
 		GdkRectangle rect;
-		
+
 		if ((view->priv->xofs * view->priv->frames_per_pixel) > view->priv->cursor->position) {
 			return;
 		}
@@ -942,7 +934,7 @@
 		if (((view->priv->xofs + widget->allocation.width) * view->priv->frames_per_pixel) < view->priv->cursor->position) {
 			return;
 		}
-		
+
 		position = ((guint)(view->priv->cursor->position /
 				    view->priv->frames_per_pixel)) -
 			view->priv->xofs;
@@ -955,7 +947,7 @@
 		gdk_window_invalidate_rect (widget->window, &rect, FALSE);
 	}
 }
-	
+
 static gboolean
 redraw_cursor (gpointer data)
 {
@@ -973,7 +965,7 @@
 	   the on blink can be longer than the off one */
 	g_source_remove (view->priv->cursor->id);
 	time = get_time (widget);
-	
+
 	if (view->priv->cursor->visible) {
 		view->priv->cursor->id = g_timeout_add (time * ON_MULTIPLIER,
 							redraw_cursor, view);
@@ -983,7 +975,7 @@
 	}
 
 	real_redraw_cursor (view);
-	
+
 	return FALSE;
 }
 
@@ -1002,7 +994,7 @@
 	if (old_position == new_position) {
 		return;
 	}
-	
+
 	dx = (int) ((gint64)new_position - (gint64)old_position);
 	if (dx == 0) {
 		/* No change is necessary */
@@ -1048,7 +1040,7 @@
 		} else {
 			position = priv->number_of_frames - priv->frames_per_pixel;
 		}
-		
+
 		break;
 
 	case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
@@ -1057,7 +1049,7 @@
 		} else {
 			position = (priv->xofs + widget->allocation.width - 1) * priv->frames_per_pixel;
 		}
-		
+
 		break;
 
 	default:

Modified: trunk/marlin/marlin-sample-view.h
==============================================================================
--- trunk/marlin/marlin-sample-view.h	(original)
+++ trunk/marlin/marlin-sample-view.h	Sat Dec 27 23:43:09 2008
@@ -23,8 +23,8 @@
 #ifndef __MARLIN_SAMPLE_VIEW_H__
 #define __MARLIN_SAMPLE_VIEW_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
+
 #include <marlin/marlin-types.h>
 #include <string.h>
 

Modified: trunk/marlin/marlin-stock.c
==============================================================================
--- trunk/marlin/marlin-stock.c	(original)
+++ trunk/marlin/marlin-stock.c	Sat Dec 27 23:43:09 2008
@@ -20,7 +20,7 @@
  *
  */
 
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 #include <marlin-file-utils.h>
 #include <marlin-stock.h>

Modified: trunk/marlin/marlin-x-utils.h
==============================================================================
--- trunk/marlin/marlin-x-utils.h	(original)
+++ trunk/marlin/marlin-x-utils.h	Sat Dec 27 23:43:09 2008
@@ -23,12 +23,7 @@
 #ifndef __MARLIN_X_UTILS_H__
 #define __MARLIN_X_UTILS_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkscale.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 
 #define PACK(t, w, l, top, x) gtk_table_attach (GTK_TABLE ((t)), (w), \
                                              (l), (l) + 1, \

Modified: trunk/plugins/marlin-burn.c
==============================================================================
--- trunk/plugins/marlin-burn.c	(original)
+++ trunk/plugins/marlin-burn.c	Sat Dec 27 23:43:09 2008
@@ -30,14 +30,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkdialog.h>
-
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
 
 #include <libgnomevfs/gnome-vfs-utils.h>
 
@@ -65,7 +58,7 @@
 
 	MarlinSample *sample;
 	char *filename;
-	
+
 	GstElement *src, *interleave, *audioconvert, *wav, *sink;
 } BurnPipeline;
 
@@ -110,7 +103,7 @@
 	/* See marlin-save-pipeline.c */
 	g_signal_connect (G_OBJECT (isink), "unlinked",
 			  G_CALLBACK (ipad_unlinked), pipeline);
-#endif	
+#endif
 
 	if (!gst_pad_link (pad, isink)) {
 		g_warning ("Caps nego in burn-pipeline-new_pad failed");
@@ -280,13 +273,13 @@
 			  G_CALLBACK (new_file), pipeline);
 
 	pipeline->wav = gst_element_factory_make ("wavenc", "burn-wav");
-	
+
 	marlin_pipeline_add (MARLIN_PIPELINE (pipeline), pipeline->interleave);
 	marlin_pipeline_add (MARLIN_PIPELINE (pipeline), pipeline->audioconvert);
 	marlin_pipeline_add (MARLIN_PIPELINE (pipeline), pipeline->wav);
 	marlin_pipeline_add (MARLIN_PIPELINE (pipeline), pipeline->sink);
 	marlin_pipeline_add (MARLIN_PIPELINE (pipeline), pipeline->src);
-	
+
 	/* Connect some bits together */
 	filtercaps = gst_caps_new_simple ("audio/x-raw-float", NULL);
 	ret = gst_element_link_filtered (pipeline->interleave, pipeline->audioconvert, filtercaps);
@@ -405,7 +398,7 @@
 		break;
 	}
 
-	g_object_set (G_OBJECT (details->progress), 
+	g_object_set (G_OBJECT (details->progress),
 		      "secondary_text", text,
 		      NULL);
 }
@@ -465,7 +458,7 @@
 	if (res == GTK_RESPONSE_CANCEL) {
 		return FALSE;
 	}
-					 
+
 	return TRUE;
 }
 
@@ -496,8 +489,8 @@
 burn_op_finished (MarlinOperation *operation,
 		  struct _BurnDetails *details)
 {
-	gboolean res; 
-	
+	gboolean res;
+
 	g_object_ref (G_OBJECT (operation));
 
 /* 	marlin_progress_window_set_progress (details->progress, -1); */
@@ -524,7 +517,7 @@
 						   NAUTILUS_BURN_RECORDER_WRITE_BURNPROOF
 #endif
 						   , NULL);
-	
+
 	if (res == NAUTILUS_BURN_RECORDER_RESULT_FINISHED) {
 		g_print ("Finished\n");
 	} else {
@@ -544,11 +537,11 @@
 				_("Writing sample to CD"),
 				_("The sample is being written to the disc. This operation may take a long time, depending on the length of the sample and write speed."));
 	details->progress = marlin_progress_dialog_new (details->operation,
-							details->parent, 
-							text, 
+							details->parent,
+							text,
 							_("Preparing temporary files."));
 	g_free (text);
-	
+
 	gtk_widget_show (GTK_WIDGET (details->progress));
 }
 
@@ -590,7 +583,7 @@
 	g_signal_connect (details->operation, "paused",
 			  G_CALLBACK (burn_op_paused), details);
 
-	/* Check the first marker... 
+	/* Check the first marker...
 	   If the first marker is not 0
 	   then we need to create an unnamed one.
 	*/
@@ -614,25 +607,25 @@
 		tracks = g_list_append (tracks, t);
 		count = 1;
 	}
-	
+
 	for (m = markers; m; m = m->next) {
 		MarlinMarker *mark = m->data;
 		NautilusBurnRecorderTrack *t;
-		
+
 		t = g_new0 (NautilusBurnRecorderTrack, 1);
 		t->type = NAUTILUS_BURN_RECORDER_TRACK_TYPE_AUDIO;
 		t->contents.audio.filename = g_strdup_printf ("/tmp/marlin-burn-pipeline%d", count);
 		t->contents.audio.cdtext = g_strdup (mark->name);
-		
+
 		tracks = g_list_append (tracks, t);
 		count++;
 	}
-	
+
 	details->tracks = tracks;
-	/* Each frame is 16bits and there's 2 channels 
+	/* Each frame is 16bits and there's 2 channels
 	   plus 44 bytes for the header as well */
 	space_required = (total_frames << 2) + 44;
-	
+
 	text_uri = g_strdup_printf ("file://%s", marlin_get_tmp_dir ());
 	uri = gnome_vfs_uri_new (text_uri);
 	g_free (text_uri);
@@ -648,8 +641,8 @@
 	}
 
 	/* Make our inital pipeline */
-	details->pipeline = g_object_new (BURN_PIPELINE_TYPE, 
-					  "sample", details->sample, 
+	details->pipeline = g_object_new (BURN_PIPELINE_TYPE,
+					  "sample", details->sample,
 					  "operation", details->operation,
 					  NULL);
 	g_signal_connect (details->pipeline, "eos",
@@ -774,7 +767,7 @@
 	table = marlin_make_table (2, 2, FALSE);
 	gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
 	gtk_widget_show (table);
-	
+
 	label = marlin_make_title_label (_("Number of Tracks:"));
 	PACK (table, label, 0, 0, GTK_FILL);
 	gtk_widget_show (label);

Modified: trunk/plugins/marlin-piano.h
==============================================================================
--- trunk/plugins/marlin-piano.h	(original)
+++ trunk/plugins/marlin-piano.h	Sat Dec 27 23:43:09 2008
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_PIANO_H__
 #define __MARLIN_PIANO_H__
 
-#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtk.h>
 
 #define MARLIN_PIANO_TYPE (marlin_piano_get_type ())
 #define MARLIN_PIANO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MARLIN_PIANO_TYPE, MarlinPiano))

Modified: trunk/src/dialogs/marlin-add-marker-dialog.c
==============================================================================
--- trunk/src/dialogs/marlin-add-marker-dialog.c	(original)
+++ trunk/src/dialogs/marlin-add-marker-dialog.c	Sat Dec 27 23:43:09 2008
@@ -25,12 +25,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-sample.h>
 #include <marlin/marlin-undo-manager.h>
@@ -53,35 +48,35 @@
 };
 
 static void
-add_marker_response (GtkDialog *dialog,
-		     guint response_id,
+add_marker_response (GtkDialog         *dialog,
+		     guint              response_id,
 		     struct _AddDialog *ad)
 {
 	MarlinUndoContext *ctxt;
 	const char *name;
 	guint64 pos;
 	GtkAdjustment *adj;
-	
+
 	switch (response_id) {
 	case GTK_RESPONSE_OK:
 		ctxt = marlin_undo_manager_context_begin (ad->undo_manager,
 							  _("Add Marker"));
-		
+
 		name = gtk_entry_get_text (GTK_ENTRY (ad->entry));
 		g_object_get (G_OBJECT (ad->position),
 			      "adjustment", &adj,
 			      NULL);
-		
+
 		pos = (guint64) adj->value;
 
 		marlin_marker_model_add_marker (ad->model, pos, name, ctxt);
 		marlin_undo_manager_context_end (ad->undo_manager, ctxt);
 		break;
-			
+
 	case GTK_RESPONSE_HELP:
 		marlin_display_help ("marlin-edit-marker-dialog");
 		return;
-		
+
 	case GTK_RESPONSE_CANCEL:
 	default:
 		break;
@@ -125,11 +120,11 @@
 	ad->dialog = gtk_dialog_new ();
 	gtk_window_set_title (GTK_WINDOW (ad->dialog), title);
 	g_free (title);
-	
+
 	gtk_dialog_set_has_separator (GTK_DIALOG (ad->dialog), FALSE);
 	gtk_window_set_transient_for (GTK_WINDOW (ad->dialog), parent);
 	gtk_window_set_resizable (GTK_WINDOW (ad->dialog), FALSE);
-	
+
 	vbox = gtk_vbox_new (FALSE, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 	gtk_widget_show (vbox);
@@ -145,7 +140,7 @@
 
 	ad->entry = gtk_entry_new ();
 	gtk_entry_set_activates_default (GTK_ENTRY (ad->entry), TRUE);
-	
+
 	gtk_widget_show (ad->entry);
 	gtk_table_attach (GTK_TABLE (table), ad->entry,
 			  1, 3, 0, 1,
@@ -156,7 +151,7 @@
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), ad->entry);
 	marlin_add_paired_relations (ad->entry, ATK_RELATION_LABELLED_BY,
 				     label, ATK_RELATION_LABEL_FOR);
-	
+
 	label = marlin_make_title_label (_("_Position:"));
 	gtk_widget_show (label);
 	PACK (table, label, 0, 1, GTK_FILL);
@@ -165,7 +160,7 @@
 		      "total_frames", &max_frames,
 		      "sample_rate", &rate,
 		      NULL);
-	
+
 	ad->position = marlin_position_spinner_new ();
 	g_object_set (G_OBJECT (ad->position),
 		      "rate", rate,
@@ -176,7 +171,7 @@
 		      NULL);
 
 	adj->value = (double) 0.0;
-	
+
 	gtk_widget_show (ad->position);
 	PACK (table, ad->position, 1, 1, GTK_FILL | GTK_EXPAND);
 
@@ -202,6 +197,6 @@
 
 	g_signal_connect (ad->dialog, "response",
 			  G_CALLBACK (add_marker_response), ad);
-	
+
 	return ad->dialog;
 }

Modified: trunk/src/dialogs/marlin-add-marker-dialog.h
==============================================================================
--- trunk/src/dialogs/marlin-add-marker-dialog.h	(original)
+++ trunk/src/dialogs/marlin-add-marker-dialog.h	Sat Dec 27 23:43:09 2008
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_ADD_MARKER_DIALOG_H__
 #define __MARLIN_ADD_MARKER_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <marlin/marlin-base-window.h>
 
 GtkWidget *marlin_add_marker_dialog_new (MarlinBaseWindow *window);

Modified: trunk/src/dialogs/marlin-adjust-channel-dialogs.c
==============================================================================
--- trunk/src/dialogs/marlin-adjust-channel-dialogs.c	(original)
+++ trunk/src/dialogs/marlin-adjust-channel-dialogs.c	Sat Dec 27 23:43:09 2008
@@ -25,13 +25,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-x-utils.h>
 #include <marlin/marlin-utils.h>

Modified: trunk/src/dialogs/marlin-adjust-channel-dialogs.h
==============================================================================
--- trunk/src/dialogs/marlin-adjust-channel-dialogs.h	(original)
+++ trunk/src/dialogs/marlin-adjust-channel-dialogs.h	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain prettypeople org>
  *
- *  Copyright 2002-2004 Iain Holmes
+ *  Copyright 2002-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_ADJUST_CHANNEL_DIALOGS__
 #define __MARLIN_ADJUST_CHANNEL_DIALOGS__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-base-window.h>
 

Modified: trunk/src/dialogs/marlin-burn-dialog.h
==============================================================================
--- trunk/src/dialogs/marlin-burn-dialog.h	(original)
+++ trunk/src/dialogs/marlin-burn-dialog.h	Sat Dec 27 23:43:09 2008
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_BURN_DIALOG_H__
 #define __MARLIN_BURN_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-base-window.h>
 

Modified: trunk/src/dialogs/marlin-crossfade-dialog.c
==============================================================================
--- trunk/src/dialogs/marlin-crossfade-dialog.c	(original)
+++ trunk/src/dialogs/marlin-crossfade-dialog.c	Sat Dec 27 23:43:09 2008
@@ -27,13 +27,7 @@
 
 #include <gconf/gconf-client.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkradiobutton.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-cross-fader.h>
 #include <marlin/marlin-program.h>
@@ -60,7 +54,7 @@
 	float src_in, src_out, dest_in, dest_out;
 
 #if 0
-	ms = gconf_client_get_int (client, 
+	ms = gconf_client_get_int (client,
 				   "/apps/marlin/system-state/xfade-length",
 				   NULL);
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (xfd->length), (double) ms);
@@ -73,7 +67,7 @@
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xfd->start),
 					      TRUE);
 		break;
-		
+
 	case 1:
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xfd->end),
 					      TRUE);
@@ -91,11 +85,11 @@
 #endif
 	src_in = marlin_gconf_get_float_with_default
 		("/apps/marlin/system-state/xfade-src-in-level", 1.0);
-	src_out = marlin_gconf_get_float_with_default 
+	src_out = marlin_gconf_get_float_with_default
 		("/apps/marlin/system-state/xfade-src-out-level", 0.0);
 	dest_in = marlin_gconf_get_float_with_default
 		("/apps/marlin/system-state/xfade-dest-in-level", 0.0);
-	dest_out = marlin_gconf_get_float_with_default 
+	dest_out = marlin_gconf_get_float_with_default
 		("/apps/marlin/system-state/xfade-dest-out-level", 1.0);
 
 	marlin_cross_fader_set_levels (MARLIN_CROSS_FADER (xfd->xfade),
@@ -158,7 +152,7 @@
 	guint64 length, position;
 	MarlinUndoContext *ctxt;
 	MarlinRange range;
-	
+
 	switch (response_id) {
 	case GTK_RESPONSE_OK:
 		src = MARLIN_SAMPLE (marlin_program_get_clipboard (program));
@@ -233,7 +227,7 @@
 	window = GTK_WINDOW (base);
 
 	clipboard = MARLIN_SAMPLE (marlin_program_get_clipboard (program));
-	
+
 	xfd = g_new (struct _xfade_dialog_data, 1);
 	xfd->window = window;
 	xfd->sample = sample;
@@ -267,7 +261,7 @@
 				   "src", clipboard,
 				   NULL);
 
-	marlin_cross_fader_set_length (MARLIN_CROSS_FADER (xfd->xfade), 
+	marlin_cross_fader_set_length (MARLIN_CROSS_FADER (xfd->xfade),
 				       ((double) total_frames / (double) rate) * 1000);
 	gtk_widget_show (xfd->xfade);
 	gtk_box_pack_start (GTK_BOX (vbox), xfd->xfade, TRUE, TRUE, 0);

Modified: trunk/src/dialogs/marlin-crossfade-dialog.h
==============================================================================
--- trunk/src/dialogs/marlin-crossfade-dialog.h	(original)
+++ trunk/src/dialogs/marlin-crossfade-dialog.h	Sat Dec 27 23:43:09 2008
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_CROSSFADE_DIALOG_H__
 #define __MARLIN_CROSSFADE_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-base-window.h>
 

Modified: trunk/src/dialogs/marlin-edit-marker-dialog.c
==============================================================================
--- trunk/src/dialogs/marlin-edit-marker-dialog.c	(original)
+++ trunk/src/dialogs/marlin-edit-marker-dialog.c	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain prettypeople org>
  *
- *  Copyright 2002-2005 Iain Holmes
+ *  Copyright 2002-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -25,12 +25,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-sample.h>
 #include <marlin/marlin-undo-manager.h>
@@ -62,36 +57,35 @@
 	const char *name;
 	guint64 pos;
 	GtkAdjustment *adj;
-	
+
 	switch (response_id) {
 	case GTK_RESPONSE_OK:
 		ctxt = marlin_undo_manager_context_begin (ed->undo_manager,
 							  _("Edit Marker"));
-		
+
 		name = gtk_entry_get_text (GTK_ENTRY (ed->entry));
 		g_object_get (G_OBJECT (ed->position),
 			      "adjustment", &adj,
 			      NULL);
-		
+
 		pos = (guint64) adj->value;
 
-		if (name != NULL) {			
+		if (name != NULL) {
 			marlin_marker_model_rename_marker (ed->model,
 							   ed->marker,
 							   name, ctxt);
 		}
 
-		
 		marlin_marker_model_move_marker (ed->model,
 						 ed->marker,
 						 pos, ctxt);
 		marlin_undo_manager_context_end (ed->undo_manager, ctxt);
 		break;
-			
+
 	case GTK_RESPONSE_HELP:
 		marlin_display_help ("marlin-edit-marker-dialog");
 		return;
-		
+
 	case GTK_RESPONSE_CANCEL:
 	default:
 		break;
@@ -135,11 +129,11 @@
 	ed->dialog = gtk_dialog_new ();
 	gtk_window_set_title (GTK_WINDOW (ed->dialog), title);
 	g_free (title);
-	
+
 	gtk_dialog_set_has_separator (GTK_DIALOG (ed->dialog), FALSE);
 	gtk_window_set_transient_for (GTK_WINDOW (ed->dialog), parent);
 	gtk_window_set_resizable (GTK_WINDOW (ed->dialog), FALSE);
-	
+
 	vbox = gtk_vbox_new (FALSE, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 	gtk_widget_show (vbox);
@@ -156,7 +150,7 @@
 	ed->entry = gtk_entry_new ();
 	gtk_entry_set_text (GTK_ENTRY (ed->entry), ed->marker->name);
 	gtk_entry_set_activates_default (GTK_ENTRY (ed->entry), TRUE);
-	
+
 	gtk_widget_show (ed->entry);
 	gtk_table_attach (GTK_TABLE (table), ed->entry,
 			  1, 3, 0, 1,
@@ -167,7 +161,7 @@
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), ed->entry);
 	marlin_add_paired_relations (ed->entry, ATK_RELATION_LABELLED_BY,
 				     label, ATK_RELATION_LABEL_FOR);
-	
+
 	label = marlin_make_title_label (_("_Position:"));
 	gtk_widget_show (label);
 	PACK (table, label, 0, 1, GTK_FILL);
@@ -176,7 +170,7 @@
 		      "total_frames", &max_frames,
 		      "sample_rate", &rate,
 		      NULL);
-	
+
 	ed->position = marlin_position_spinner_new ();
 	g_object_set (G_OBJECT (ed->position),
 		      "rate", rate,
@@ -187,7 +181,7 @@
 		      NULL);
 
 	adj->value = (double) ed->marker->position;
-	
+
 	gtk_widget_show (ed->position);
 	PACK (table, ed->position, 1, 1, GTK_FILL | GTK_EXPAND);
 
@@ -213,6 +207,6 @@
 
 	g_signal_connect (ed->dialog, "response",
 			  G_CALLBACK (edit_marker_response), ed);
-	
+
 	return ed->dialog;
 }

Modified: trunk/src/dialogs/marlin-edit-marker-dialog.h
==============================================================================
--- trunk/src/dialogs/marlin-edit-marker-dialog.h	(original)
+++ trunk/src/dialogs/marlin-edit-marker-dialog.h	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain prettypeople org>
  *
- *  Copyright 2002-2004 Iain Holmes
+ *  Copyright 2002-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -22,8 +22,7 @@
 #ifndef __MARLIN_EDIT_MARKER_DIALOG_H__
 #define __MARLIN_EDIT_MARKER_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-base-window.h>
 

Modified: trunk/src/dialogs/marlin-information-dialog.c
==============================================================================
--- trunk/src/dialogs/marlin-information-dialog.c	(original)
+++ trunk/src/dialogs/marlin-information-dialog.c	Sat Dec 27 23:43:09 2008
@@ -31,19 +31,7 @@
 
 #include <gio/gio.h>
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-x-utils.h>
 #include <marlin/marlin-gst-extras.h>

Modified: trunk/src/dialogs/marlin-information-dialog.h
==============================================================================
--- trunk/src/dialogs/marlin-information-dialog.h	(original)
+++ trunk/src/dialogs/marlin-information-dialog.h	Sat Dec 27 23:43:09 2008
@@ -22,9 +22,7 @@
 #ifndef __MARLIN_INFORMATION_DIALOG_H__
 #define __MARLIN_INFORMATION_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-base-window.h>
 

Modified: trunk/src/dialogs/marlin-move-cursor-dialog.c
==============================================================================
--- trunk/src/dialogs/marlin-move-cursor-dialog.c	(original)
+++ trunk/src/dialogs/marlin-move-cursor-dialog.c	Sat Dec 27 23:43:09 2008
@@ -25,13 +25,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-marker-model.h>
 #include <marlin/marlin-sample.h>
@@ -51,7 +45,7 @@
 	GtkWidget *combo;
 	GtkWidget *marker_combo;
 	GtkWidget *marker_hbox, *position_hbox;
-	
+
 	MarlinMarkerModel *marker_model;
 	GList *markers;
 	guint64 cursor_position;
@@ -115,7 +109,7 @@
 	guint64 position;
 	int marker_no;
 	MarlinMarker *marker;
-	
+
 	switch (response_id) {
 	case GTK_RESPONSE_OK:
 
@@ -172,12 +166,10 @@
 		default:
 			g_assert_not_reached ();
 		}
-			
+
 		g_object_set (G_OBJECT (mdd->view),
 			      "cursor_position", position,
 			      NULL);
-
-		
 		break;
 
 	case GTK_RESPONSE_CANCEL:
@@ -228,7 +220,7 @@
 	MarlinDisplay display;
 	char *name, *title;
 	guint rate;
-	
+
 	sample = marlin_base_window_get_sample (base);
 	view = marlin_base_window_get_sample_view (base);
 	position = marlin_base_window_get_position (base);
@@ -253,7 +245,7 @@
 	g_object_get (G_OBJECT (mdd->marker_model),
 		      "markers", &mdd->markers,
 		      NULL);
-	
+
 	editor = gtk_dialog_new ();
 	gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE);
 /* 	gtk_window_set_default_size (GTK_WINDOW (editor), 325, 95); */
@@ -261,7 +253,7 @@
 	gtk_window_set_transient_for (GTK_WINDOW (editor), window);
 	title = g_strdup_printf (_("Move Cursor: %s"), name);
 	g_free (name);
-	
+
 	gtk_window_set_title (GTK_WINDOW (editor), title);
 	g_free (title);
 
@@ -275,7 +267,7 @@
 	gtk_table_set_col_spacings (GTK_TABLE (table), 6);
 	gtk_widget_show (table);
 	gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
-	
+
 	label = gtk_label_new_with_mnemonic ("Move cursor _to:");
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_widget_show (label);
@@ -283,16 +275,16 @@
 
 	mdd->combo = gtk_combo_box_new_text ();
 	/* FIXME: the combo is controller for other things too */
-	marlin_add_paired_relations (GTK_WIDGET (mdd->combo), 
+	marlin_add_paired_relations (GTK_WIDGET (mdd->combo),
 				     ATK_RELATION_LABELLED_BY,
 				     label, ATK_RELATION_LABEL_FOR);
-	
+
 	g_signal_connect (G_OBJECT (mdd->combo), "changed",
 			  G_CALLBACK (move_combo_changed), mdd);
-	
+
 	gtk_widget_show (mdd->combo);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), mdd->combo);
-	
+
 	gtk_table_attach (GTK_TABLE (table), mdd->combo,
 			  1, 3, 0, 1,
 			  GTK_FILL | GTK_EXPAND,
@@ -324,7 +316,7 @@
 		      "display_as", (MarlinDisplay) display,
 		      "rate", rate,
 		      NULL);
-	
+
 	gtk_entry_set_activates_default (GTK_ENTRY (mdd->position), TRUE);
 	gtk_widget_show (GTK_WIDGET (mdd->position));
 	gtk_box_pack_start (GTK_BOX (mdd->position_hbox), GTK_WIDGET (mdd->position), TRUE, TRUE, 0);
@@ -360,7 +352,7 @@
 
 	/* Do this here so that the marker_hbox will exist */
 	make_move_combo_menu (GTK_COMBO_BOX (mdd->combo), mdd);
-	
+
 	gtk_dialog_add_button (GTK_DIALOG (editor),
 			       GTK_STOCK_CANCEL,
 			       GTK_RESPONSE_CANCEL);
@@ -371,7 +363,7 @@
 			       GTK_STOCK_HELP,
 			       GTK_RESPONSE_HELP);
 	gtk_dialog_set_default_response (GTK_DIALOG (editor), GTK_RESPONSE_OK);
-	
+
 	g_signal_connect (editor, "response",
 			  G_CALLBACK (move_cursor_response_cb), mdd);
 

Modified: trunk/src/dialogs/marlin-move-cursor-dialog.h
==============================================================================
--- trunk/src/dialogs/marlin-move-cursor-dialog.h	(original)
+++ trunk/src/dialogs/marlin-move-cursor-dialog.h	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain gnome org>
  *
- *  Copyright 2002-2005 Iain Holmes
+ *  Copyright 2002-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_MOVE_CURSOR_DIALOG_H__
 #define __MARLIN_MOVE_CURSOR_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-base-window.h>
 

Modified: trunk/src/dialogs/marlin-mp3-dialog.c
==============================================================================
--- trunk/src/dialogs/marlin-mp3-dialog.c	(original)
+++ trunk/src/dialogs/marlin-mp3-dialog.c	Sat Dec 27 23:43:09 2008
@@ -21,16 +21,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhscale.h>
+#include <gtk/gtk.h>
 
 #include <gst/gst.h>
 

Modified: trunk/src/dialogs/marlin-mp3-dialog.h
==============================================================================
--- trunk/src/dialogs/marlin-mp3-dialog.h	(original)
+++ trunk/src/dialogs/marlin-mp3-dialog.h	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain prettypeople org>
  *
- *  Copyright 2003 Iain Holmes
+ *  Copyright 2003-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_MP3_DIALOG_H__
 #define __MARLIN_MP3_DIALOG_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <marlin/marlin-save-pipeline.h>
 
 void marlin_mp3_dialog_new (GtkWindow *parent,

Modified: trunk/src/dialogs/marlin-new-dialog.c
==============================================================================
--- trunk/src/dialogs/marlin-new-dialog.c	(original)
+++ trunk/src/dialogs/marlin-new-dialog.c	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain gnome org>
  *
- *  Copyright 2002-2007 Iain Holmes
+ *  Copyright 2002-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -25,14 +25,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkradiobutton.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-a11y-helper.h>
 #include <marlin/marlin-stock.h>

Modified: trunk/src/dialogs/marlin-select-region-dialog.c
==============================================================================
--- trunk/src/dialogs/marlin-select-region-dialog.c	(original)
+++ trunk/src/dialogs/marlin-select-region-dialog.c	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain gnome org>
  *
- *  Copyright 2002-2005 Iain Holmes
+ *  Copyright 2002-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -25,14 +25,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-marker-model.h>
 #include <marlin/marlin-sample.h>
@@ -53,7 +46,7 @@
 	GtkWidget *sp_hbox, *sm_hbox, *fp_hbox, *fm_hbox;
 	GtkWidget *sm_combo, *fm_combo;
 	GtkWidget *snap, *coverage;
-	
+
 	GList *markers;
 
 	guint fpp;
@@ -87,7 +80,7 @@
 	MarlinUndoContext *ctxt;
 	MarlinMarker *marker;
 	MarlinCoverage coverage;
-	
+
 	switch (response_id) {
 	case GTK_RESPONSE_OK:
 		start_active = gtk_combo_box_get_active (GTK_COMBO_BOX (srd->start_combo));
@@ -101,14 +94,14 @@
 		case SELECT_START_CURSOR:
 			start = srd->position;
 			break;
-			
+
 		case SELECT_START_CUSTOM:
 			start = (guint64) GTK_SPIN_BUTTON (srd->start)->adjustment->value;
 			g_object_get (G_OBJECT (srd->start),
 				      "display_as", &display,
 				      NULL);
 			marlin_gconf_set_int ("/apps/marlin/system-state/select-range-start-display", display);
-			
+
 			break;
 
 		case SELECT_START_MARKER:
@@ -134,7 +127,7 @@
 		case SELECT_END_CURSOR:
 			finish = srd->position;
 			break;
-			
+
 		case SELECT_END_CUSTOM:
 			finish = GTK_SPIN_BUTTON (srd->finish)->adjustment->value;
 
@@ -154,7 +147,7 @@
 		default:
 			g_assert_not_reached ();
 		}
-		
+
 		marlin_sample_selection_clear (srd->selection, NULL);
 
 		ctxt = marlin_undo_manager_context_begin (srd->undo_manager,
@@ -162,19 +155,19 @@
 
 		coverage = gtk_combo_box_get_active (GTK_COMBO_BOX (srd->coverage));
 		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (srd->snap))) {
-			start = marlin_sample_previous_zero (srd->sample, start, 
+			start = marlin_sample_previous_zero (srd->sample, start,
 							     coverage);
 			finish = marlin_sample_next_zero (srd->sample, finish,
 							  coverage);
 		}
-						  
-		marlin_sample_selection_set (srd->selection, 
-					     coverage, 
+
+		marlin_sample_selection_set (srd->selection,
+					     coverage,
 					     start, finish, ctxt);
 		marlin_undo_manager_context_end (srd->undo_manager, ctxt);
 
 		break;
-		
+
 	case GTK_RESPONSE_CANCEL:
 		break;
 
@@ -339,11 +332,11 @@
 
 	marlin_sample_selection_get (srd->selection, &coverage,
 				     &start, &finish);
-	
+
 	g_object_get (G_OBJECT (mm),
 		      "markers", &srd->markers,
 		      NULL);
-	
+
 	g_object_unref (G_OBJECT (mm));
 
 	editor = gtk_dialog_new ();
@@ -351,7 +344,7 @@
 	/* 	gtk_window_set_default_size (GTK_WINDOW (editor), 325, 128); */
 	gtk_window_set_resizable (GTK_WINDOW (editor), FALSE);
 	gtk_window_set_transient_for (GTK_WINDOW (editor), GTK_WINDOW (window));
-	
+
 	title = g_strdup_printf (_("Select a Region: %s"), name);
 	g_free (name);
 	gtk_window_set_title (GTK_WINDOW (editor), title);
@@ -361,13 +354,13 @@
  	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (editor)->vbox), vbox);
-	
+
 	table = gtk_table_new (2, 5, FALSE);
 	gtk_table_set_col_spacings (GTK_TABLE (table), 6);
 	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
 	gtk_widget_show (table);
 	gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
-	
+
 	label = gtk_label_new_with_mnemonic (_("Selection _Start:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
 	gtk_widget_show (label);
@@ -404,7 +397,7 @@
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (srd->sp_hbox), label, FALSE, FALSE, 0);
-	
+
 	display = marlin_gconf_get_int ("/apps/marlin/system-state/select-range-start-display");
 	srd->start = marlin_position_spinner_new ();
 	g_object_set (G_OBJECT (srd->start),
@@ -446,7 +439,7 @@
 	}
 
 	make_start_combo_menu (GTK_COMBO_BOX (srd->start_combo), srd);
-	
+
 	label = gtk_label_new_with_mnemonic (_("Selection _End:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
 	gtk_widget_show (label);
@@ -483,7 +476,7 @@
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (srd->fp_hbox), label, FALSE, FALSE, 0);
-	
+
 	display = marlin_gconf_get_int ("/apps/marlin/system-state/select-range-finish-display");
 	srd->finish = marlin_position_spinner_new ();
 	g_object_set (G_OBJECT (srd->finish),
@@ -555,7 +548,7 @@
 			       GTK_STOCK_HELP,
 			       GTK_RESPONSE_HELP);
 	gtk_dialog_set_default_response (GTK_DIALOG (editor), GTK_RESPONSE_OK);
-	
+
 	g_signal_connect (editor, "response",
 			  G_CALLBACK (dialog_response_cb), srd);
 

Modified: trunk/src/dialogs/marlin-select-region-dialog.h
==============================================================================
--- trunk/src/dialogs/marlin-select-region-dialog.h	(original)
+++ trunk/src/dialogs/marlin-select-region-dialog.h	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain prettypeople org>
  *
- *  Copyright 2002-2004 Iain Holmes
+ *  Copyright 2002-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_SELECT_REGION_DIALOG_H__
 #define __MARLIN_SELECT_REGION_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-base-window.h>
 

Modified: trunk/src/dialogs/marlin-undo-history-dialog.c
==============================================================================
--- trunk/src/dialogs/marlin-undo-history-dialog.c	(original)
+++ trunk/src/dialogs/marlin-undo-history-dialog.c	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain prettypeople org>
  *
- *  Copyright 2002-2005 Iain Holmes
+ *  Copyright 2002-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -25,19 +25,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-undo-manager.h>
 #include <marlin/marlin-a11y-helper.h>

Modified: trunk/src/dialogs/marlin-undo-history-dialog.h
==============================================================================
--- trunk/src/dialogs/marlin-undo-history-dialog.h	(original)
+++ trunk/src/dialogs/marlin-undo-history-dialog.h	Sat Dec 27 23:43:09 2008
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_UNDO_HISTORY_DIALOG_H__
 #define __MARLIN_UNDO_HISTORY_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-base-window.h>
 

Modified: trunk/src/dialogs/marlin-vorbis-dialog.c
==============================================================================
--- trunk/src/dialogs/marlin-vorbis-dialog.c	(original)
+++ trunk/src/dialogs/marlin-vorbis-dialog.c	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain prettypeople org>
  *
- *  Copyright 2003 Iain Holmes
+ *  Copyright 2003-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -21,16 +21,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhscale.h>
+#include <gtk/gtk.h>
 
 #include <gst/gst.h>
 

Modified: trunk/src/dialogs/marlin-vorbis-dialog.h
==============================================================================
--- trunk/src/dialogs/marlin-vorbis-dialog.h	(original)
+++ trunk/src/dialogs/marlin-vorbis-dialog.h	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain prettypeople org>
  *
- *  Copyright 2003 Iain Holmes
+ *  Copyright 2003-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_VORBIS_DIALOG_H__
 #define __MARLIN_VORBIS_DIALOG_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <marlin/marlin-save-pipeline.h>
 
 void marlin_vorbis_dialog_new (GtkWindow *window,

Modified: trunk/src/libegg/egg-editable-toolbar.c
==============================================================================
--- trunk/src/libegg/egg-editable-toolbar.c	(original)
+++ trunk/src/libegg/egg-editable-toolbar.c	Sat Dec 27 23:43:09 2008
@@ -25,19 +25,7 @@
 #include "egg-editable-toolbar.h"
 #include "egg-toolbars-model.h"
 
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtkseparatortoolitem.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 

Modified: trunk/src/libegg/egg-editable-toolbar.h
==============================================================================
--- trunk/src/libegg/egg-editable-toolbar.h	(original)
+++ trunk/src/libegg/egg-editable-toolbar.h	Sat Dec 27 23:43:09 2008
@@ -21,11 +21,7 @@
 
 #include "egg-toolbars-model.h"
 
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/libegg/egg-toolbar-editor.c
==============================================================================
--- trunk/src/libegg/egg-toolbar-editor.c	(original)
+++ trunk/src/libegg/egg-toolbar-editor.c	Sat Dec 27 23:43:09 2008
@@ -26,14 +26,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkimage.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-cursors.h>
 

Modified: trunk/src/libegg/egg-toolbar-editor.h
==============================================================================
--- trunk/src/libegg/egg-toolbar-editor.h	(original)
+++ trunk/src/libegg/egg-toolbar-editor.h	Sat Dec 27 23:43:09 2008
@@ -19,8 +19,7 @@
 #ifndef EGG_TOOLBAR_EDITOR_H
 #define EGG_TOOLBAR_EDITOR_H
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 #include "egg-toolbars-model.h"
 
@@ -42,7 +41,7 @@
 struct EggToolbarEditor
 {
 	GtkVBox parent_object;
-	
+
 	/*< private >*/
 	EggToolbarEditorPrivate *priv;
 };

Modified: trunk/src/marlin-cdda-record.h
==============================================================================
--- trunk/src/marlin-cdda-record.h	(original)
+++ trunk/src/marlin-cdda-record.h	Sat Dec 27 23:43:09 2008
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_CDDA_RECORD_H__
 #define __MARLIN_CDDA_RECORD_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 GtkWidget *marlin_cdda_record_new (GtkWindow *parent_window);
 

Modified: trunk/src/marlin-clipboard-info.c
==============================================================================
--- trunk/src/marlin-clipboard-info.c	(original)
+++ trunk/src/marlin-clipboard-info.c	Sat Dec 27 23:43:09 2008
@@ -21,12 +21,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-program.h>
 #include <marlin/marlin-utils.h>
@@ -41,7 +36,7 @@
 	guint64 total, ms, size;
 	guint rate, channels;
 	char *text;
-	
+
 	g_object_get (G_OBJECT (clipboard),
 		      "total_frames", &total,
 		      "sample_rate", &rate,
@@ -61,7 +56,7 @@
 	gtk_label_set_text (GTK_LABEL (info->length), text);
 	g_free (text);
 
-	gtk_label_set_text (GTK_LABEL (info->src), 
+	gtk_label_set_text (GTK_LABEL (info->src),
 			    marlin_program_get_clip_source (marlin_program_get_default ()));
 
 	size = channels * total * sizeof (float);
@@ -75,7 +70,7 @@
 	      MarlinClipboardInfo *info)
 {
 	MarlinSample *clipboard = MARLIN_SAMPLE (marlin_program_get_clipboard (program));
-	
+
 	fill_in_clipboard_details (info, clipboard);
 }
 
@@ -94,14 +89,14 @@
 		    MarlinClipboardInfo *info)
 {
 	MarlinProgram *program = marlin_program_get_default ();
-	
+
 	switch (response_id) {
 	default:
 		break;
 	}
 
 	g_signal_handler_disconnect (G_OBJECT (program), info->clip_id);
-	
+
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
@@ -115,7 +110,7 @@
 	MarlinProgram *program = marlin_program_get_default ();
 	MarlinSample *clipboard = MARLIN_SAMPLE (marlin_program_get_clipboard (program));
 	GtkWidget *vbox, *table, *label, *button;
-	
+
 	info = g_new (MarlinClipboardInfo, 1);
 
 	info->dialog = gtk_dialog_new ();
@@ -149,7 +144,7 @@
 	info->attributes = marlin_make_info_label ("");
 	gtk_widget_show (info->attributes);
 	PACK_TABLE (table, info->attributes, 1, 1);
-	
+
 	label = marlin_make_title_label (_("Length:"));
 	gtk_widget_show (label);
 	PACK_TABLE (table, label, 0, 2);
@@ -157,7 +152,7 @@
 	info->length = marlin_make_info_label ("");
 	gtk_widget_show (info->length);
 	PACK_TABLE (table, info->length, 1, 2);
-	
+
 	label = marlin_make_title_label (_("Frames:"));
 	gtk_widget_show (label);
 	PACK_TABLE (table, label, 0, 3);

Modified: trunk/src/marlin-clipboard-info.h
==============================================================================
--- trunk/src/marlin-clipboard-info.h	(original)
+++ trunk/src/marlin-clipboard-info.h	Sat Dec 27 23:43:09 2008
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_CLIPBOARD_INFO_H__
 #define __MARLIN_CLIPBOARD_INFO_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 typedef struct _MarlinClipboardInfo MarlinClipboardInfo;
 

Modified: trunk/src/marlin-generate-tone.h
==============================================================================
--- trunk/src/marlin-generate-tone.h	(original)
+++ trunk/src/marlin-generate-tone.h	Sat Dec 27 23:43:09 2008
@@ -1,11 +1,11 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Iain Holmes <iain prettypeople org>
+ *  Authors: Iain Holmes <iain gnome org>
  *
  *  Copyright 2003 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_GENERATE_TONE_H__
 #define __MARLIN_GENERATE_TONE_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 GtkWidget *marlin_generate_tone_new (GtkWindow *parent_window);
 

Modified: trunk/src/marlin-progress-window.c
==============================================================================
--- trunk/src/marlin-progress-window.c	(original)
+++ trunk/src/marlin-progress-window.c	Sat Dec 27 23:43:09 2008
@@ -1,11 +1,11 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Iain Holmes <iain prettypeople org>
+ *  Authors: Iain Holmes <iain gnome org>
  *
- *  Copyright 2002 Iain Holmes
+ *  Copyright 2002-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -21,14 +21,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-sample.h>
 #include <marlin/marlin-utils.h>
@@ -86,13 +79,13 @@
 
 	if (progress != -1) {
 		left = 100 - progress;
-		
+
 		dt = g_timer_elapsed (window->timer, NULL);
-		
+
 		length = (dt / (double) progress) * left;
-		
+
 		t = marlin_ms_to_pretty_time ((int)length * 1000);
-		
+
 		text = make_eta_string (t);
 		gtk_progress_bar_set_text (GTK_PROGRESS_BAR (window->progress_bar),
 					   text);
@@ -154,11 +147,11 @@
 {
 	const char *name;
 
-#if 0	
+#if 0
 	name = g_param_spec_get_name (pspec);
 	if (strcmp (name, "description-R") == 0) {
 		char *desc;
-		
+
 		g_object_get (G_OBJECT (operation),
 			      "description", &desc,
 			      NULL);
@@ -192,7 +185,7 @@
 	char *text;
 	MarlinProgressWindow *window;
 	GdkCursor *cursor;
-	
+
 	window = g_new0 (MarlinProgressWindow, 1);
 
 	if (empty_jar_pixbuf == NULL) {
@@ -204,7 +197,7 @@
 	window->operation = operation;
 	window->op_id = g_signal_connect (G_OBJECT (window->operation), "notify",
 					  G_CALLBACK (operation_notify), window);
-			  
+
 	window->parent_window = GTK_WIDGET (parent_window);
 	window->dialog = gtk_dialog_new_with_buttons (primary, parent_window,
 						      GTK_DIALOG_DESTROY_WITH_PARENT |
@@ -218,7 +211,7 @@
 	GTK_WIDGET_SET_FLAGS (window->pause, GTK_CAN_DEFAULT);
 	g_signal_connect (window->pause, "toggled",
 			  G_CALLBACK (pause_toggled), window);
-	
+
 	gtk_widget_show (window->pause);
 	gtk_dialog_add_action_widget (GTK_DIALOG (window->dialog),
 				      window->pause, GTK_RESPONSE_NONE);
@@ -229,7 +222,7 @@
 
 	g_signal_connect (G_OBJECT (window->dialog), "response",
 			  G_CALLBACK (response_callback), window);
-			  
+
 /* 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (window->dialog)->vbox), MARLIN_DIALOG_BORDER_WIDTH); */
 	gtk_window_set_transient_for (GTK_WINDOW (window->dialog), parent_window);
 
@@ -240,7 +233,7 @@
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window->dialog)->vbox), vbox, TRUE, TRUE, 0);
 	gtk_widget_show (vbox);
-	
+
 	if (secondary != NULL) {
 		text = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s", primary, secondary);
 	} else {

Modified: trunk/src/marlin-progress-window.h
==============================================================================
--- trunk/src/marlin-progress-window.h	(original)
+++ trunk/src/marlin-progress-window.h	Sat Dec 27 23:43:09 2008
@@ -2,10 +2,10 @@
 /*
  *  Authors: Iain Holmes <iain prettypeople org>
  *
- *  Copyright 2002 Iain Holmes
+ *  Copyright 2002-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -22,18 +22,19 @@
 #ifndef __MARLIN_PROGRESS_WINDOW_H__
 #define __MARLIN_PROGRESS_WINDOW_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-sample.h>
 #include <marlin/marlin-operation.h>
 
+G_BEGIN_DECLS
+
 typedef struct _MarlinProgressWindow {
 	MarlinSample *sample;
 	MarlinOperation *operation;
 	gulong signal_id;
 	gulong op_id;
-	
+
 	GtkWidget *dialog;
 	GtkWidget *label;
 	GtkWidget *progress_bar;
@@ -54,4 +55,7 @@
 						  const char *primary,
 						  const char *secondary);
 void marlin_progress_window_destroy (MarlinProgressWindow *window);
+
+G_END_DECLS
+
 #endif

Modified: trunk/src/marlin-recent-action.c
==============================================================================
--- trunk/src/marlin-recent-action.c	(original)
+++ trunk/src/marlin-recent-action.c	Sat Dec 27 23:43:09 2008
@@ -5,7 +5,7 @@
  *  Copyright 2006 Emmanuele Bassi
  *
  *  This file is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation, or (at your option)
  *  any later version.
  *
@@ -22,13 +22,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmenutoolbutton.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkrecentmanager.h>
-#include <gtk/gtkrecentchooserdialog.h>
-#include <gtk/gtkrecentchoosermenu.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "marlin-recent-action.h"
 

Modified: trunk/src/marlin-recent-action.h
==============================================================================
--- trunk/src/marlin-recent-action.h	(original)
+++ trunk/src/marlin-recent-action.h	Sat Dec 27 23:43:09 2008
@@ -1,11 +1,11 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Iain Holmes <iain prettypeople org>
+ *  Authors: Iain Holmes <iain gnome org>
  *
  *  Copyright 2003 - 2006 Iain Holmes
  *
  *  This file is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This file is distributed in the hope that it will be useful,
@@ -22,8 +22,7 @@
 #ifndef __MARLIN_RECENT_ACTION_H__
 #define __MARLIN_RECENT_ACTION_H__
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkrecentmanager.h>
+#include <gtk/gtk.h>
 
 #define MARLIN_TYPE_RECENT_ACTION (marlin_recent_action_get_type ())
 #define MARLIN_RECENT_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MARLIN_TYPE_RECENT_ACTION, MarlinRecentAction))
@@ -39,7 +38,7 @@
 struct _MarlinRecentActionClass {
 	GtkActionClass parent_class;
 
-	void (*item_activated) (MarlinRecentAction *action, 
+	void (*item_activated) (MarlinRecentAction *action,
 				GtkRecentInfo *info);
 };
 

Modified: trunk/src/marlin-record.h
==============================================================================
--- trunk/src/marlin-record.h	(original)
+++ trunk/src/marlin-record.h	Sat Dec 27 23:43:09 2008
@@ -1,11 +1,11 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Iain Holmes <iain prettypeople org>
+ *  Authors: Iain Holmes <iain gnome org>
  *
- *  Copyright 2003 Iain Holmes
+ *  Copyright 2003-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -22,7 +22,7 @@
 #ifndef __MARLIN_RECORD_H__
 #define __MARLIN_RECORD_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 GtkWidget *marlin_record_new (GtkWindow *parent_window);
 

Modified: trunk/src/marlin-toolbar.c
==============================================================================
--- trunk/src/marlin-toolbar.c	(original)
+++ trunk/src/marlin-toolbar.c	Sat Dec 27 23:43:09 2008
@@ -22,8 +22,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-file-utils.h>
 

Modified: trunk/src/marlin-window-menu.c
==============================================================================
--- trunk/src/marlin-window-menu.c	(original)
+++ trunk/src/marlin-window-menu.c	Sat Dec 27 23:43:09 2008
@@ -27,22 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkaboutdialog.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-file-utils.h>
 #include <marlin/marlin-utils.h>
@@ -90,7 +75,7 @@
 
 	if (marlin_new_sample_dialog_run (MARLIN_BASE_WINDOW (data),
 					  _("Create a new sample"),
-					  _("Create Sample"), 
+					  _("Create Sample"),
 					  &rate, &channels)) {
 		marlin_open_window (NULL, NULL, NULL, NULL);
 	}

Modified: trunk/src/marlin-window.c
==============================================================================
--- trunk/src/marlin-window.c	(original)
+++ trunk/src/marlin-window.c	Sat Dec 27 23:43:09 2008
@@ -1490,8 +1490,6 @@
 	g_signal_connect (G_OBJECT (window), "drag_data_received",
 			  G_CALLBACK (drag_data_received), NULL);
 
-	marlin_window_set_icon (window, NULL);
-
 	frames = (guint64) 0;
 	priv->sample = NULL;
 	priv->selection = NULL;
@@ -1736,13 +1734,16 @@
 		set_path_sensitive (priv->ui_action, "MediaRecord", FALSE);
 	}
 
+	/* Set icon after the no jack window has been shown */
+	marlin_window_set_icon (window, NULL);
+
 	return window;
 }
 
 static int
 get_int (GConfClient *client,
-	 const char *root,
-	 const char *key)
+	 const char  *root,
+	 const char  *key)
 {
 	int ret;
 	char *fullkey;
@@ -1756,7 +1757,7 @@
 
 MarlinWindow *
 marlin_window_new_from_state (MarlinSample *sample,
-			      const char *uuid)
+			      const char   *uuid)
 {
 	MarlinWindow *window;
 	GConfClient *client;
@@ -1816,8 +1817,8 @@
 }
 
 static void
-maybe_save_response (GtkDialog *dialog,
-		     guint response_id,
+maybe_save_response (GtkDialog    *dialog,
+		     guint         response_id,
 		     MarlinWindow *window)
 {
 	switch (response_id) {

Modified: trunk/src/marlin-window.h
==============================================================================
--- trunk/src/marlin-window.h	(original)
+++ trunk/src/marlin-window.h	Sat Dec 27 23:43:09 2008
@@ -1,11 +1,11 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Iain Holmes <iain prettypeople org>
+ *  Authors: Iain Holmes <iain gnome org>
  *
- *  Copyright 2002 Iain Holmes
+ *  Copyright 2002-2008 Iain Holmes
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of version 2 of the GNU General Public 
+ *  it under the terms of version 2 of the GNU General Public
  *  License as published by the Free Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -22,9 +22,7 @@
 #ifndef __MARLIN_WINDOW_H__
 #define __MARLIN_WINDOW_H__
 
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-sample.h>
 #include <marlin/marlin-sample-view.h>

Modified: trunk/src/other/gtkvumeter.h
==============================================================================
--- trunk/src/other/gtkvumeter.h	(original)
+++ trunk/src/other/gtkvumeter.h	Sat Dec 27 23:43:09 2008
@@ -12,7 +12,7 @@
 #ifndef __GTKVUMETER_H__
 #define __GTKVUMETER_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <marlin/marlin-types.h>
 

Modified: trunk/src/other/koto-undo-action.h
==============================================================================
--- trunk/src/other/koto-undo-action.h	(original)
+++ trunk/src/other/koto-undo-action.h	Sat Dec 27 23:43:09 2008
@@ -19,7 +19,7 @@
 #ifndef _KOTO_UNDO_ACTION_H
 #define _KOTO_UNDO_ACTION_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 #include <marlin/marlin-undo-manager.h>
 
 G_BEGIN_DECLS
@@ -44,7 +44,7 @@
 
 GType koto_undo_action_get_type (void) G_GNUC_CONST;
 
-GtkAction *koto_undo_action_new (const char        *name, 
+GtkAction *koto_undo_action_new (const char        *name,
 				 MarlinUndoManager *undo_manager,
 				 gboolean           undo_mode);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]