GNOME.org
 

libgnomeprintui r2712 - in trunk: . libgnomeprintui libgnomeprintui/gpaui

Author: kmaraas
Date: Fri Mar  6 09:45:08 2009
New Revision: 2712
URL: http://svn.gnome.org/viewvc/libgnomeprintui?rev=2712&view=rev

Log:
2009-03-06  Kjartan Maraas  <kmaraas gnome org>

	* libgnomeprintui/gnome-font-dialog.c:
	(gnome_font_selection_class_init), (gnome_font_selection_init),
	(gnome_font_preview_class_init), (gnome_font_dialog_class_init):
	* libgnomeprintui/gnome-font-dialog.h:
	* libgnomeprintui/gnome-print-content-selector.c:
	* libgnomeprintui/gnome-print-content-selector.h:
	* libgnomeprintui/gnome-print-copies.h:
	* libgnomeprintui/gnome-print-job-preview.c:
	* libgnomeprintui/gnome-print-job-preview.h:
	* libgnomeprintui/gnome-print-layout-selector.c:
	* libgnomeprintui/gnome-print-page-selector.c:
	* libgnomeprintui/gnome-print-paper-selector.c:
	* libgnomeprintui/gnome-print-widget.h:
	* libgnomeprintui/gnome-printer-selector.c:
	* libgnomeprintui/gnome-printer-selector.h:
	* libgnomeprintui/gpaui/gpa-option-menu.c:
	* libgnomeprintui/gpaui/gpa-settings-selector.c:
	* libgnomeprintui/gpaui/gpa-transport-selector.c:
	* libgnomeprintui/gpaui/gpa-widget.c:
	* libgnomeprintui/gpaui/gpa-widget.h:
	Use single glib/gtk+ includes. Stop using deprecated API etc.

Modified:
   trunk/ChangeLog
   trunk/libgnomeprintui/gnome-font-dialog.c
   trunk/libgnomeprintui/gnome-font-dialog.h
   trunk/libgnomeprintui/gnome-print-content-selector.c
   trunk/libgnomeprintui/gnome-print-content-selector.h
   trunk/libgnomeprintui/gnome-print-copies.h
   trunk/libgnomeprintui/gnome-print-job-preview.c
   trunk/libgnomeprintui/gnome-print-job-preview.h
   trunk/libgnomeprintui/gnome-print-layout-selector.c
   trunk/libgnomeprintui/gnome-print-page-selector.c
   trunk/libgnomeprintui/gnome-print-paper-selector.c
   trunk/libgnomeprintui/gnome-print-widget.h
   trunk/libgnomeprintui/gnome-printer-selector.c
   trunk/libgnomeprintui/gnome-printer-selector.h
   trunk/libgnomeprintui/gpaui/gpa-option-menu.c
   trunk/libgnomeprintui/gpaui/gpa-settings-selector.c
   trunk/libgnomeprintui/gpaui/gpa-transport-selector.c
   trunk/libgnomeprintui/gpaui/gpa-widget.c
   trunk/libgnomeprintui/gpaui/gpa-widget.h

Modified: trunk/libgnomeprintui/gnome-font-dialog.c
==============================================================================
--- trunk/libgnomeprintui/gnome-font-dialog.c	(original)
+++ trunk/libgnomeprintui/gnome-font-dialog.c	Fri Mar  6 09:45:08 2009
@@ -127,7 +127,7 @@
 	object_class = (GObjectClass *) klass;
 	gtk_object_class = (GtkObjectClass *) klass;
   
-	gfs_parent_class = gtk_type_class (GTK_TYPE_HBOX);
+	gfs_parent_class = g_type_class_peek (GTK_TYPE_HBOX);
   
 	gfs_signals[FONT_SET] = g_signal_new ("font_set",
 					      G_OBJECT_CLASS_TYPE (object_class),
@@ -189,7 +189,7 @@
 	gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col);
 	gtk_widget_show (tv);
 	g_signal_connect ((GObject*) selection, "changed",
-			  GTK_SIGNAL_FUNC (gnome_font_selection_select_family),
+			  G_CALLBACK (gnome_font_selection_select_family),
 			  fontsel);
 	gtk_container_add ((GtkContainer *) sw, tv);
 	fontsel->family = tv;
@@ -240,7 +240,7 @@
 	gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col);
 	gtk_widget_show (tv);
 	g_signal_connect ((GObject*) selection, "changed",
-			  GTK_SIGNAL_FUNC (gnome_font_selection_select_style),
+			  G_CALLBACK (gnome_font_selection_select_style),
 			  fontsel);
 	gtk_container_add ((GtkContainer *) sw, tv);
 	fontsel->style = tv;
@@ -650,7 +650,7 @@
   
 	object_class = (GtkObjectClass *) klass;
   
-	gfp_parent_class = gtk_type_class (GTK_TYPE_IMAGE);
+	gfp_parent_class = g_type_class_peek (GTK_TYPE_IMAGE);
   
 	object_class->destroy = gnome_font_preview_destroy;
 }
