提交: aa744f4d2e12e6e48dab7b7b78517bbb8637e7ae - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修訂: aa744f4d2e12e6e48dab7b7b78517bbb8637e7ae (tree)
• 時間: 2004-05-06 00:29:25
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

DiagramData now GObject, stable pagesetup

Change Summary

• modified: ChangeLog
• modified: app/diagram.c
• modified: app/display.c
• modified: app/filedlg.c
• modified: app/pagesetup.c
• modified: lib/diagramdata.c
• modified: lib/diagramdata.h

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-05-05  Lars Clausen  <[e-mail]>
 
+	* app/pagesetup.c (pagesetup_respond): Do not free ps twice.
+	Notify takes care.  Should maybe use that more.
+
+	* lib/diagramdata.[ch]: 
+	* app/filedlg.c (file_export_ok_callback): 
+	* app/diagram.c (diagram_finalize): DiagramData now a GObject.
+
 	* app/dia-props.c (diagram_properties_respond): 
 	* app/diagram.c (diagram_set_modified): 
 	* app/undo.c: 

--- a/app/diagram.c
+++ b/app/diagram.c
@@ -84,7 +84,8 @@ diagram_finalize(GObject *object)
 
   assert(dia->displays==NULL);
 
-  diagram_data_destroy(dia->data);
+  g_object_unref(dia->data);
+  dia->data = NULL;
   
   g_free(dia->filename);
 
@@ -112,6 +113,7 @@ diagram_class_init (DiagramClass *klass)
 Diagram *
 diagram_new() {
   Diagram *dia = g_object_new(DIA_TYPE_DIAGRAM, NULL);
+  g_object_ref(dia);
   return dia;
 }
 

--- a/app/display.c
+++ b/app/display.c
@@ -961,6 +961,7 @@ ddisp_destroy(DDisplay *ddisp)
 
   ddisplay_im_context_preedit_reset(ddisp, active_focus());
 
+  /* This calls ddisplay_really_destroy */
   gtk_widget_destroy (ddisp->shell);
 }
 

--- a/app/filedlg.c
+++ b/app/filedlg.c
@@ -47,7 +47,7 @@ static int
 file_dialog_hide (GtkWidget *filesel)
 {
   gtk_widget_hide (filesel);
-  g_object_unref(gtk_object_get_user_data(GTK_OBJECT(filesel)));
+  g_object_unref(gtk_object_get_user_data(GTK_OBJECT(filesel))); 
   gtk_object_set_user_data(GTK_OBJECT(filesel), NULL);
 
 #if 0
@@ -333,7 +333,7 @@ file_save_as_callback(gpointer data, guint action, GtkWidget *widget)
 				  dia->filename ? dia->filename
 				  : "." G_DIR_SEPARATOR_S);
   gtk_object_set_user_data(GTK_OBJECT(savedlg), dia);
-  g_object_ref(dia);
+  g_object_ref(dia); 
   gtk_widget_show(savedlg);
 }
 
@@ -449,11 +449,12 @@ file_export_ok_callback(GtkWidget *w, GtkFileSelection *fs)
 					   ->menu_item));
   if (!ef)
     ef = filter_guess_export_filter(filename);
-  if (ef)
-      ef->export(dia->data, filename, dia->filename, ef->user_data);
-  else
-      message_error(_("Could not determine which export filter\n"
-		      "to use to save '%s'"), filename);
+  if (ef) {
+    g_object_ref(dia->data); 
+    ef->export(dia->data, filename, dia->filename, ef->user_data);
+  } else
+    message_error(_("Could not determine which export filter\n"
+		    "to use to save '%s'"), filename);
 
   file_dialog_hide(exportdlg);
 }
@@ -515,7 +516,7 @@ file_export_callback(gpointer data, guint action, GtkWidget *widget)
   }
  
   gtk_object_set_user_data(GTK_OBJECT(exportdlg), dia);
-  g_object_ref(dia);
+  g_object_ref(dia); 
   gtk_widget_set_sensitive(exportdlg, TRUE);
   if (GTK_WIDGET_VISIBLE(exportdlg))
     return;

