SF.net SVN: geany-plugins:[1572] trunk/geanylatex/src/geanylatex.c

[frlan at users.sourceforge.net]

Revision: 1572
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1572&view=rev
Author:   frlan
Date:     2010-09-12 19:31:39 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
GeanyLaTeX: Move menu specific code to seperate functions

Modified Paths:
--------------
    trunk/geanylatex/src/geanylatex.c

Modified: trunk/geanylatex/src/geanylatex.c
===================================================================
--- trunk/geanylatex/src/geanylatex.c	2010-09-12 19:30:43 UTC (rev 1571)
+++ trunk/geanylatex/src/geanylatex.c	2010-09-12 19:31:39 UTC (rev 1572)
@@ -1924,18 +1924,11 @@
 	g_key_file_free(config);
 }
 
-
-void
-plugin_init(G_GNUC_UNUSED GeanyData * data)
+void static
+add_menu_to_menubar()
 {
 	GtkWidget *tmp = NULL;
-	gint i;
-
-	main_locale_init(LOCALEDIR, GETTEXT_PACKAGE);
-
-	glatex_init_configuration();
-	glatex_init_encodings_latex();
-
+	gint i;	
 	menu_latex = gtk_menu_item_new_with_mnemonic(_("_LaTeX"));
 	gtk_container_add(GTK_CONTAINER(ui_lookup_widget(geany->main_widgets->window,
 		"menubar1")), menu_latex);
@@ -1960,8 +1953,8 @@
 	menu_latex_menu_special_char_submenu = gtk_menu_new();
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_latex_menu_special_char),
 		menu_latex_menu_special_char_submenu);
-	glatex_sub_menu_init(menu_latex_menu_special_char_submenu, glatex_char_array, glatex_cat_names,
-		char_insert_activated);
+	glatex_sub_menu_init(menu_latex_menu_special_char_submenu,
+		glatex_char_array, glatex_cat_names, char_insert_activated);
 
 	menu_latex_ref = gtk_menu_item_new_with_mnemonic(_("Insert _Reference"));
 	ui_widget_set_tooltip_text(menu_latex_ref,
@@ -2081,18 +2074,6 @@
 	g_signal_connect(menu_latex_insert_command, "activate",
 		G_CALLBACK(glatex_insert_command_activated), NULL);
 
-	init_keybindings();
-
-	/* Check whether the toolbar should be shown or not and do so*/
-	if (glatex_set_toolbar_active == TRUE)
-	{
-		glatex_toolbar = init_toolbar();
-	}
-	else
-	{
-		glatex_toolbar = NULL;
-	}
-
 	ui_add_document_sensitive(menu_latex_menu_special_char);
 	ui_add_document_sensitive(menu_latex_ref);
 	ui_add_document_sensitive(menu_latex_label);
@@ -2108,13 +2089,43 @@
 	main_menu_item = menu_latex;
 }
 
+void static
+remove_menu_form_menubar()
+{
+	gtk_widget_destroy(main_menu_item);
+}
+
+
 void
+plugin_init(G_GNUC_UNUSED GeanyData * data)
+{
+	main_locale_init(LOCALEDIR, GETTEXT_PACKAGE);
+
+	glatex_init_configuration();
+	glatex_init_encodings_latex();
+
+	add_menu_to_menubar();
+
+	init_keybindings();
+
+	/* Check whether the toolbar should be shown or not and do so*/
+	if (glatex_set_toolbar_active == TRUE)
+	{
+		glatex_toolbar = init_toolbar();
+	}
+	else
+	{
+		glatex_toolbar = NULL;
+	}
+
+}
+
+void
 plugin_cleanup()
 {
-	gtk_widget_destroy(main_menu_item);
 	if (glatex_toolbar != NULL)
 		gtk_widget_destroy(glatex_toolbar);
-
+	remove_menu_form_menubar();
 	g_free(config_file);
 	g_free(glatex_ref_chapter_string);
 	g_free(glatex_ref_page_string);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.