GNOME.org
 

metacity r4193 - in trunk: . src/include src/tools src/ui test/tokentest

Author: tthurman
Date: Thu Mar 12 01:26:24 2009
New Revision: 4193
URL: http://svn.gnome.org/viewvc/metacity?rev=4193&view=rev

Log:
	Remove deprecated GTK symbols.  Refs #572332.
	* src/include/util.h:
	* src/tools/metacity-window-demo.c:
	* src/ui/fixedtip.c:
	* src/ui/frames.c:
	* src/ui/frames.h:
	* src/ui/menu.c:
	* src/ui/metaaccellabel.c:
	* src/ui/metaaccellabel.h:
	* src/ui/preview-widget.c:
	* src/ui/preview-widget.h:
	* src/ui/tabpopup.c:
	* src/ui/theme-viewer.c:
	* src/ui/themewidget.c:
	* src/ui/themewidget.h:
	* test/tokentest/tokentest.c:



Modified:
   trunk/ChangeLog
   trunk/src/include/util.h
   trunk/src/tools/metacity-window-demo.c
   trunk/src/ui/fixedtip.c
   trunk/src/ui/frames.c
   trunk/src/ui/frames.h
   trunk/src/ui/menu.c
   trunk/src/ui/metaaccellabel.c
   trunk/src/ui/metaaccellabel.h
   trunk/src/ui/preview-widget.c
   trunk/src/ui/preview-widget.h
   trunk/src/ui/tabpopup.c
   trunk/src/ui/theme-viewer.c
   trunk/src/ui/themewidget.c
   trunk/src/ui/themewidget.h
   trunk/test/tokentest/tokentest.c

Modified: trunk/src/include/util.h
==============================================================================
--- trunk/src/include/util.h	(original)
+++ trunk/src/include/util.h	Thu Mar 12 01:26:24 2009
@@ -134,11 +134,11 @@
 #include <glib-object.h>
 
 #define META_TYPE_NEXUS            (meta_nexus_get_type ())
