GNOME.org
 

[dia] Don't use deprecated functions gtk_object_get_user_data() and gtk_object_set_user_data().

commit 629c3d86c3373fec95924d75214053a865c08a27
Author: Adam Buchbinder <adam buchbinder gmail com>
Date:   Tue Jul 28 12:48:13 2009 -0400

    Don't use deprecated functions gtk_object_get_user_data() and gtk_object_set_user_data().
    
    Replaced gtk_object_get_user_data(GTK_OBJECT(foo)) with
    g_object_get_data(G_OBJECT(foo), "user_data"), and also replaced
    gtk_object_set_user_data(GTK_OBJECT(foo), bar) with
    g_object_set_data(G_OBJECT(foo), "user_data", bar). The choice of
    "user_data" as a key is pulled from the gtk+ source; this is what
    the ..._user_data() functions do internally. It shouldn't matter,
    though, since they've all been replaced at once.
    
    http://library.gnome.org/devel/gtk/stable/GtkObject.html#gtk-object-get-user-data
    http://library.gnome.org/devel/gtk/stable/GtkObject.html#gtk-object-set-user-data
    
    Signed-off-by: Hans Breuer <hans breuer org>

 app/interface.c                 |    4 +-
 lib/widgets.c                   |   32 +++++++-------
 objects/Database/table_dialog.c |   16 ++++----
 objects/SISSI/sissi_dialog.c    |   66 +++++++++++++++---------------
 objects/UML/class_dialog.c      |   84 +++++++++++++++++++-------------------
 5 files changed, 101 insertions(+), 101 deletions(-)
---
diff --git a/app/interface.c b/app/interface.c
index 05a43c6..445f250 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -340,7 +340,7 @@ zoom_activate_callback(GtkWidget *item, gpointer user_data)
 {
   DDisplay *ddisp = (DDisplay *)user_data;
   const gchar *zoom_text =
-      gtk_entry_get_text(GTK_ENTRY(gtk_object_get_user_data(GTK_OBJECT(ddisp->zoom_status))));
+      gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(ddisp->zoom_status), "user_data")));
   float zoom_amount, magnify;
   gchar *zoomamount = g_object_get_data(G_OBJECT(item), "zoomamount");
   if (zoomamount != NULL) {
@@ -358,7 +358,7 @@ zoom_activate_callback(GtkWidget *item, gpointer user_data)
       zoom_amount = 1e4;
     }
     zoomamount = g_strdup_printf("%f%%\n", zoom_amount);
-    gtk_entry_set_text(GTK_ENTRY(gtk_object_get_user_data(GTK_OBJECT(ddisp->zoom_status))), zoomamount);
+    gtk_entry_set_text(GTK_ENTRY(g_object_get_data(G_OBJECT(ddisp->zoom_status), "user_data")), zoomamount);
     g_free(zoomamount);
     magnify = (zoom_amount*DDISPLAY_NORMAL_ZOOM/100.0)/ddisp->zoom_factor;
     if (fabs(magnify - 1.0) > 0.000001) {
diff --git a/lib/widgets.c b/lib/widgets.c
index 01d73af..e9b3836 100644
--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -618,7 +618,7 @@ dia_font_selector_set_style_menu(DiaFontSelector *fs,
     if (!(stylebits & (1 << (3*weight + slant)))) continue;
     menuitem = gtk_radio_menu_item_new_with_label (group, style_labels[3*weight+slant]);
     group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
-    gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(i));
+    g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(i));
     if (dia_style == i) {
       select = menu_item_nr;
     }
@@ -681,7 +681,7 @@ dia_font_selector_get_font(DiaFontSelector *fs)
   if (!menuitem) /* FIXME: should not happen ??? (but does if we don't have added a style) */
     style = 0;
   else
-    style = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+    style = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), "user_data"));
   font = dia_font_new(fontname, style, 1.0);
   g_free(fontname);
   return font;
@@ -722,19 +722,19 @@ dia_alignment_selector_init (DiaAlignmentSelector *fs)
   group = NULL;
 
   menuitem = gtk_radio_menu_item_new_with_label (group, _("Left"));
-  gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(ALIGN_LEFT));
+  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(ALIGN_LEFT));
   group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
 
   menuitem = gtk_radio_menu_item_new_with_label (group, _("Center"));
-  gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(ALIGN_CENTER));
+  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(ALIGN_CENTER));
   group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
 
   menuitem = gtk_radio_menu_item_new_with_label (group, _("Right"));
-  gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(ALIGN_RIGHT));
+  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(ALIGN_RIGHT));
   group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
@@ -780,7 +780,7 @@ dia_alignment_selector_get_alignment(DiaAlignmentSelector *fs)
   void *align;
   
   menuitem = gtk_menu_get_active(fs->alignment_menu);
-  align = gtk_object_get_user_data(GTK_OBJECT(menuitem));
+  align = g_object_get_data(G_OBJECT(menuitem), "user_item");
 
   return GPOINTER_TO_INT(align);
 }