@@ -850,7 +850,7 @@
   
 	object_class = (GtkObjectClass*) klass;
   
-	gfsd_parent_class = gtk_type_class (GTK_TYPE_DIALOG);
+	gfsd_parent_class = g_type_class_peek (GTK_TYPE_DIALOG);
 }
 
 static void

Modified: trunk/libgnomeprintui/gnome-font-dialog.h
==============================================================================
--- trunk/libgnomeprintui/gnome-font-dialog.h	(original)
+++ trunk/libgnomeprintui/gnome-font-dialog.h	Fri Mar  6 09:45:08 2009
@@ -63,7 +63,7 @@
 typedef struct _GnomeFontDialog      GnomeFontDialog;
 typedef struct _GnomeFontDialogClass GnomeFontDialogClass;
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libgnomeprint/gnome-font.h>
 
 /*
@@ -82,7 +82,7 @@
  *   see the comments in the GtkFontSelectionDialog functions.
  *****************************************************************************/
 
-GtkType	    gnome_font_selection_get_type (void);
+GType	    gnome_font_selection_get_type (void);
 GtkWidget * gnome_font_selection_new (void);
 
 /*
@@ -102,7 +102,7 @@
 /*
  * GnomeFontPreview
  */
-GtkType     gnome_font_preview_get_type (void);
+GType       gnome_font_preview_get_type (void);
 GtkWidget * gnome_font_preview_new (void);
 
 /*
@@ -118,7 +118,7 @@
  *   GnomeFontSelection.
  *****************************************************************************/
 
-GtkType     gnome_font_dialog_get_type (void);
+GType       gnome_font_dialog_get_type (void);
 
 GtkWidget * gnome_font_dialog_new (const gchar *title);
 GtkWidget * gnome_font_dialog_get_fontsel (GnomeFontDialog *gfsd);

Modified: trunk/libgnomeprintui/gnome-print-content-selector.c
==============================================================================
--- trunk/libgnomeprintui/gnome-print-content-selector.c	(original)
+++ trunk/libgnomeprintui/gnome-print-content-selector.c	Fri Mar  6 09:45:08 2009
@@ -30,16 +30,8 @@
 #include <libgnomeprint/gnome-print-config.h>
 #include <libgnomeprint/gnome-print-filter.h>
 
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcheckbutton.h>
-
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 

Modified: trunk/libgnomeprintui/gnome-print-content-selector.h
==============================================================================
--- trunk/libgnomeprintui/gnome-print-content-selector.h	(original)
+++ trunk/libgnomeprintui/gnome-print-content-selector.h	Fri Mar  6 09:45:08 2009
@@ -24,7 +24,7 @@
 #ifndef __GNOME_PRINT_CONTENT_SELECTOR_H__
 #define __GNOME_PRINT_CONTENT_SELECTOR_H__
 
-#include <gtk/gtkframe.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgnomeprintui/gnome-print-copies.h
==============================================================================
--- trunk/libgnomeprintui/gnome-print-copies.h	(original)
+++ trunk/libgnomeprintui/gnome-print-copies.h	Fri Mar  6 09:45:08 2009
@@ -29,6 +29,7 @@
  */
 
 #include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -42,8 +43,6 @@
 typedef struct _GnomePrintCopiesSelector      GnomePrintCopiesSelector;
 typedef struct _GnomePrintCopiesSelectorClass GnomePrintCopiesSelectorClass;
 
-#include <gtk/gtkwidget.h>
-
 /*
  * We implement a single signal at moment:
  *
@@ -55,7 +54,7 @@
  *
  */
 
-GtkType     gnome_print_copies_selector_get_type (void);
+GType       gnome_print_copies_selector_get_type (void);
 
 GtkWidget * gnome_print_copies_selector_new (void);
 void        gnome_print_copies_selector_set_copies  (GnomePrintCopiesSelector *gpc, gint copies, gboolean collate);

Modified: trunk/libgnomeprintui/gnome-print-job-preview.c
==============================================================================
--- trunk/libgnomeprintui/gnome-print-job-preview.c	(original)
+++ trunk/libgnomeprintui/gnome-print-job-preview.c	Fri Mar  6 09:45:08 2009
@@ -25,6 +25,8 @@
  *
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 
 #include <math.h>
@@ -34,7 +36,6 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkaction.h>
 
 #include <libgnomeprint/private/gnome-print-private.h>
 #include <libgnomeprint/gnome-print-meta.h>

Modified: trunk/libgnomeprintui/gnome-print-job-preview.h
==============================================================================
--- trunk/libgnomeprintui/gnome-print-job-preview.h	(original)
+++ trunk/libgnomeprintui/gnome-print-job-preview.h	Fri Mar  6 09:45:08 2009
@@ -40,7 +40,7 @@
 typedef struct _GnomePrintJobPreview      GnomePrintJobPreview;
 typedef struct _GnomePrintJobPreviewClass GnomePrintJobPreviewClass;
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libgnomeprint/gnome-print-job.h>
 #include <libgnomeprintui/gnome-print-preview.h>
 

