watch the next ChangeLog update...

-timj

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 188ad4483d26f7c84526c4c5f97107e25bc106e8..efc7091ee67edd629f685daad18666c9f98b3f86 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -166,6 +166,8 @@ static GtkWindowClass *color_selection_dialog_parent_class = NULL;
 
 static gint color_selection_signals[LAST_SIGNAL] = {0};
 
+static const gchar     *value_index_key = "gtk-value-index";
+
 
 #define SF GtkSignalFunc
 
@@ -392,11 +394,11 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
       gtk_signal_connect_object (GTK_OBJECT (adj), "value_changed",
                                  scale_vals[n].updater, (gpointer) colorsel->scales[n]);
       gtk_object_set_data (GTK_OBJECT (colorsel->scales[n]), "_GtkColorSelection", (gpointer) colorsel);
-      gtk_object_set_data (GTK_OBJECT (colorsel->scales[n]), "_ValueIndex", (gpointer) n);
+      gtk_object_set_data (GTK_OBJECT (colorsel->scales[n]), value_index_key, (gpointer) n);
       gtk_signal_connect_object (GTK_OBJECT (colorsel->entries[n]), "changed",
                                  scale_vals[n].updater, (gpointer) colorsel->entries[n]);
       gtk_object_set_data (GTK_OBJECT (colorsel->entries[n]), "_GtkColorSelection", (gpointer) colorsel);
-      gtk_object_set_data (GTK_OBJECT (colorsel->entries[n]), "_ValueIndex", (gpointer) n);
+      gtk_object_set_data (GTK_OBJECT (colorsel->entries[n]), value_index_key, (gpointer) n);
     }
 
   colorsel->opacity_label = label;
