dia r4046 - in trunk: . app

[hans svn gnome org]

Author: hans
Date: Sun May 25 12:57:43 2008
New Revision: 4046
URL: http://svn.gnome.org/viewvc/dia?rev=4046&view=rev

Log:
2008-05-18  Hans Breuer  <hans breuer org>

	* app/menus.c(plugin_callback) : was using ddisp unconditionally 
	causing a crash without active display, fixed remaining warnings 
	while there
	


Modified:
   trunk/ChangeLog
   trunk/app/menus.c

Modified: trunk/app/menus.c
==============================================================================
--- trunk/app/menus.c	(original)
+++ trunk/app/menus.c	Sun May 25 12:57:43 2008
@@ -832,7 +832,7 @@
   toolbox_ui_manager = gtk_ui_manager_new ();
   g_signal_connect (G_OBJECT (toolbox_ui_manager), 
                     "connect_proxy",
-		    _ui_manager_connect_proxy,
+		    G_CALLBACK (_ui_manager_connect_proxy),
 		    NULL);
   gtk_ui_manager_set_add_tearoffs (toolbox_ui_manager, DIA_SHOW_TEAROFFS);
   gtk_ui_manager_insert_action_group (toolbox_ui_manager, toolbox_actions, 0);
@@ -871,7 +871,7 @@
   display_ui_manager = gtk_ui_manager_new ();
   g_signal_connect (G_OBJECT (display_ui_manager), 
                     "connect_proxy",
-		    _ui_manager_connect_proxy,
+		    G_CALLBACK (_ui_manager_connect_proxy),
 		    NULL);
   gtk_ui_manager_set_add_tearoffs (display_ui_manager, DIA_SHOW_TEAROFFS);
   gtk_ui_manager_insert_action_group (display_ui_manager, display_actions, 0);
@@ -1294,6 +1294,6 @@
   if (cbf->callback) {
     DDisplay *ddisp = ddisplay_active();
     DiagramData* diadata = ddisp ? ddisp->diagram->data : NULL;
-    cbf->callback (diadata, ddisp->diagram->filename, 0, cbf->user_data);
+    cbf->callback (diadata, ddisp ? ddisp->diagram->filename : NULL, 0, cbf->user_data);
   }
 }