@@ -840,7 +840,7 @@ set_linestyle_sensitivity(DiaLineStyleSelector *fs)
   GtkWidget *menuitem;
   if (!fs->linestyle_menu) return;
   menuitem = gtk_menu_get_active(fs->linestyle_menu);
-  state = (GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem)))
+  state = (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), "user_data"))
 	   != LINESTYLE_SOLID);
 
   gtk_widget_set_sensitive(GTK_WIDGET(fs->lengthlabel), state);
@@ -885,7 +885,7 @@ dia_line_style_selector_init (DiaLineStyleSelector *fs)
 
   for (i = 0; i <= LINESTYLE_DOTTED; i++) {
     menuitem = gtk_menu_item_new();
-    gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(i));
+    g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(i));
     ln = dia_line_preview_new(i);
     gtk_container_add(GTK_CONTAINER(menuitem), ln);
     gtk_widget_show(ln);
@@ -894,31 +894,31 @@ dia_line_style_selector_init (DiaLineStyleSelector *fs)
   }
 #if 0
   menuitem = gtk_radio_menu_item_new_with_label (group, _("Solid"));
-  gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(LINESTYLE_SOLID));
+  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(LINESTYLE_SOLID));
   group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
 
   menuitem = gtk_radio_menu_item_new_with_label (group, _("Dashed"));
-  gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(LINESTYLE_DASHED));
+  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(LINESTYLE_DASHED));
   group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
 
   menuitem = gtk_radio_menu_item_new_with_label (group, _("Dash-Dot"));
-  gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(LINESTYLE_DASH_DOT));
+  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(LINESTYLE_DASH_DOT));
   group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
 
   menuitem = gtk_radio_menu_item_new_with_label (group, _("Dash-Dot-Dot"));
-  gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(LINESTYLE_DASH_DOT_DOT));
+  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(LINESTYLE_DASH_DOT_DOT));
   group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
   
   menuitem = gtk_radio_menu_item_new_with_label (group, _("Dotted"));
-  gtk_object_set_user_data(GTK_OBJECT(menuitem), GINT_TO_POINTER(LINESTYLE_DOTTED));
+  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(LINESTYLE_DOTTED));
   group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