-#define META_NEXUS(obj)            (GTK_CHECK_CAST ((obj), META_TYPE_NEXUS, MetaNexus))
-#define META_NEXUS_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), META_TYPE_NEXUS, MetaNexusClass))
-#define META_IS_NEXUS(obj)         (GTK_CHECK_TYPE ((obj), META_TYPE_NEXUS))
-#define META_IS_NEXUS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), META_TYPE_NEXUS))
-#define META_NEXUS_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), META_TYPE_NEXUS, MetaNexusClass))
+#define META_NEXUS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_NEXUS, MetaNexus))
+#define META_NEXUS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_NEXUS, MetaNexusClass))
+#define META_IS_NEXUS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_NEXUS))
+#define META_IS_NEXUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_NEXUS))
+#define META_NEXUS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_NEXUS, MetaNexusClass))
 
 typedef struct _MetaNexus
 {

Modified: trunk/src/tools/metacity-window-demo.c
==============================================================================
--- trunk/src/tools/metacity-window-demo.c	(original)
+++ trunk/src/tools/metacity-window-demo.c	Thu Mar 12 01:26:24 2009
@@ -854,7 +854,8 @@
 
   /* Set up item factory to go away with the window */
   g_object_ref (item_factory);
-  gtk_object_sink (GTK_OBJECT (item_factory));
+  g_object_ref_sink (item_factory);
+  g_object_unref (item_factory);
   g_object_set_data_full (G_OBJECT (window),
                           "<main>",
                           item_factory,

Modified: trunk/src/ui/fixedtip.c
==============================================================================
--- trunk/src/ui/fixedtip.c	(original)
+++ trunk/src/ui/fixedtip.c	Thu Mar 12 01:26:24 2009
@@ -87,7 +87,7 @@
       }
       
       gtk_widget_set_app_paintable (tip, TRUE);
-      gtk_window_set_policy (GTK_WINDOW (tip), FALSE, FALSE, TRUE);
+      gtk_window_set_resizable (GTK_WINDOW (tip), FALSE);
       gtk_widget_set_name (tip, "gtk-tooltips");
       gtk_container_set_border_width (GTK_CONTAINER (tip), 4);
 

Modified: trunk/src/ui/frames.c
==============================================================================
--- trunk/src/ui/frames.c	(original)
+++ trunk/src/ui/frames.c	Thu Mar 12 01:26:24 2009
@@ -108,10 +108,10 @@
 
 static GtkWidgetClass *parent_class = NULL;
 
-GtkType
+GType
 meta_frames_get_type (void)
 {
-  static GtkType frames_type = 0;
+  static GType frames_type = 0;
 
   if (!frames_type)
     {
@@ -593,7 +593,7 @@
     gtk_style_detach (frame->style);
 
   /* Weirdly, gtk_style_attach() steals a reference count from the style passed in */
-  gtk_style_ref (GTK_WIDGET (frames)->style);
+  g_object_ref (GTK_WIDGET (frames)->style);
   frame->style = gtk_style_attach (GTK_WIDGET (frames)->style, frame->window);
 }
 

Modified: trunk/src/ui/frames.h
==============================================================================
--- trunk/src/ui/frames.h	(original)
+++ trunk/src/ui/frames.h	Thu Mar 12 01:26:24 2009
@@ -60,11 +60,11 @@
  */
 
 #define META_TYPE_FRAMES            (meta_frames_get_type ())
-#define META_FRAMES(obj)            (GTK_CHECK_CAST ((obj), META_TYPE_FRAMES, MetaFrames))
-#define META_FRAMES_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), META_TYPE_FRAMES, MetaFramesClass))
-#define META_IS_FRAMES(obj)         (GTK_CHECK_TYPE ((obj), META_TYPE_FRAMES))
-#define META_IS_FRAMES_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), META_TYPE_FRAMES))
-#define META_FRAMES_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), META_TYPE_FRAMES, MetaFramesClass))
+#define META_FRAMES(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_FRAMES, MetaFrames))
+#define META_FRAMES_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_FRAMES, MetaFramesClass))
+#define META_IS_FRAMES(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_FRAMES))
+#define META_IS_FRAMES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_FRAMES))
+#define META_FRAMES_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_FRAMES, MetaFramesClass))
 
 typedef struct _MetaFrames        MetaFrames;
 typedef struct _MetaFramesClass   MetaFramesClass;

Modified: trunk/src/ui/menu.c
==============================================================================
--- trunk/src/ui/menu.c	(original)
+++ trunk/src/ui/menu.c	Thu Mar 12 01:26:24 2009
@@ -445,7 +445,7 @@
 
                       gtk_signal_connect_full (GTK_OBJECT (submi),
                           "activate",
-                          GTK_SIGNAL_FUNC (activate_cb),
+                          G_CALLBACK (activate_cb),
                           NULL,
                           md,
                           g_free, FALSE, FALSE);

Modified: trunk/src/ui/metaaccellabel.c
==============================================================================
--- trunk/src/ui/metaaccellabel.c	(original)
+++ trunk/src/ui/metaaccellabel.c	Thu Mar 12 01:26:24 2009
@@ -53,10 +53,10 @@
 static GtkLabelClass *parent_class = NULL;
 
 
-GtkType
+GType
 meta_accel_label_get_type (void)
 {
-  static GtkType accel_label_type = 0;
+  static GType accel_label_type = 0;
 
   if (!accel_label_type)
     {

Modified: trunk/src/ui/metaaccellabel.h
==============================================================================
--- trunk/src/ui/metaaccellabel.h	(original)
+++ trunk/src/ui/metaaccellabel.h	Thu Mar 12 01:26:24 2009
@@ -43,11 +43,11 @@
 
 
 #define META_TYPE_ACCEL_LABEL		(meta_accel_label_get_type ())
-#define META_ACCEL_LABEL(obj)		(GTK_CHECK_CAST ((obj), META_TYPE_ACCEL_LABEL, MetaAccelLabel))
-#define META_ACCEL_LABEL_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), META_TYPE_ACCEL_LABEL, MetaAccelLabelClass))
-#define META_IS_ACCEL_LABEL(obj)	 (GTK_CHECK_TYPE ((obj), META_TYPE_ACCEL_LABEL))
-#define META_IS_ACCEL_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), META_TYPE_ACCEL_LABEL))
-#define META_ACCEL_LABEL_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), META_TYPE_ACCEL_LABEL, MetaAccelLabelClass))
+#define META_ACCEL_LABEL(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_ACCEL_LABEL, MetaAccelLabel))
+#define META_ACCEL_LABEL_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_ACCEL_LABEL, MetaAccelLabelClass))
+#define META_IS_ACCEL_LABEL(obj)	 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_ACCEL_LABEL))
+#define META_IS_ACCEL_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_ACCEL_LABEL))
+#define META_ACCEL_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_ACCEL_LABEL, MetaAccelLabelClass))
 
 
 typedef struct _MetaAccelLabel	    MetaAccelLabel;
@@ -91,7 +91,7 @@
   void (*_gtk_reserved4) (void);
 };
 
-GtkType	   meta_accel_label_get_type          (void) G_GNUC_CONST;
+GType	   meta_accel_label_get_type          (void) G_GNUC_CONST;
 GtkWidget* meta_accel_label_new_with_mnemonic (const gchar            *string);
 void       meta_accel_label_set_accelerator   (MetaAccelLabel         *accel_label,
                                                guint                   accelerator_key,

Modified: trunk/src/ui/preview-widget.c
==============================================================================
--- trunk/src/ui/preview-widget.c	(original)
+++ trunk/src/ui/preview-widget.c	Thu Mar 12 01:26:24 2009
@@ -40,10 +40,10 @@
 
 static GtkWidgetClass *parent_class;
 
-GtkType
+GType
 meta_preview_get_type (void)
 {
-  static GtkType preview_type = 0;
+  static GType preview_type = 0;
 
   if (!preview_type)
     {

Modified: trunk/src/ui/preview-widget.h
==============================================================================
--- trunk/src/ui/preview-widget.h	(original)
+++ trunk/src/ui/preview-widget.h	Thu Mar 12 01:26:24 2009
@@ -28,11 +28,11 @@
 #define META_PREVIEW_WIDGET_H
 
 #define META_TYPE_PREVIEW			 (meta_preview_get_type ())
-#define META_PREVIEW(obj)			 (GTK_CHECK_CAST ((obj), META_TYPE_PREVIEW, MetaPreview))
-#define META_PREVIEW_CLASS(klass)		 (GTK_CHECK_CLASS_CAST ((klass), META_TYPE_PREVIEW, MetaPreviewClass))
-#define META_IS_PREVIEW(obj)		 (GTK_CHECK_TYPE ((obj), META_TYPE_PREVIEW))
-#define META_IS_PREVIEW_CLASS(klass)	 (GTK_CHECK_CLASS_TYPE ((klass), META_TYPE_PREVIEW))
-#define META_PREVIEW_GET_CLASS(obj)         (GTK_CHECK_GET_CLASS ((obj), META_TYPE_PREVIEW, MetaPreviewClass))
+#define META_PREVIEW(obj)			 (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_PREVIEW, MetaPreview))
+#define META_PREVIEW_CLASS(klass)		 (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_PREVIEW, MetaPreviewClass))
+#define META_IS_PREVIEW(obj)		 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_PREVIEW))
+#define META_IS_PREVIEW_CLASS(klass)	 (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_PREVIEW))
+#define META_PREVIEW_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_PREVIEW, MetaPreviewClass))
 
 typedef struct _MetaPreview	MetaPreview;
 typedef struct _MetaPreviewClass	MetaPreviewClass;
@@ -63,7 +63,7 @@
 };
 
 
-GtkType    meta_preview_get_type (void) G_GNUC_CONST;
+GType    meta_preview_get_type (void) G_GNUC_CONST;
 GtkWidget* meta_preview_new	 (void);
 
 void meta_preview_set_theme         (MetaPreview            *preview,

Modified: trunk/src/ui/tabpopup.c
==============================================================================
--- trunk/src/ui/tabpopup.c	(original)
+++ trunk/src/ui/tabpopup.c	Thu Mar 12 01:26:24 2009
@@ -591,7 +591,7 @@
 }
 
 #define META_TYPE_SELECT_IMAGE            (meta_select_image_get_type ())
-#define META_SELECT_IMAGE(obj)            (GTK_CHECK_CAST ((obj), META_TYPE_SELECT_IMAGE, MetaSelectImage))
+#define META_SELECT_IMAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_SELECT_IMAGE, MetaSelectImage))
 
 typedef struct _MetaSelectImage       MetaSelectImage;
 typedef struct _MetaSelectImageClass  MetaSelectImageClass;
@@ -644,7 +644,7 @@
 GType
 meta_select_image_get_type (void)
 {
-  static GtkType image_type = 0;
+  static GType image_type = 0;
 
   if (!image_type)
     {
@@ -672,7 +672,7 @@
 {
   GtkWidgetClass *widget_class;
   
-  parent_class = gtk_type_class (gtk_image_get_type ());
+  parent_class = g_type_class_peek (gtk_image_get_type ());
 
   widget_class = GTK_WIDGET_CLASS (klass);
   
@@ -731,7 +731,7 @@
 }
 
 #define META_TYPE_SELECT_WORKSPACE   (meta_select_workspace_get_type ())
-#define META_SELECT_WORKSPACE(obj)   (GTK_CHECK_CAST ((obj), META_TYPE_SELECT_WORKSPACE, MetaSelectWorkspace))
+#define META_SELECT_WORKSPACE(obj)   (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_SELECT_WORKSPACE, MetaSelectWorkspace))
 
 typedef struct _MetaSelectWorkspace       MetaSelectWorkspace;
 typedef struct _MetaSelectWorkspaceClass  MetaSelectWorkspaceClass;
@@ -797,7 +797,7 @@
 GType
 meta_select_workspace_get_type (void)
 {
-  static GtkType workspace_type = 0;
+  static GType workspace_type = 0;
 
   if (!workspace_type)
     {

Modified: trunk/src/ui/theme-viewer.c
==============================================================================
--- trunk/src/ui/theme-viewer.c	(original)
+++ trunk/src/ui/theme-viewer.c	Thu Mar 12 01:26:24 2009
@@ -109,7 +109,8 @@
 
   /* Set up item factory to go away */
   g_object_ref (item_factory);
-  gtk_object_sink (GTK_OBJECT (item_factory));
+  g_object_ref_sink (item_factory);
+  g_object_unref (item_factory);
   g_object_set_data_full (G_OBJECT (table),
                           "<main>",
                           item_factory,

Modified: trunk/src/ui/themewidget.c
==============================================================================
--- trunk/src/ui/themewidget.c	(original)
+++ trunk/src/ui/themewidget.c	Thu Mar 12 01:26:24 2009
@@ -35,10 +35,10 @@
 
 static GtkMiscClass *parent_class;
 
-GtkType
+GType
 meta_area_get_type (void)
 {
-  static GtkType area_type = 0;
+  static GType area_type = 0;
 
   if (!area_type)
     {

Modified: trunk/src/ui/themewidget.h
==============================================================================
--- trunk/src/ui/themewidget.h	(original)
+++ trunk/src/ui/themewidget.h	Thu Mar 12 01:26:24 2009
@@ -28,11 +28,11 @@
 #define META_THEME_WIDGET_H
 
 #define META_TYPE_AREA			 (meta_area_get_type ())
-#define META_AREA(obj)			 (GTK_CHECK_CAST ((obj), META_TYPE_AREA, MetaArea))
-#define META_AREA_CLASS(klass)		 (GTK_CHECK_CLASS_CAST ((klass), META_TYPE_AREA, MetaAreaClass))
-#define META_IS_AREA(obj)		 (GTK_CHECK_TYPE ((obj), META_TYPE_AREA))
-#define META_IS_AREA_CLASS(klass)	 (GTK_CHECK_CLASS_TYPE ((klass), META_TYPE_AREA))
-#define META_AREA_GET_CLASS(obj)         (GTK_CHECK_GET_CLASS ((obj), META_TYPE_AREA, MetaAreaClass))
+#define META_AREA(obj)			 (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_AREA, MetaArea))
+#define META_AREA_CLASS(klass)		 (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_AREA, MetaAreaClass))
+#define META_IS_AREA(obj)		 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_AREA))
+#define META_IS_AREA_CLASS(klass)	 (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_AREA))
+#define META_AREA_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_AREA, MetaAreaClass))
 
 typedef struct _MetaArea	MetaArea;
 typedef struct _MetaAreaClass	MetaAreaClass;
@@ -65,7 +65,7 @@
 };
 
 
-GtkType    meta_area_get_type	 (void) G_GNUC_CONST;
+GType    meta_area_get_type	 (void) G_GNUC_CONST;
 GtkWidget* meta_area_new	 (void);
 
 void meta_area_setup (MetaArea           *area,

Modified: trunk/test/tokentest/tokentest.c
==============================================================================
--- trunk/test/tokentest/tokentest.c	(original)
+++ trunk/test/tokentest/tokentest.c	Thu Mar 12 01:26:24 2009
@@ -58,7 +58,7 @@
   /* dummy */
 }
 
-GtkType
+GType
 gtk_object_get_type (void)
 {
   /* dummy */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]