Return FALSE, so we don't flush repeatedly. (#319151, Alexander Larsson)

[~andy/gtk] / gtk / gtkobject.c

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 63cb73867aa26e8168d91d3240dc547ce6874562..e5df6f8043d52bea309540760bdcd737098c0fe0 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -28,10 +28,12 @@
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
-#include "gtkalias.h"
 #include "gtkobject.h"
+#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtksignal.h"
+#include "gtkprivate.h"
+#include "gtkalias.h"
 
 
 enum {
@@ -94,7 +96,7 @@ gtk_object_get_type (void)
        NULL,           /* value_table */
       };
       
-      object_type = g_type_register_static (G_TYPE_OBJECT, "GtkObject", 
+      object_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkObject"), 
                                            &object_info, G_TYPE_FLAG_ABSTRACT);
     }
 
@@ -228,7 +230,7 @@ gtk_object_add_arg_type (const gchar *arg_name,
     g_return_if_fail ((arg_flags & G_PARAM_CONSTRUCT_ONLY) == 0);
   if (arg_flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
     g_return_if_fail (arg_flags & G_PARAM_WRITABLE);
-  g_return_if_fail ((arg_flags & ~(G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) == 0);
+  g_return_if_fail ((arg_flags & ~(G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME)) == 0);
 
   pname = strchr (arg_name, ':');
   g_return_if_fail (pname && pname[1] == ':');
@@ -328,11 +330,12 @@ gtk_object_class_init (GtkObjectClass *class)
 
   g_object_class_install_property (gobject_class,
                                   PROP_USER_DATA,
-                                  g_param_spec_pointer ("user-data", "User Data",
-                                                        "Anonymous User Data Pointer",
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                  g_param_spec_pointer ("user-data", 
+                                                        P_("User Data"),
+                                                        P_("Anonymous User Data Pointer"),
+                                                        GTK_PARAM_READWRITE));
   object_signals[DESTROY] =
-    g_signal_new ("destroy",
+    g_signal_new (I_("destroy"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_CLEANUP | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
                  G_STRUCT_OFFSET (GtkObjectClass, destroy),
@@ -421,7 +424,7 @@ gtk_object_set_property (GObject      *object,
   switch (property_id)
     {
     case PROP_USER_DATA:
-      g_object_set_data (G_OBJECT (object), "user_data", g_value_get_pointer (value));
+      g_object_set_data (G_OBJECT (object), I_("user_data"), g_value_get_pointer (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -744,3 +747,6 @@ gtk_object_unref (GtkObject *object)
 
   g_object_unref ((GObject*) object);
 }
+
+#define __GTK_OBJECT_C__
+#include "gtkaliasdef.c"