@@ -995,7 +995,7 @@ dia_line_style_selector_get_linestyle(DiaLineStyleSelector *fs,
   void *align;
   
   menuitem = gtk_menu_get_active(fs->linestyle_menu);
-  align = gtk_object_get_user_data(GTK_OBJECT(menuitem));
+  align = g_object_get_data(G_OBJECT(menuitem), "user_data");
   *ls = GPOINTER_TO_INT(align);
   if (dl!=NULL) {
     *dl = gtk_spin_button_get_value(fs->dashlength);
@@ -1446,7 +1446,7 @@ file_open_response_callback(GtkWidget *dialog,
                             gpointer   user_data)
 {
   DiaFileSelector *fs =
-    DIAFILESELECTOR(gtk_object_get_user_data(GTK_OBJECT(dialog)));
+    DIAFILESELECTOR(g_object_get_data(G_OBJECT(dialog), "user_data"));
 
   if (response == GTK_RESPONSE_ACCEPT || response == GTK_RESPONSE_OK) { 
     gchar *utf8 = g_filename_to_utf8(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)), 
@@ -1494,7 +1494,7 @@ dia_file_selector_browse_pressed(GtkWidget *widget, gpointer data)
     gtk_file_filter_add_pattern (filter, "*");
     gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
-    gtk_object_set_user_data(GTK_OBJECT(dialog), fs);
+    g_object_set_data(G_OBJECT(dialog), "user_data", fs);
   }
 
   filename = g_filename_from_utf8(gtk_entry_get_text(fs->entry), -1, NULL, NULL, NULL);
diff --git a/objects/Database/table_dialog.c b/objects/Database/table_dialog.c
index 2523398..4cb543b 100644
--- a/objects/Database/table_dialog.c
+++ b/objects/Database/table_dialog.c
@@ -161,7 +161,7 @@ table_get_properties_dialog (Table * table, gboolean is_default)
     gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (notebook), 10);
 
-    gtk_object_set_user_data (GTK_OBJECT (notebook), (gpointer) table);
+    g_object_set_data (G_OBJECT (notebook), "user_data", (gpointer) table);
 
     gtk_signal_connect (GTK_OBJECT (notebook),
                         "destroy",
@@ -485,10 +485,10 @@ attribute_page_props_to_object (Table * table, TablePropDialog * prop_dialog)
 
       clear_list = g_list_prepend (clear_list, list_item);
       attr = (TableAttribute *)
-        gtk_object_get_user_data (GTK_OBJECT (list_item));
+        g_object_get_data (G_OBJECT (list_item), "user_data");
       /* set to NULL so the attribute get's not freed when list_item is
          destroyed */
-      gtk_object_set_user_data (GTK_OBJECT (list_item), NULL);
+      g_object_set_data (G_OBJECT (list_item), "user_data", NULL);
       table->attributes = g_list_append (table->attributes, attr);
 
       list = g_list_next (list);
@@ -824,7 +824,7 @@ attributes_page_update_cur_attr_item (TablePropDialog * prop_dialog)
   if (prop_dialog && prop_dialog->cur_attr_list_item)
     {
       attr = (TableAttribute *)
-        gtk_object_get_user_data (GTK_OBJECT (prop_dialog->cur_attr_list_item));
+        g_object_get_data (G_OBJECT (prop_dialog->cur_attr_list_item), "user_data");
       if (attr != NULL)
         {
           attributes_page_values_to_attribute (prop_dialog, attr);
@@ -902,7 +902,7 @@ attributes_list_selection_changed_cb (GtkWidget * gtklist, Table * table)
   else
     {
       list_item = GTK_OBJECT (list->data);
-      attr = (TableAttribute *) gtk_object_get_user_data (list_item);
+      attr = (TableAttribute *) g_object_get_data (list_item, "user_data");
       attributes_page_set_sensitive (prop_dialog, TRUE);
       attributes_page_set_values (prop_dialog, attr);
 
@@ -1160,7 +1160,7 @@ attributes_list_add_attribute (Table * table,
   gtk_widget_show (list_item);
   g_free (attrstr);
 
-  gtk_object_set_user_data (GTK_OBJECT (list_item), attribute);
+  g_object_set_data (G_OBJECT (list_item), "user_data", attribute);
   gtk_signal_connect (GTK_OBJECT (list_item), "destroy",
                       GTK_SIGNAL_FUNC (attribute_list_item_destroy_cb),
                       NULL);
@@ -1205,7 +1205,7 @@ attributes_list_delete_button_clicked_cb (GtkWidget * button, Table * table)
   if (gtklist->selection != NULL)
     {
       attr = (TableAttribute *)
-        gtk_object_get_user_data (GTK_OBJECT (gtklist->selection->data));
+        g_object_get_data (G_OBJECT (gtklist->selection->data), "user_data");
       prop_dialog->deleted_connections =
         g_list_prepend (prop_dialog->deleted_connections,
                         attr->left_connection);
@@ -1290,7 +1290,7 @@ attribute_list_item_destroy_cb (GtkWidget * list_item, gpointer data)
 {
   TableAttribute * attr;
 
-  attr = (TableAttribute *) gtk_object_get_user_data (GTK_OBJECT (list_item));
+  attr = (TableAttribute *) g_object_get_data (G_OBJECT (list_item), "user_data");
   if (attr != NULL)
     table_attribute_free (attr);
 }
diff --git a/objects/SISSI/sissi_dialog.c b/objects/SISSI/sissi_dialog.c
index 333a025..ae86429 100644
--- a/objects/SISSI/sissi_dialog.c
+++ b/objects/SISSI/sissi_dialog.c
@@ -24,7 +24,7 @@
 #endif
 
 #include <assert.h>
-#undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu, gtk_object_get_user_data, ... */
+#undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu, ... */
 #include <gtk/gtk.h>
 #include <math.h>
 #include <string.h>
@@ -377,22 +377,22 @@ static void properties_others_read_from_dialog(ObjetSISSI *object_sissi, SISSIDi
   unsigned int i;
      /************** classification list box *************/
   if (GTK_IS_OPTION_MENU(object_sissi->properties_dialog->confidentiality)) {
-   object_sissi->confidentiality = g_strdup((char *)(gtk_object_get_user_data(
-           GTK_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->confidentiality)->menu_item))));
+   object_sissi->confidentiality = g_strdup((char *)(g_object_get_data(
+           GTK_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->confidentiality)->menu_item), "user_data")));
   } else {
     object_sissi->confidentiality = g_strdup((char *)strtol(gtk_entry_get_text(GTK_ENTRY(object_sissi->properties_dialog->confidentiality)), NULL, 0));
   }
 
   if (GTK_IS_OPTION_MENU(object_sissi->properties_dialog->integrity)) {
-   object_sissi->integrity = g_strdup((char *)(gtk_object_get_user_data(
-           GTK_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->integrity)->menu_item))));
+   object_sissi->integrity = g_strdup((char *)(g_object_get_data(
+           GTK_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->integrity)->menu_item), "user_data")));
   } else {
     object_sissi->integrity = g_strdup((char *)strtol(gtk_entry_get_text(GTK_ENTRY(object_sissi->properties_dialog->integrity)), NULL, 0));
   }
   
   if (GTK_IS_OPTION_MENU(object_sissi->properties_dialog->disponibility_level)) {
-   object_sissi->disponibility_level = g_strdup((char *)(gtk_object_get_user_data(
-           GTK_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->disponibility_level)->menu_item))));
+   object_sissi->disponibility_level = g_strdup((char *)(g_object_get_data(
+           GTK_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->disponibility_level)->menu_item), "user_data")));
   } else {
     object_sissi->disponibility_level = g_strdup((char *)strtol(gtk_entry_get_text(GTK_ENTRY(object_sissi->properties_dialog->disponibility_level)), NULL, 0));
   }