--- a/app/pagesetup.c
+++ b/app/pagesetup.c
@@ -57,7 +57,6 @@ pagesetup_respond(GtkWidget *widget,
 
   if (response_id != GTK_RESPONSE_APPLY) {
     g_object_unref(ps->dia);
-    g_free(ps);
     gtk_widget_destroy(ps->window);
   }
 

--- a/lib/diagramdata.c
+++ b/lib/diagramdata.c
@@ -29,53 +29,43 @@
 static const Rectangle invalid_extents = { -1.0,-1.0,-1.0,-1.0 };
 static void set_parent_layer(gpointer layer, gpointer object);
 
-DiagramData *
-new_diagram_data (NewDiagramData *prefs)
-{
-	DiagramData *data;
-	Layer *first_layer;
-   
-	data = g_new (DiagramData, 1);
-   
-	data->extents.left = 0.0; 
-	data->extents.right = 10.0; 
-	data->extents.top = 0.0; 
-	data->extents.bottom = 10.0; 
- 
-	data->bg_color = prefs->bg_color;
-	data->pagebreak_color = prefs->pagebreak_color;
-
-	get_paper_info (&data->paper, -1, prefs);
-
-	data->grid.dynamic = TRUE;
-	data->grid.width_x = 1.0;
-	data->grid.width_y = 1.0;
-	data->grid.visible_x = 1;
-	data->grid.visible_y = 1;
-	data->grid.colour = prefs->grid_color;
-
-	data->guides.nhguides = 0;
-	data->guides.hguides = NULL;
-	data->guides.nvguides = 0;
-	data->guides.vguides = NULL;
-
-	first_layer = new_layer(g_strdup(_("Background")),data);
-  
-	data->layers = g_ptr_array_new ();
-	g_ptr_array_add (data->layers, first_layer);
-	data->active_layer = first_layer;
-
-	data->selected_count = 0;
-	data->selected = NULL;
+static void diagram_data_class_init (DiagramDataClass *klass);
+
+static gpointer parent_class = NULL;
+
+GType
+diagram_data_get_type (void)
+{
+  static GType object_type = 0;
+
+  if (!object_type)
+    {
+      static const GTypeInfo object_info =
+      {
+        sizeof (DiagramDataClass),
+        (GBaseInitFunc) NULL,
+        (GBaseFinalizeFunc) NULL,
+        (GClassInitFunc) diagram_data_class_init,
+        NULL,           /* class_finalize */
+        NULL,           /* class_data */
+        sizeof (DiagramData),
+        0,              /* n_preallocs */
+	NULL            /* init */
+      };
+
+      object_type = g_type_register_static (G_TYPE_OBJECT,
+                                            "DiagramData",
+                                            &object_info, 0);
+    }
   
-	data->is_compressed = prefs->compress_save; // Overridden by doc
-
-	return data;
+  return object_type;
 }
 
-void
-diagram_data_destroy(DiagramData *data)
+static void
+diagram_data_finalize(GObject *object) 
 {
+  DiagramData *data = DIA_DIAGRAM_DATA(object);
+
   int i;
 
   g_free(data->paper.name);
@@ -89,7 +79,65 @@ diagram_data_destroy(DiagramData *data)
   g_list_free(data->selected);
   data->selected = NULL; /* for safety */
   data->selected_count = 0;
-  g_free(data);
+}
+
+static void
+diagram_data_class_init (DiagramDataClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  object_class->finalize = diagram_data_finalize;
+}
+
+DiagramData *
+new_diagram_data (NewDiagramData *prefs)
+{
+  DiagramData *data;
+  Layer *first_layer;
+   
+  data = g_object_new (DIA_TYPE_DIAGRAM_DATA, NULL);
+   
+  data->extents.left = 0.0; 
+  data->extents.right = 10.0; 
+  data->extents.top = 0.0; 
+  data->extents.bottom = 10.0; 
+ 
+  data->bg_color = prefs->bg_color;
+  data->pagebreak_color = prefs->pagebreak_color;
+
+  get_paper_info (&data->paper, -1, prefs);
+
+  data->grid.dynamic = TRUE;
+  data->grid.width_x = 1.0;
+  data->grid.width_y = 1.0;
+  data->grid.visible_x = 1;
+  data->grid.visible_y = 1;
+  data->grid.colour = prefs->grid_color;
+
+  data->guides.nhguides = 0;
+  data->guides.hguides = NULL;
+  data->guides.nvguides = 0;
+  data->guides.vguides = NULL;
+
+  first_layer = new_layer(g_strdup(_("Background")),data);
+  
+  data->layers = g_ptr_array_new ();
+  g_ptr_array_add (data->layers, first_layer);
+  data->active_layer = first_layer;
+
+  data->selected_count = 0;
+  data->selected = NULL;
+  
+  data->is_compressed = prefs->compress_save; // Overridden by doc
+
+  return data;
+}
+
+void
+diagram_data_destroy(DiagramData *data) {
+  g_object_unref(data);
 }
 
 Layer *

--- a/lib/diagramdata.h
+++ b/lib/diagramdata.h
@@ -38,6 +38,16 @@ struct _NewDiagramData {
   int compress_save;
 };
 
+GType diagram_data_get_type (void) G_GNUC_CONST;
+
+#define DIA_TYPE_DIAGRAM_DATA           (diagram_data_get_type ())
+#define DIA_DIAGRAM_DATA(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_DIAGRAM_DATA, DiagramData))
+#define DIA_DIAGRAM_DATA_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), DIA_TYPE_DIAGRAM_DATA, DiagramDataClass))
+#define DIA_IS_DIAGRAM_DATA(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DIA_TYPE_DIAGRAM_DATA))
+#define DIA_DIAGRAM_DATA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DIA_TYPE_DIAGRAM_DATA, DiagramDataClass))
+
+
+
 struct _DiagramData {
   GObject parent_instance;
 
@@ -87,6 +97,10 @@ struct _DiagramData {
   GList *text_edits;
 };
 
+typedef struct _DiagramDataClass {
+  GObjectClass parent_class;
+} DiagramDataClass;
+
 struct _Layer {
   char *name;
   Rectangle extents;      /* The extents of the layer        */