@@ -625,7 +627,7 @@ gtk_color_selection_hsv_updater (GtkWidget *widget,
   if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (widget)))
     {
       colorsel = (GtkColorSelection*) gtk_object_get_data (GTK_OBJECT (widget), "_GtkColorSelection");
-      i = (gint) gtk_object_get_data (GTK_OBJECT (widget), "_ValueIndex");
+      i = (gint) gtk_object_get_data (GTK_OBJECT (widget), value_index_key);
 
       if (GTK_IS_SCALE (widget))
        {
@@ -675,7 +677,7 @@ gtk_color_selection_rgb_updater (GtkWidget *widget,
   if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (widget)))
     {
       colorsel = (GtkColorSelection*) gtk_object_get_data (GTK_OBJECT (widget), "_GtkColorSelection");
-      i = (gint) gtk_object_get_data (GTK_OBJECT (widget), "_ValueIndex");
+      i = (gint) gtk_object_get_data (GTK_OBJECT (widget), value_index_key);
 
       if (GTK_IS_SCALE (widget))
        {

diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index b2fe20952ed67104a996046d0caafefc9cd171b1..6e87f2ba539bf7493f702a2058f4f64d2905a6d0 100644 (file)
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -33,7 +33,7 @@
 #include "gdk/gdkkeysyms.h"
 #include "gtkcombo.h"
 
-const gchar *gtk_combo_string_key = "_combo_string_value";
+const gchar *gtk_combo_string_key = "gtk-combo-string-value";
 
 #define COMBO_LIST_MAX_HEIGHT 400
 
@@ -84,8 +84,8 @@ gtk_combo_class_init (GtkComboClass * klass)
 static void
 gtk_combo_destroy (GtkObject * combo)
 {
-
-  gtk_object_unref (GTK_OBJECT (GTK_COMBO (combo)->popwin));
+  gtk_widget_destroy (GTK_COMBO (combo)->popwin);
+  gtk_widget_unref (GTK_COMBO (combo)->popwin);
 
   if (GTK_OBJECT_CLASS (parent_class)->destroy)
     (*GTK_OBJECT_CLASS (parent_class)->destroy) (combo);
@@ -148,7 +148,7 @@ gtk_combo_find (GtkCombo * combo)
   if (combo->case_sensitive)
     string_compare = strcmp;
   else
-    string_compare = g_strcasecmp;
+    string_compare = (void*) g_strcasecmp;
 
   text = gtk_entry_get_text (GTK_ENTRY (combo->entry));
   clist = GTK_LIST (combo->list)->children;
@@ -386,6 +386,7 @@ gtk_combo_init (GtkCombo * combo)
      (GtkSignalFunc)prelight_bug, combo); */
 
   combo->popwin = gtk_window_new (GTK_WINDOW_POPUP);
+  gtk_widget_ref (combo->popwin);
   gtk_window_set_policy (GTK_WINDOW (combo->popwin), 1, 1, 0);
   combo->popup = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (combo->popup),

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 545257dd6147e0fbacaed49cf9f89e12931a74f6..a3fb3f872613e44be1e571485873d32809a9243e 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -100,21 +100,24 @@ static GSList *living_objs = NULL;
 static void
 gtk_object_debug (void)
 {
-  GSList *node;
-  
-  printf ("%d living objects\n", obj_count);
-  for (node = living_objs; node; node = node->next)
-    {
-      GtkObject *obj;
 
-      obj = (GtkObject*) node->data;
-      /*
-       printf ("%p: %s %d %s\n",
-       obj, gtk_type_name (GTK_OBJECT_TYPE (obj)),
-       obj->ref_count,
-       GTK_OBJECT_FLOATING (obj)? "floating" : "");
-       */
+  if (1)
+    {
+      GSList *node;
+      
+      printf ("living objects (%d):\n", obj_count);
+      for (node = living_objs; node; node = node->next)
+       {
+         GtkObject *obj;
+         
+         obj = (GtkObject*) node->data;
+         printf ("%p: %s %d %s\n",
+                 obj, gtk_type_name (GTK_OBJECT_TYPE (obj)),
+                 obj->ref_count,
+                 GTK_OBJECT_FLOATING (obj)? "floating" : "");
+       }
     }
+  printf ("%d living objects\n", obj_count);
 }
 #endif GTK_OBJECT_DEBUG
 
@@ -531,7 +534,7 @@ struct _GtkWeakRef
   gpointer          data;
 };
 
-static const gchar *weakrefs_key = "weakrefs";
+static const gchar *weakrefs_key = "gtk-weakrefs";
 
 void
 gtk_object_weakref (GtkObject        *object,

diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h
index 27aa4514fc849a045d3c066523b680d90c2cacdd..32014f1a98edbc8c09b49089522bbf354b6b65c5 100644 (file)
--- a/gtk/gtkprivate.h
+++ b/gtk/gtkprivate.h
@@ -47,7 +47,7 @@ enum
 #define GTK_PRIVATE_FLAGS(wid)            (GTK_WIDGET (wid)->private_flags)
 #define GTK_WIDGET_USER_STYLE(obj)       (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_USER_STYLE)
 #define GTK_WIDGET_REDRAW_PENDING(obj)   (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_REDRAW_PENDING)
-#define GTK_WIDGET_RESIZE_PENDING(obj)   (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_PENDING)
+#define GTK_CONTAINER_RESIZE_PENDING(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_PENDING)
 #define GTK_WIDGET_RESIZE_NEEDED(obj)    (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_NEEDED)
 #define GTK_WIDGET_LEAVE_PENDING(obj)    (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_LEAVE_PENDING)
 #define GTK_WIDGET_HAS_SHAPE_MASK(obj)   (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_HAS_SHAPE_MASK)

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index e7309382f34c7e93edf9854603e37e2157af7a6c..3cc66f7b1dddcbf6cbcef0111a5455d17d45963a 100644 (file)
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -147,7 +147,7 @@ static GList *current_incrs = NULL;
 static GList *current_selections = NULL;
 
 static GdkAtom gtk_selection_atoms[LAST_ATOM];
-static const char *gtk_selection_handler_key = "selection_handlers";
+static const char *gtk_selection_handler_key = "gtk-selection-handlers";
 
 /*************************************************************
  * gtk_selection_owner_set:

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index d0b9c2dc88bea99b07968a5a6c5d0bbb6869ef8c..3b06d385c8b651ef07c8b790a2050671c3ad1c9c 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -210,13 +210,13 @@ static GSList *style_stack = NULL;
 static GSList *gtk_widget_redraw_queue = NULL;
 static GSList *gtk_widget_resize_queue = NULL;
 
-static const gchar *aux_info_key = "aux_info";
-static const gchar *colormap_key = "colormap";
-static const gchar *visual_key = "visual";
-static const gchar *event_key = "event_mask";
-static const gchar *extension_event_key = "extension_event_mode";
-static const gchar *parent_window_key = "parent_window";
-static const gchar *shape_info_key = "shape_info";
+static const gchar *aux_info_key = "gtk-aux-info";
+static const gchar *colormap_key = "gtk-colormap";
+static const gchar *visual_key = "gtk-visual";
+static const gchar *event_key = "gtk-event-mask";
+static const gchar *extension_event_key = "gtk-extension-event-mode";
+static const gchar *parent_window_key = "gtk-parent-window";
+static const gchar *shape_info_key = "gtk-shape-info";
 
 
 
@@ -1442,7 +1442,7 @@ gtk_widget_queue_resize (GtkWidget *widget)
     {
       if (GTK_WIDGET_VISIBLE (toplevel))
        {
-         if (!GTK_WIDGET_RESIZE_PENDING (toplevel))
+         if (!GTK_CONTAINER_RESIZE_PENDING (toplevel))
            {
              GTK_PRIVATE_SET_FLAGS (toplevel, GTK_RESIZE_PENDING);
               if (gtk_widget_resize_queue == NULL)
@@ -3080,7 +3080,7 @@ gtk_widget_real_destroy (GtkObject *object)
       GTK_PRIVATE_UNSET_FLAGS (widget, GTK_REDRAW_PENDING);
     }
   
-  if (GTK_WIDGET_RESIZE_PENDING (widget))
+  if (GTK_CONTAINER_RESIZE_PENDING (widget))
     {
       gtk_widget_resize_queue = g_slist_remove (gtk_widget_resize_queue, widget);
       GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_PENDING);

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 6429bad55295cdaa3fc6ffbf2d3efe2f2fd31976..96baefb556e626331973d89cb63ee21cdd7b76d5 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1275,7 +1275,7 @@ gtk_window_set_hints (GtkWidget      *widget,
       ux = 0;
       uy = 0;
 
-      aux_info = gtk_object_get_data (GTK_OBJECT (widget), "aux_info");
+      aux_info = gtk_object_get_data (GTK_OBJECT (widget), "gtk-aux-info");
       if (aux_info && (aux_info->x != -1) && (aux_info->y != -1))
        {
          ux = aux_info->x;