@@ -402,8 +402,8 @@ static void properties_others_read_from_dialog(ObjetSISSI *object_sissi, SISSIDi
   
     /************ Entity list box*******************/
   if (GTK_IS_OPTION_MENU(object_sissi->properties_dialog->entity)) {
-   object_sissi->entity = g_strdup((char *)(gtk_object_get_user_data(
-           GTK_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->entity)->menu_item))));
+   object_sissi->entity = g_strdup((char *)(g_object_get_data(
+           GTK_OBJECT(GTK_OPTION_MENU(object_sissi->properties_dialog->entity)->menu_item), "user_data")));
   } else {
     object_sissi->entity = g_strdup((char *)strtol(gtk_entry_get_text(GTK_ENTRY(object_sissi->properties_dialog->entity)), NULL, 0));
   }
@@ -511,7 +511,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   
   for (j = 0; property_classification_data[j].label != NULL; j++) {
       GtkWidget *item = gtk_menu_item_new_with_label(_(property_classification_data[j].label));
-      gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_classification_data[j].value));
+      g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_classification_data[j].value));
       gtk_container_add(GTK_CONTAINER(menu_classification), item);
       gtk_widget_show(item);
   }
@@ -520,7 +520,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
  /************* end of menu **********/
   for (j = 0; property_integrity_data[j].label != NULL; j++) {
       GtkWidget *item = gtk_menu_item_new_with_label(_(property_integrity_data[j].label));
-      gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_integrity_data[j].value));
+      g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_integrity_data[j].value));
       gtk_container_add(GTK_CONTAINER(menu_integrity), item);
       gtk_widget_show(item);
   }
@@ -532,7 +532,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
 
   for (j = 0; property_disponibility_level_data[j].label != NULL; j++) {
       GtkWidget *item = gtk_menu_item_new_with_label(_(property_disponibility_level_data[j].label));
-      gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_disponibility_level_data[j].value));
+      g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_disponibility_level_data[j].value));
       gtk_container_add(GTK_CONTAINER(menu_disponibility_level), item);
       gtk_widget_show(item);
   }
