Commit: 7c662571aa8906cdf796d920da4402bec4a5a1d0 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revisão: 7c662571aa8906cdf796d920da4402bec4a5a1d0 (tree)
• Hora: 2004-05-18 05:08:09
• Autor: Hans Breuer <hans@breu...>
• Commiter: Hans Breuer

Mensagem de Log

don't 'failed to load external entity "NULL"' when the defaults file does

2004-05-17 Hans Breuer <[e-mail]>

* lib/object_defaults.c : don't 'failed to load external
entity "NULL"' when the defaults file does not exist,
bug #108764

* lib/widgets.c : fixed possible menu leak
* lib/dialinechooser.c lib/diaarrowchooser.c : finally
avoid finalization of floating references, bug #142307

Mudança Sumário

• modified: ChangeLog
• modified: lib/diaarrowchooser.c
• modified: lib/dialinechooser.c
• modified: lib/widgets.c

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
[phone]  Hans Breuer  <[e-mail]>
+
+	* lib/object_defaults.c : don't 'failed to load external 
+	entity "NULL"' when the defaults file does not exist, 
+	bug #108764
+
+	* lib/widgets.c : fixed possible menu leak
+	* lib/dialinechooser.c lib/diaarrowchooser.c : finally
+	avoid finalization of floating references, bug #142307
+
 2004-04-21  Tomasz Kłoczko <[e-mail]>
 
 	* acinclude.m4: minor fixes (added missing [] quotation).

--- a/lib/diaarrowchooser.c
+++ b/lib/diaarrowchooser.c
@@ -289,6 +289,8 @@ dia_arrow_chooser_new(gboolean left, DiaChangeArrowCallback callback,
   dia_arrow_chooser_dialog_new(NULL, chooser);
 
   menu = gtk_menu_new();
+  g_object_ref(G_OBJECT(menu));
+  gtk_object_sink(GTK_OBJECT(menu));
   gtk_object_set_data_full(GTK_OBJECT(chooser), button_menu_key, menu,
 			   (GtkDestroyNotify)gtk_widget_unref);
   for (i = 0; arrow_types[i].name != NULL; i++) {

--- a/lib/dialinechooser.c
+++ b/lib/dialinechooser.c
@@ -115,6 +115,7 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event)
   GdkGC *gc;
   GdkGCValues gcvalues;
   char dash_list[6];
+  int line_width = 2;
 
   if (GTK_WIDGET_DRAWABLE(widget)) {
     width = widget->allocation.width - misc->xpad * 2;
@@ -130,18 +131,18 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event)
     gdk_gc_get_values(gc, &gcvalues);
     switch (line->lstyle) {
     case LINESTYLE_SOLID:
-      gdk_gc_set_line_attributes(gc, 1, GDK_LINE_SOLID,
+      gdk_gc_set_line_attributes(gc, line_width, GDK_LINE_SOLID,
 				 gcvalues.cap_style, gcvalues.join_style);
       break;
     case LINESTYLE_DASHED:
-      gdk_gc_set_line_attributes(gc, 1, GDK_LINE_ON_OFF_DASH,
+      gdk_gc_set_line_attributes(gc, line_width, GDK_LINE_ON_OFF_DASH,
 				 gcvalues.cap_style, gcvalues.join_style);
       dash_list[0] = 10;
       dash_list[1] = 10;
       gdk_gc_set_dashes(gc, 0, dash_list, 2);
       break;
     case LINESTYLE_DASH_DOT:
-      gdk_gc_set_line_attributes(gc, 1, GDK_LINE_ON_OFF_DASH,
+      gdk_gc_set_line_attributes(gc, line_width, GDK_LINE_ON_OFF_DASH,
 				 gcvalues.cap_style, gcvalues.join_style);
       dash_list[0] = 10;
       dash_list[1] = 4;
@@ -150,7 +151,7 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event)
       gdk_gc_set_dashes(gc, 0, dash_list, 4);
       break;
     case LINESTYLE_DASH_DOT_DOT:
-      gdk_gc_set_line_attributes(gc, 1, GDK_LINE_ON_OFF_DASH,
+      gdk_gc_set_line_attributes(gc, line_width, GDK_LINE_ON_OFF_DASH,
 				 gcvalues.cap_style, gcvalues.join_style);
       dash_list[0] = 10;
       dash_list[1] = 2;
@@ -161,7 +162,7 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event)
       gdk_gc_set_dashes(gc, 0, dash_list, 6);
       break;
     case LINESTYLE_DOTTED:
-      gdk_gc_set_line_attributes(gc, 1, GDK_LINE_ON_OFF_DASH,
+      gdk_gc_set_line_attributes(gc, line_width, GDK_LINE_ON_OFF_DASH,
 				 gcvalues.cap_style, gcvalues.join_style);
       dash_list[0] = 2;
       dash_list[1] = 2;
@@ -305,6 +306,8 @@ dia_line_chooser_init (DiaLineChooser *lchooser)
   lchooser->selector = DIALINESTYLESELECTOR(wid);
 
   menu = gtk_menu_new();
+  g_object_ref(G_OBJECT(menu));
+  gtk_object_sink(GTK_OBJECT(menu));
   g_object_set_data_full(G_OBJECT(lchooser), button_menu_key, menu,
 			 (GDestroyNotify)gtk_widget_unref);
   for (i = 0; i <= LINESTYLE_DOTTED; i++) {

--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -655,7 +655,7 @@ dia_font_selector_set_styles(DiaFontSelector *fs, FontSelectorEntry *fse,
   int i=0, select = 0;
   PangoFontFace **faces;
   int nfaces;
-  GtkWidget *menu = gtk_menu_new();
+  GtkWidget *menu = NULL;
   long stylebits = 0;
   int menu_item_nr = 0;
   GSList *group = NULL;
@@ -668,6 +668,7 @@ dia_font_selector_set_styles(DiaFontSelector *fs, FontSelectorEntry *fse,
       return;
   }
 
+  menu = gtk_menu_new ();
   pango_font_family_list_faces(fse->family, &faces, &nfaces);
 
   for (i = 0; i < nfaces; i++) {