Attachment #225413 for bug #311573

Lines 178-184 Link Here

(-)mlview-0.9.0/src/mlview-tree-view.h.orig (-1 / +1 lines)
178		178
179	enum MlViewStatus build_app_edit_menu () ;	179	enum MlViewStatus build_app_edit_menu () ;
180		180
181	GtkDialog * TreeView::get_expand_tree_dialog () ;	181	GtkDialog * get_expand_tree_dialog () ;
182		182
183	void clear_completion_popup_submenus () ;	183	void clear_completion_popup_submenus () ;
184		184

Lines 53-59 Link Here

(-)mlview-0.9.0/src/mlview-source-view.h.orig (-1 / +1 lines)
53		53
54	enum MlViewStatus set_default_options () ;	54	enum MlViewStatus set_default_options () ;
55		55
56	MlViewXMLDocument* SourceView::get_document () ;	56	MlViewXMLDocument* get_document () ;
57		57
58	GtkUIManager * get_ui_manager () ;	58	GtkUIManager * get_ui_manager () ;
59		59

Lines 25-30 Link Here

(-)mlview-0.9.0/src/mlview-validator.cc.orig (+1 lines)
25		25
26	#include "mlview-validator.h"	26	#include "mlview-validator.h"
27	#include "mlview-safe-ptr-utils.h"	27	#include "mlview-safe-ptr-utils.h"
		28	#include <memory>
28		29
29	#define MESSAGE_LINE_LENGTH 55	30	#define MESSAGE_LINE_LENGTH 55
30	namespace mlview	31	namespace mlview




		
		//forbid assignation/copy
		Plugin& operator= (Plugin const&) ;
		Plugin (Plugin const&) ;

	public:
		Plugin (const PluginDescriptor &a_descr) ;

		Plugin (const UString &a_url) ;
		
		virtual ~Plugin () ;
		




			contextual_menu (NULL)
	{}

	static void schemas_window_destroy_cb
	(GtkWidget *a_widget, struct DocumentWindowData *a_win) ;

	static void validation_window_destroy_cb

	         gtk_dialog_run (GTK_DIALOG (dialog));


	if (button == GTK_RESPONSE_OK) {
	case GTK_RESPONSE_OK:
		sel_menu_item = gtk_menu_get_active(GTK_MENU(menu));

		result = (ViewDescriptor *)g_object_get_data
		         (G_OBJECT(sel_menu_item), "mlview_view_desc");
	} else {

	default:
		result = NULL ;
		break;
	}
	gtk_widget_destroy (dialog);
	return result;

Return to bug 311573

Lines 157-163 Link Here

(-)mlview-0.9.0/src/mlview-editor.cc.orig (-7 / +3 lines)
157	contextual_menu (NULL)	157	contextual_menu (NULL)
158	{}	158	{}
159		159
160	static void EditorPriv::schemas_window_destroy_cb	160	static void schemas_window_destroy_cb
161	(GtkWidget a_widget, struct DocumentWindowData a_win) ;	161	(GtkWidget a_widget, struct DocumentWindowData a_win) ;
162		162
163	static void validation_window_destroy_cb	163	static void validation_window_destroy_cb
Lines 406-422 Link Here
406	gtk_dialog_run (GTK_DIALOG (dialog));	406	gtk_dialog_run (GTK_DIALOG (dialog));
407		407
408		408
409	switch (button) {	409	if (button == GTK_RESPONSE_OK) {
410	case GTK_RESPONSE_OK:
411	sel_menu_item = gtk_menu_get_active(GTK_MENU(menu));	410	sel_menu_item = gtk_menu_get_active(GTK_MENU(menu));
412		411
413	result = (ViewDescriptor *)g_object_get_data	412	result = (ViewDescriptor *)g_object_get_data
414	(G_OBJECT(sel_menu_item), "mlview_view_desc");	413	(G_OBJECT(sel_menu_item), "mlview_view_desc");
415	break;	414	} else {
416
417	default:
418	result = NULL ;	415	result = NULL ;
419	break;
420	}	416	}
421	gtk_widget_destroy (dialog);	417	gtk_widget_destroy (dialog);
422	return result;	418	return result;

Lines 46-57 Link Here

(-)mlview-0.9.0/src/mlview-plugin.h.orig (-2 / +2 lines)
46		46
47	//forbid assignation/copy	47	//forbid assignation/copy
48	Plugin& operator= (Plugin const&) ;	48	Plugin& operator= (Plugin const&) ;
49	Plugin::Plugin (Plugin const&) ;	49	Plugin (Plugin const&) ;
50		50
51	public:	51	public:
52	Plugin (const PluginDescriptor &a_descr) ;	52	Plugin (const PluginDescriptor &a_descr) ;
53		53
54	Plugin::Plugin (const UString &a_url) ;	54	Plugin (const UString &a_url) ;
55		55
56	virtual ~Plugin () ;	56	virtual ~Plugin () ;
57		57