@@ -547,7 +547,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_material_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_material_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_material_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_material_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -556,7 +556,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_logiciel_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_logiciel_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_logiciel_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_logiciel_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -565,7 +565,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_reseau_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_reseau_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_reseau_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_reseau_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -574,7 +574,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_personnel_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_personnel_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_personnel_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_personnel_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -583,7 +583,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_data[j].value));
+        g_object_set_user_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -592,7 +592,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_detecTHERMIC_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_detecTHERMIC_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_detecTHERMIC_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_detecTHERMIC_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -601,7 +601,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_detecFIRE_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_detecFIRE_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_detecFIRE_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_detecFIRE_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -610,7 +610,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_detecWATER_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_detecWATER_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_detecWATER_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_detecWATER_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -619,7 +619,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_detecAIR_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_detecAIR_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_detecAIR_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_detecAIR_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -628,7 +628,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_detecENERGY_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_detecENERGY_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_detecENERGY_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_detecENERGY_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -637,7 +637,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_detecINTRUSION_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_detecINTRUSION_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_detecINTRUSION_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_detecINTRUSION_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -646,7 +646,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_actionTHERMIC_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_actionTHERMIC_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_actionTHERMIC_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_actionTHERMIC_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -655,7 +655,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_actionFIRE_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_actionFIRE_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_actionFIRE_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_actionFIRE_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -664,7 +664,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_actionWATER_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_actionWATER_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_actionWATER_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_actionWATER_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -673,7 +673,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_actionAIR_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_actionAIR_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_actionAIR_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_actionAIR_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -682,7 +682,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_actionENERGY_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_actionENERGY_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_actionENERGY_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_actionENERGY_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -691,7 +691,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_physic_actionINTRUSION_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_physic_actionINTRUSION_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_physic_actionINTRUSION_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_physic_actionINTRUSION_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -700,7 +700,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_organisation_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_organisation_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_organisation_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_organisation_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -709,7 +709,7 @@ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScroll_others), prop_
   {  
     for (j = 0; property_system_data[j].label != NULL; j++) {
         GtkWidget *item = gtk_menu_item_new_with_label(_(property_system_data[j].label));
-        gtk_object_set_user_data(GTK_OBJECT(item),GUINT_TO_POINTER(property_system_data[j].value));
+        g_object_set_data(G_OBJECT(item),"user_data",GUINT_TO_POINTER(property_system_data[j].value));
         gtk_container_add(GTK_CONTAINER(menu_entity), item);
       	gtk_widget_show(item);
     }
@@ -895,7 +895,7 @@ static void switch_page_callback(GtkNotebook *notebook, GtkNotebookPage *page)
   SISSIDialog *prop_dialog;
 
   object_sissi = (ObjetSISSI *)
-    gtk_object_get_user_data(GTK_OBJECT(notebook));
+    g_object_get_data(G_OBJECT(notebook),"user_data");
 
   prop_dialog = object_sissi->properties_dialog;
 
@@ -1161,7 +1161,7 @@ extern GtkWidget *object_sissi_get_properties_dialog(ObjetSISSI *object_sissi, g
 /* fixing the width of dialog box */
     gtk_container_set_border_width (GTK_CONTAINER (notebook), 0);
 
-    gtk_object_set_user_data(GTK_OBJECT(notebook), (gpointer) object_sissi);
+    g_object_set_data(G_OBJECT(notebook), "user_data", (gpointer) object_sissi);
     
     gtk_signal_connect (GTK_OBJECT (notebook),
 			"switch_page",
diff --git a/objects/UML/class_dialog.c b/objects/UML/class_dialog.c
index 22843d6..3c5e467 100644
--- a/objects/UML/class_dialog.c
+++ b/objects/UML/class_dialog.c
@@ -265,7 +265,7 @@ add_option_menu_item(GtkMenu *menu, gchar *label, GtkSignalFunc update_func,
   GtkWidget *menuitem = gtk_menu_item_new_with_label (label);
   gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
 		      update_func, umlclass);
-  gtk_object_set_user_data(GTK_OBJECT(menuitem), user_data);
+  g_object_set_data(G_OBJECT(menuitem), "user_data", user_data);
   gtk_menu_append (GTK_MENU (menu), menuitem);
   gtk_widget_show (menuitem);  
 }
@@ -706,8 +706,8 @@ attributes_get_values (UMLClassDialog *prop_dialog, UMLAttribute *attr)
   attr->comment = g_strdup (get_comment(prop_dialog->attr_comment));
 
   attr->visibility = (UMLVisibility)
-		GPOINTER_TO_INT (gtk_object_get_user_data (
-					 GTK_OBJECT (gtk_menu_get_active (prop_dialog->attr_visible))));
+		GPOINTER_TO_INT (g_object_get_data (
+					 G_OBJECT (gtk_menu_get_active (prop_dialog->attr_visible)), "user_data"));
     
   attr->class_scope = prop_dialog->attr_class_scope->active;
 }
@@ -721,7 +721,7 @@ attributes_get_current_values(UMLClassDialog *prop_dialog)
 
   if (prop_dialog != NULL && prop_dialog->current_attr != NULL) {
     current_attr = (UMLAttribute *)
-      gtk_object_get_user_data(GTK_OBJECT(prop_dialog->current_attr));
+      g_object_get_data(G_OBJECT(prop_dialog->current_attr), "user_data");
     if (current_attr != NULL) {
       attributes_get_values(prop_dialog, current_attr);
       label = GTK_LABEL(GTK_BIN(prop_dialog->current_attr)->child);
@@ -738,7 +738,7 @@ attribute_list_item_destroy_callback(GtkWidget *list_item,
 {
   UMLAttribute *attr;
 
-  attr = (UMLAttribute *) gtk_object_get_user_data(GTK_OBJECT(list_item));
+  attr = (UMLAttribute *) g_object_get_data(G_OBJECT(list_item), "user_data");
 
   if (attr != NULL) {
     uml_attribute_destroy(attr);
@@ -779,7 +779,7 @@ attributes_list_selection_changed_callback(GtkWidget *gtklist,
   }
   
   list_item = GTK_OBJECT(list->data);
-  attr = (UMLAttribute *)gtk_object_get_user_data(list_item);
+  attr = (UMLAttribute *)g_object_get_data(list_item, "user_data");
   attributes_set_values(prop_dialog, attr);
   attributes_set_sensitive(prop_dialog, TRUE);
 
@@ -813,7 +813,7 @@ attributes_list_new_callback(GtkWidget *button,
   gtk_widget_show (list_item);
   g_free (utfstr);
 
-  gtk_object_set_user_data(GTK_OBJECT(list_item), attr);
+  g_object_set_data(G_OBJECT(list_item), "user_data", attr);
   gtk_signal_connect (GTK_OBJECT (list_item), "destroy",
 		      GTK_SIGNAL_FUNC (attribute_list_item_destroy_callback),
 		      NULL);
@@ -841,7 +841,7 @@ attributes_list_delete_callback(GtkWidget *button,
 
   if (gtklist->selection != NULL) {
     attr = (UMLAttribute *)
-      gtk_object_get_user_data(GTK_OBJECT(gtklist->selection->data));
+      g_object_get_data(G_OBJECT(gtklist->selection->data), "user_data");
 
     if (attr->left_connection != NULL) {
       prop_dialog->deleted_connections =
@@ -955,8 +955,8 @@ attributes_read_from_dialog(UMLClass *umlclass,
     
     clear_list = g_list_prepend (clear_list, list_item);
     attr = (UMLAttribute *)
-      gtk_object_get_user_data(GTK_OBJECT(list_item));
-    gtk_object_set_user_data(GTK_OBJECT(list_item), NULL);
+      g_object_get_data(G_OBJECT(list_item), "user_data");
+    g_object_set_data(G_OBJECT(list_item), "user_data", NULL);
     umlclass->attributes = g_list_append(umlclass->attributes, attr);
     
     if (attr->left_connection == NULL) {
@@ -1022,7 +1022,7 @@ attributes_fill_in_dialog(UMLClass *umlclass)
       /* looks wrong but required for complicated ConnectionPoint memory management */
       attr_copy->left_connection = attr->left_connection;
       attr_copy->right_connection = attr->right_connection;
-      gtk_object_set_user_data(GTK_OBJECT(list_item), (gpointer) attr_copy);
+      g_object_set_data(G_OBJECT(list_item), "user_data", (gpointer) attr_copy);
       gtk_signal_connect (GTK_OBJECT (list_item), "destroy",
 			  GTK_SIGNAL_FUNC (attribute_list_item_destroy_callback),
 			  NULL);
@@ -1310,7 +1310,7 @@ parameters_get_values (UMLClassDialog *prop_dialog, UMLParameter *param)
   param->value = g_strdup (gtk_entry_get_text(prop_dialog->param_value));
   param->comment = g_strdup (get_comment(prop_dialog->param_comment));
 
-  param->kind = (UMLParameterKind) GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(gtk_menu_get_active(prop_dialog->param_kind))));
+  param->kind = (UMLParameterKind) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(gtk_menu_get_active(prop_dialog->param_kind)), "user_data"));
 }
 
 static void
@@ -1322,7 +1322,7 @@ parameters_get_current_values(UMLClassDialog *prop_dialog)
 
   if (prop_dialog->current_param != NULL) {
     current_param = (UMLParameter *)
-      gtk_object_get_user_data(GTK_OBJECT(prop_dialog->current_param));
+      g_object_get_data(G_OBJECT(prop_dialog->current_param), "user_data");
     if (current_param != NULL) {
       parameters_get_values(prop_dialog, current_param);
       label = GTK_LABEL(GTK_BIN(prop_dialog->current_param)->child);
@@ -1359,7 +1359,7 @@ parameters_list_selection_changed_callback(GtkWidget *gtklist,
   }
   
   list_item = GTK_OBJECT(list->data);
-  param = (UMLParameter *)gtk_object_get_user_data(list_item);
+  param = (UMLParameter *)g_object_get_data(list_item, "user_data");
   parameters_set_values(prop_dialog, param);
   parameters_set_sensitive(prop_dialog, TRUE);
 
@@ -1383,7 +1383,7 @@ parameters_list_new_callback(GtkWidget *button,
   parameters_get_current_values(prop_dialog);
 
   current_op = (UMLOperation *)
-    gtk_object_get_user_data(GTK_OBJECT(prop_dialog->current_op));
+    g_object_get_data(G_OBJECT(prop_dialog->current_op), "user_data");
   
   param = uml_parameter_new();
 
@@ -1392,7 +1392,7 @@ parameters_list_new_callback(GtkWidget *button,
   gtk_widget_show (list_item);
   g_free (utf);
 
-  gtk_object_set_user_data(GTK_OBJECT(list_item), param);
+  g_object_set_data(G_OBJECT(list_item), "user_data", param);
 
   current_op->parameters = g_list_append(current_op->parameters,
 					 (gpointer) param);
@@ -1425,9 +1425,9 @@ parameters_list_delete_callback(GtkWidget *button,
   if (gtklist->selection != NULL) {
     /* Remove from current operations parameter list: */
     current_op = (UMLOperation *)
-      gtk_object_get_user_data(GTK_OBJECT(prop_dialog->current_op));
+      g_object_get_data(G_OBJECT(prop_dialog->current_op), "user_data");
     param = (UMLParameter *)
-      gtk_object_get_user_data(GTK_OBJECT(prop_dialog->current_param));
+      g_object_get_data(G_OBJECT(prop_dialog->current_param), "user_data");
     
     current_op->parameters = g_list_remove(current_op->parameters,
 					   (gpointer) param);
@@ -1465,11 +1465,11 @@ parameters_list_move_up_callback(GtkWidget *button,
     if (i>0)
       i--;
 
-    param = (UMLParameter *) gtk_object_get_user_data(GTK_OBJECT(list_item));
+    param = (UMLParameter *) g_object_get_data(G_OBJECT(list_item), "user_data");
 
     /* Move parameter in current operations list: */
     current_op = (UMLOperation *)
-      gtk_object_get_user_data(GTK_OBJECT(prop_dialog->current_op));
+      g_object_get_data(G_OBJECT(prop_dialog->current_op), "user_data");
     
     current_op->parameters = g_list_remove(current_op->parameters,
 					   (gpointer) param);
@@ -1512,11 +1512,11 @@ parameters_list_move_down_callback(GtkWidget *button,
     if (i<(g_list_length(gtklist->children)-1))
       i++;
 
-    param = (UMLParameter *) gtk_object_get_user_data(GTK_OBJECT(list_item));
+    param = (UMLParameter *) g_object_get_data(G_OBJECT(list_item), "user_data");
 
     /* Move parameter in current operations list: */
     current_op = (UMLOperation *)
-      gtk_object_get_user_data(GTK_OBJECT(prop_dialog->current_op));
+      g_object_get_data(G_OBJECT(prop_dialog->current_op), "user_data");
     
     current_op->parameters = g_list_remove(current_op->parameters,
 					   (gpointer) param);
@@ -1600,7 +1600,7 @@ operations_set_values(UMLClassDialog *prop_dialog, UMLOperation *op)
     list_item = gtk_list_item_new_with_label (str);
     g_free (str);
 
-    gtk_object_set_user_data(GTK_OBJECT(list_item), (gpointer) param);
+    g_object_set_data(G_OBJECT(list_item), "user_data", (gpointer) param);
     gtk_container_add (GTK_CONTAINER (prop_dialog->parameters_list), list_item);
     gtk_widget_show (list_item);
     
@@ -1644,11 +1644,11 @@ operations_get_values(UMLClassDialog *prop_dialog, UMLOperation *op)
     op->stereotype = NULL;
 
   op->visibility = (UMLVisibility)
-    GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(gtk_menu_get_active(prop_dialog->op_visible))));
+    GPOINTER_TO_INT(g_object_get_data(G_OBJECT(gtk_menu_get_active(prop_dialog->op_visible)), "user_data"));
     
   op->class_scope = prop_dialog->op_class_scope->active;
   op->inheritance_type = (UMLInheritanceType)
-    GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(gtk_menu_get_active(prop_dialog->op_inheritance_type))));
+    GPOINTER_TO_INT(g_object_get_data(G_OBJECT(gtk_menu_get_active(prop_dialog->op_inheritance_type)), "user_data"));
 
   op->query = prop_dialog->op_query->active;
 
@@ -1665,7 +1665,7 @@ operations_get_current_values(UMLClassDialog *prop_dialog)
 
   if (prop_dialog->current_op != NULL) {
     current_op = (UMLOperation *)
-      gtk_object_get_user_data(GTK_OBJECT(prop_dialog->current_op));
+      g_object_get_data(G_OBJECT(prop_dialog->current_op), "user_data");
     if (current_op != NULL) {
       operations_get_values(prop_dialog, current_op);
       label = GTK_LABEL(GTK_BIN(prop_dialog->current_op)->child);
@@ -1682,7 +1682,7 @@ operations_list_item_destroy_callback(GtkWidget *list_item,
 {
   UMLOperation *op;
 
-  op = (UMLOperation *) gtk_object_get_user_data(GTK_OBJECT(list_item));
+  op = (UMLOperation *) g_object_get_data(G_OBJECT(list_item), "user_data");
 
   if (op != NULL) {
     uml_operation_destroy(op);
@@ -1715,7 +1715,7 @@ operations_list_selection_changed_callback(GtkWidget *gtklist,
   }
   
   list_item = GTK_OBJECT(list->data);
-  op = (UMLOperation *)gtk_object_get_user_data(list_item);
+  op = (UMLOperation *)g_object_get_data(list_item, "user_data");
   operations_set_values(prop_dialog, op);
   operations_set_sensitive(prop_dialog, TRUE);
 
@@ -1751,7 +1751,7 @@ operations_list_new_callback(GtkWidget *button,
   gtk_widget_show (list_item);
   g_free (utfstr);
 
-  gtk_object_set_user_data(GTK_OBJECT(list_item), op);
+  g_object_set_data(G_OBJECT(list_item), "user_data", op);
   gtk_signal_connect (GTK_OBJECT (list_item), "destroy",
 		      GTK_SIGNAL_FUNC (operations_list_item_destroy_callback),
 		      NULL);
@@ -1780,7 +1780,7 @@ operations_list_delete_callback(GtkWidget *button,
 
   if (gtklist->selection != NULL) {
     op = (UMLOperation *)
-      gtk_object_get_user_data(GTK_OBJECT(gtklist->selection->data));
+      g_object_get_data(G_OBJECT(gtklist->selection->data), "user_data");
 
     if (op->left_connection != NULL) {
       prop_dialog->deleted_connections =
@@ -1894,8 +1894,8 @@ operations_read_from_dialog(UMLClass *umlclass,
     
     clear_list = g_list_prepend (clear_list, list_item);
     op = (UMLOperation *)
-      gtk_object_get_user_data(GTK_OBJECT(list_item));
-    gtk_object_set_user_data(GTK_OBJECT(list_item), NULL);
+      g_object_get_data(G_OBJECT(list_item), "user_data");
+    g_object_set_data(G_OBJECT(list_item), "user_data", NULL);
     umlclass->operations = g_list_append(umlclass->operations, op);
     
     if (op->left_connection == NULL) {
@@ -1952,7 +1952,7 @@ operations_fill_in_dialog(UMLClass *umlclass)
       /* Looks wrong but is required for the complicate connections memory management */
       op_copy->left_connection = op->left_connection;
       op_copy->right_connection = op->right_connection;
-      gtk_object_set_user_data(GTK_OBJECT(list_item), (gpointer) op_copy);
+      g_object_set_data(G_OBJECT(list_item), "user_data", (gpointer) op_copy);
       gtk_signal_connect (GTK_OBJECT (list_item), "destroy",
 			  GTK_SIGNAL_FUNC (operations_list_item_destroy_callback),
 			  NULL);
@@ -2486,7 +2486,7 @@ templates_get_current_values(UMLClassDialog *prop_dialog)
 
   if (prop_dialog->current_templ != NULL) {
     current_param = (UMLFormalParameter *)
-      gtk_object_get_user_data(GTK_OBJECT(prop_dialog->current_templ));
+      g_object_get_data(G_OBJECT(prop_dialog->current_templ), "user_data");
     if (current_param != NULL) {
       templates_get_values(prop_dialog, current_param);
       label = GTK_LABEL(GTK_BIN(prop_dialog->current_templ)->child);
@@ -2504,7 +2504,7 @@ templates_list_item_destroy_callback(GtkWidget *list_item,
   UMLFormalParameter *param;
 
   param = (UMLFormalParameter *)
-    gtk_object_get_user_data(GTK_OBJECT(list_item));
+    g_object_get_data(G_OBJECT(list_item), "user_data");
 
   if (param != NULL) {
     uml_formalparameter_destroy(param);
@@ -2537,7 +2537,7 @@ templates_list_selection_changed_callback(GtkWidget *gtklist,
   }
   
   list_item = GTK_OBJECT(list->data);
-  param = (UMLFormalParameter *)gtk_object_get_user_data(list_item);
+  param = (UMLFormalParameter *)g_object_get_data(list_item, "user_data");
   templates_set_values(prop_dialog, param);
   templates_set_sensitive(prop_dialog, TRUE);
 
@@ -2566,7 +2566,7 @@ templates_list_new_callback(GtkWidget *button,
   gtk_widget_show (list_item);
   g_free (utfstr);
 
-  gtk_object_set_user_data(GTK_OBJECT(list_item), param);
+  g_object_set_data(G_OBJECT(list_item), "user_data", param);
   gtk_signal_connect (GTK_OBJECT (list_item), "destroy",
 		      GTK_SIGNAL_FUNC (templates_list_item_destroy_callback),
 		      NULL);
@@ -2690,8 +2690,8 @@ templates_read_from_dialog(UMLClass *umlclass, UMLClassDialog *prop_dialog)
     list_item = GTK_WIDGET(list->data);
     clear_list = g_list_prepend (clear_list, list_item);
     param = (UMLFormalParameter *)
-      gtk_object_get_user_data(GTK_OBJECT(list_item));
-    gtk_object_set_user_data(GTK_OBJECT(list_item), NULL);
+      g_object_get_data(G_OBJECT(list_item), "user_data");
+    g_object_set_data(G_OBJECT(list_item), "user_data", NULL);
     umlclass->formal_params = g_list_append(umlclass->formal_params, param);
     list = g_list_next(list);
   }
@@ -2722,7 +2722,7 @@ templates_fill_in_dialog(UMLClass *umlclass)
 
       list_item = gtk_list_item_new_with_label (paramstr);
       param_copy = uml_formalparameter_copy(param);
-      gtk_object_set_user_data(GTK_OBJECT(list_item),
+      g_object_set_data(G_OBJECT(list_item), "user_data", 
 			       (gpointer) param_copy);
       gtk_signal_connect (GTK_OBJECT (list_item), "destroy",
 			  GTK_SIGNAL_FUNC (templates_list_item_destroy_callback),
@@ -2895,7 +2895,7 @@ switch_page_callback(GtkNotebook *notebook,
   UMLClassDialog *prop_dialog;
 
   umlclass = (UMLClass *)
-    gtk_object_get_user_data(GTK_OBJECT(notebook));
+    g_object_get_data(G_OBJECT(notebook), "user_data");
 
   prop_dialog = umlclass->properties_dialog;
 
@@ -3057,7 +3057,7 @@ umlclass_get_properties(UMLClass *umlclass, gboolean is_default)
     gtk_box_pack_start (GTK_BOX (vbox),	notebook, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (notebook), 10);
 
-    gtk_object_set_user_data(GTK_OBJECT(notebook), (gpointer) umlclass);
+    g_object_set_data(G_OBJECT(notebook), "user_data", (gpointer) umlclass);
     
     gtk_signal_connect (GTK_OBJECT (notebook),
 			"switch_page",
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]