Modified: trunk/libgnomeprintui/gnome-print-layout-selector.c
==============================================================================
--- trunk/libgnomeprintui/gnome-print-layout-selector.c	(original)
+++ trunk/libgnomeprintui/gnome-print-layout-selector.c	Fri Mar  6 09:45:08 2009
@@ -33,12 +33,7 @@
 
 #include <libgnomecanvas/gnome-canvas.h>
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 #include <math.h>

Modified: trunk/libgnomeprintui/gnome-print-page-selector.c
==============================================================================
--- trunk/libgnomeprintui/gnome-print-page-selector.c	(original)
+++ trunk/libgnomeprintui/gnome-print-page-selector.c	Fri Mar  6 09:45:08 2009
@@ -35,14 +35,7 @@
 #include <libgnomeprint/private/gnome-print-private.h>
 #include <libgnomeprint/private/gnome-print-config-private.h>
 
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtk.h>
 
 #include <gdk/gdkkeysyms.h>
 

Modified: trunk/libgnomeprintui/gnome-print-paper-selector.c
==============================================================================
--- trunk/libgnomeprintui/gnome-print-paper-selector.c	(original)
+++ trunk/libgnomeprintui/gnome-print-paper-selector.c	Fri Mar  6 09:45:08 2009
@@ -23,6 +23,8 @@
  *
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 
 #include <string.h>

Modified: trunk/libgnomeprintui/gnome-print-widget.h
==============================================================================
--- trunk/libgnomeprintui/gnome-print-widget.h	(original)
+++ trunk/libgnomeprintui/gnome-print-widget.h	Fri Mar  6 09:45:08 2009
@@ -31,7 +31,7 @@
 G_BEGIN_DECLS
 
 #include <libgnomeprint/gnome-print-config.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 typedef enum {
 	   GNOME_PRINT_WIDGET_CHECKBUTTON

Modified: trunk/libgnomeprintui/gnome-printer-selector.c
==============================================================================
--- trunk/libgnomeprintui/gnome-printer-selector.c	(original)
+++ trunk/libgnomeprintui/gnome-printer-selector.c	Fri Mar  6 09:45:08 2009
@@ -26,6 +26,8 @@
  *
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include <string.h>
 

Modified: trunk/libgnomeprintui/gnome-printer-selector.h
==============================================================================
--- trunk/libgnomeprintui/gnome-printer-selector.h	(original)
+++ trunk/libgnomeprintui/gnome-printer-selector.h	Fri Mar  6 09:45:08 2009
@@ -60,7 +60,7 @@
 };
 
 
-GtkType            gnome_printer_selector_get_type (void);
+GType              gnome_printer_selector_get_type (void);
 GtkWidget *        gnome_printer_selector_new (GnomePrintConfig *config);
 GtkWidget *        gnome_printer_selector_new_default (void);
 GnomePrintConfig * gnome_printer_selector_get_config (GnomePrinterSelector *psel);

Modified: trunk/libgnomeprintui/gpaui/gpa-option-menu.c
==============================================================================
--- trunk/libgnomeprintui/gpaui/gpa-option-menu.c	(original)
+++ trunk/libgnomeprintui/gpaui/gpa-option-menu.c	Fri Mar  6 09:45:08 2009
@@ -25,6 +25,8 @@
  *
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 
 #include <string.h>

Modified: trunk/libgnomeprintui/gpaui/gpa-settings-selector.c
==============================================================================
--- trunk/libgnomeprintui/gpaui/gpa-settings-selector.c	(original)
+++ trunk/libgnomeprintui/gpaui/gpa-settings-selector.c	Fri Mar  6 09:45:08 2009
@@ -23,6 +23,8 @@
  *
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 
 #include <gtk/gtk.h>

Modified: trunk/libgnomeprintui/gpaui/gpa-transport-selector.c
==============================================================================
--- trunk/libgnomeprintui/gpaui/gpa-transport-selector.c	(original)
+++ trunk/libgnomeprintui/gpaui/gpa-transport-selector.c	Fri Mar  6 09:45:08 2009
@@ -26,6 +26,8 @@
  *
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "config.h"
 
 #include <string.h>

Modified: trunk/libgnomeprintui/gpaui/gpa-widget.c
==============================================================================
--- trunk/libgnomeprintui/gpaui/gpa-widget.c	(original)
+++ trunk/libgnomeprintui/gpaui/gpa-widget.c	Fri Mar  6 09:45:08 2009
@@ -23,6 +23,8 @@
  *
  */
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <config.h>
 #include "gpa-widget.h"
 

Modified: trunk/libgnomeprintui/gpaui/gpa-widget.h
==============================================================================
--- trunk/libgnomeprintui/gpaui/gpa-widget.h	(original)
+++ trunk/libgnomeprintui/gpaui/gpa-widget.h	Fri Mar  6 09:45:08 2009
@@ -31,7 +31,7 @@
 
 G_BEGIN_DECLS
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 #include <libgnomeprint/gnome-print-config.h>
 #include <libgnomeprint/private/gpa-node.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]