[dia] GObject: destroy->dispose

[Zander <zbrown src gnome org>]

commit 5f17286651785e6fee902c7d908c8420e918fe00
Author: Zander Brown <zbrown gnome org>
Date:   Sun May 12 16:01:37 2019 +0100

    GObject: destroy->dispose

 app/diapagelayout.c  | 37 +++++++++++++++++--------------------
 app/disp_callbacks.c |  2 +-
 lib/diadynamicmenu.c | 38 +++++++++++++++++++-------------------
 3 files changed, 37 insertions(+), 40 deletions(-)
---
diff --git a/app/diapagelayout.c b/app/diapagelayout.c
index 5e5c1131..59c00c66 100644
--- a/app/diapagelayout.c
+++ b/app/diapagelayout.c
@@ -112,23 +112,20 @@ static void
 dia_page_layout_class_init(DiaPageLayoutClass *class)
 {
   GObjectClass *object_class;
-  
+
   object_class = (GObjectClass*) class;
   parent_class = g_type_class_peek_parent (class);
 
   pl_signals[CHANGED] =
-    g_signal_new("changed",
-                G_TYPE_FROM_CLASS (object_class),
-                G_SIGNAL_RUN_FIRST,
-                G_STRUCT_OFFSET(DiaPageLayoutClass, changed),
-                NULL, NULL,
-                dia_marshal_VOID__VOID,
-                G_TYPE_NONE, 0);
-#if 0 /* FIXME ?*/
-  g_object_class_add_signals(object_class, pl_signals, LAST_SIGNAL);
-#endif
+    g_signal_new ("changed",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET(DiaPageLayoutClass, changed),
+                  NULL, NULL,
+                  dia_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
 
-  object_class->destroy = dia_page_layout_destroy;
+  object_class->dispose = dia_page_layout_destroy;
 }
 
 static void darea_size_allocate(DiaPageLayout *self, GtkAllocation *alloc);
@@ -164,11 +161,11 @@ dia_page_layout_init(DiaPageLayout *self)
   self->paper_size = dia_option_menu_new();
   gtk_box_pack_start(GTK_BOX(box), self->paper_size, TRUE, FALSE, 0);
 
-  g_signal_connect (self->paper_size, "changed", 
+  g_signal_connect (self->paper_size, "changed",
                    G_CALLBACK(paper_size_change), self);
 
-  paper_names = get_paper_name_list();  
-  for (i = 0; paper_names != NULL; 
+  paper_names = get_paper_name_list();
+  for (i = 0; paper_names != NULL;
        i++, paper_names = g_list_next(paper_names)) {
 
     dia_option_menu_add_item (self->paper_size, paper_names->data, i);
@@ -191,7 +188,7 @@ dia_page_layout_init(DiaPageLayout *self)
   gtk_widget_show(box);
 
   self->orient_portrait = gtk_radio_button_new(NULL);
-  
+
   wid = gtk_image_new_from_pixbuf (gdk_pixbuf_new_from_xpm_data (portrait_xpm));
   gtk_container_add(GTK_CONTAINER(self->orient_portrait), wid);
   gtk_widget_show(wid);
@@ -468,7 +465,7 @@ gfloat
 dia_page_layout_get_scaling(DiaPageLayout *self)
 {
   GtkAdjustment *adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON(self->scaling));
-  
+
   return gtk_adjustment_get_value (adj) / 100.0;
 }
 
@@ -704,7 +701,7 @@ darea_expose_event(DiaPageLayout *self, GdkEventExpose *event)
 }
 
 /*!
- * \brief given a (page) size calculate the maximum margin size from it 
+ * \brief given a (page) size calculate the maximum margin size from it
  *
  * The function calculation assumes that more than half the size is not useful
  * for the margin. For safety it allows a little less.
@@ -827,8 +824,8 @@ scale_changed(DiaPageLayout *self)
 static void
 dia_page_layout_destroy(GObject *object)
 {
-  if (parent_class->destroy)
-    (* parent_class->destroy)(object);
+  if (parent_class->dispose)
+    (* parent_class->dispose)(object);
 }
 
 #ifdef PAGELAYOUT_TEST
diff --git a/app/disp_callbacks.c b/app/disp_callbacks.c
index 760c1556..1b020049 100644
--- a/app/disp_callbacks.c
+++ b/app/disp_callbacks.c
@@ -102,7 +102,7 @@ static void
 dia_menu_free(DiaMenu *dia_menu)
 {
   if (dia_menu->app_data)
-    g_object_destroy((GObject *)dia_menu->app_data);
+    g_object_unref ((GObject *)dia_menu->app_data);
   dia_menu->app_data = NULL;
   dia_menu->app_data_free = NULL;
 }
diff --git a/lib/diadynamicmenu.c b/lib/diadynamicmenu.c
index 15a813e5..fc127c0a 100644
--- a/lib/diadynamicmenu.c
+++ b/lib/diadynamicmenu.c
@@ -24,8 +24,8 @@
 #include "diadynamicmenu.h"
 #include "persistence.h"
 
-/* hidden internals for two reasosn: 
- * - noone is supposed to mess with the internals 
+/* hidden internals for two reasosn:
+ * - noone is supposed to mess with the internals
  * - it uses deprecated stuff
  */
 struct _DiaDynamicMenu {
@@ -58,7 +58,7 @@ struct _DiaDynamicMenuClass {
 static void dia_dynamic_menu_class_init(DiaDynamicMenuClass *class);
 static void dia_dynamic_menu_init(DiaDynamicMenu *self);
 static void dia_dynamic_menu_create_sublist(DiaDynamicMenu *ddm,
-                                           GList *items, 
+                                           GList *items,
                                            DDMCreateItemFunc create);
 static void dia_dynamic_menu_create_menu(DiaDynamicMenu *ddm);
 static void dia_dynamic_menu_destroy(GObject *object);
@@ -100,8 +100,8 @@ dia_dynamic_menu_class_init(DiaDynamicMenuClass *class)
 {
   GObjectClass *object_class = (GObjectClass*)class;
 
-  object_class->destroy = dia_dynamic_menu_destroy;
-  
+  object_class->dispose = dia_dynamic_menu_destroy;
+
   ddm_signals[DDM_VALUE_CHANGED]
       = g_signal_new("value-changed",
                     G_TYPE_FROM_CLASS(class),
@@ -116,7 +116,7 @@ dia_dynamic_menu_init(DiaDynamicMenu *self)
 {
 }
 
-void 
+void
 dia_dynamic_menu_destroy(GObject *object)
 {
   DiaDynamicMenu *ddm = DIA_DYNAMIC_MENU(object);
@@ -126,8 +126,8 @@ dia_dynamic_menu_destroy(GObject *object)
     g_free(ddm->active);
   ddm->active = NULL;
 
-  if (parent_class->destroy)
-    (* parent_class->destroy) (object);
+  if (parent_class->dispose)
+    (* parent_class->dispose) (object);
 }
 
 /** Create a new dynamic menu.  The entries are represented with
@@ -140,7 +140,7 @@ dia_dynamic_menu_destroy(GObject *object)
  * @return A new menu
  */
 GtkWidget *
-dia_dynamic_menu_new(DDMCreateItemFunc create, 
+dia_dynamic_menu_new(DDMCreateItemFunc create,
                     gpointer userdata,
                     GtkMenuItem *otheritem, gchar *persist)
 {
@@ -149,7 +149,7 @@ dia_dynamic_menu_new(DDMCreateItemFunc create,
   g_assert(persist != NULL);
 
   ddm = DIA_DYNAMIC_MENU ( g_object_new (dia_dynamic_menu_get_type (), NULL));
-  
+
   ddm->create_func = create;
   ddm->userdata = userdata;
   ddm->other_item = otheritem;
@@ -184,7 +184,7 @@ dia_dynamic_menu_select_entry(DiaDynamicMenu *ddm, const gchar *name)
     else
       gtk_option_menu_set_history(GTK_OPTION_MENU(ddm), 0);
   }
-  
+
   g_free(ddm->active);
   ddm->active = g_strdup(name);
   g_signal_emit(G_OBJECT(ddm), ddm_signals[DDM_VALUE_CHANGED], 0);
@@ -209,7 +209,7 @@ dia_dynamic_menu_create_string_item(DiaDynamicMenu *ddm, gchar *string)
  * labels in the menu.
  */
 GtkWidget *
-dia_dynamic_menu_new_stringbased(GtkMenuItem *otheritem, 
+dia_dynamic_menu_new_stringbased(GtkMenuItem *otheritem,
                                 gpointer userdata,
                                 gchar *persist)
 {
@@ -220,13 +220,13 @@ dia_dynamic_menu_new_stringbased(GtkMenuItem *otheritem,
 }
 
 /** Utility function for dynamic menus that are based on a submenu with
- * many entries.  This is useful for allowing the user to get a smaller 
+ * many entries.  This is useful for allowing the user to get a smaller
  * subset menu out of a set too large to be easily handled by a menu.
  */
 GtkWidget *
 dia_dynamic_menu_new_listbased(DDMCreateItemFunc create,
                               gpointer userdata,
-                              gchar *other_label, GList *items, 
+                              gchar *other_label, GList *items,
                               gchar *persist)
 {
   GtkWidget *item = gtk_menu_item_new_with_label(other_label);
@@ -242,7 +242,7 @@ dia_dynamic_menu_new_listbased(DDMCreateItemFunc create,
  * number of strings.
  */
 GtkWidget *
-dia_dynamic_menu_new_stringlistbased(gchar *other_label, 
+dia_dynamic_menu_new_stringlistbased(gchar *other_label,
                                     GList *items,
                                     gpointer userdata,
                                     gchar *persist)
@@ -326,11 +326,11 @@ dia_dynamic_menu_add_entry(DiaDynamicMenu *ddm, const gchar *entry)
   existed = persistent_list_add(ddm->persistent_name, entry);
 
   dia_dynamic_menu_create_menu(ddm);
-  
+
   return existed?1:2;
 }
 
-/** Returns the currently selected entry. 
+/** Returns the currently selected entry.
  * @returns The name of the entry that is currently selected.  This
  * string should be freed by the caller. */
 gchar *
@@ -365,7 +365,7 @@ dia_dynamic_menu_create_menu(DiaDynamicMenu *ddm)
     for (tmplist = ddm->default_entries; tmplist != NULL; tmplist = g_list_next(tmplist)) {
       GtkWidget *item =  (ddm->create_func)(ddm, tmplist->data);
       g_object_set_data(G_OBJECT(item), "ddm_name", tmplist->data);
-      g_signal_connect(G_OBJECT(item), "activate", 
+      g_signal_connect(G_OBJECT(item), "activate",
                       G_CALLBACK(dia_dynamic_menu_activate), ddm);
       gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
       gtk_widget_show(item);
@@ -379,7 +379,7 @@ dia_dynamic_menu_create_menu(DiaDynamicMenu *ddm)
        tmplist != NULL; tmplist = g_list_next(tmplist)) {
     GtkWidget *item = (ddm->create_func)(ddm, tmplist->data);
     g_object_set_data(G_OBJECT(item), "ddm_name", tmplist->data);
-    g_signal_connect(G_OBJECT(item), "activate", 
+    g_signal_connect(G_OBJECT(item), "activate",
                     G_CALLBACK(dia_dynamic_menu_activate), ddm);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
     gtk_widget_show(item);