SF.net SVN: geany-plugins:[405] branches/GeanyVC_menu_redesign/geanyvc.c

[kugel- at users.sourceforge.net]

Revision: 405
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=405&view=rev
Author:   kugel-
Date:     2009-01-26 18:52:40 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
update to patch v2

Modified Paths:
--------------
    branches/GeanyVC_menu_redesign/geanyvc.c

Modified: branches/GeanyVC_menu_redesign/geanyvc.c
===================================================================
--- branches/GeanyVC_menu_redesign/geanyvc.c	2009-01-24 01:31:48 UTC (rev 404)
+++ branches/GeanyVC_menu_redesign/geanyvc.c	2009-01-26 18:52:40 UTC (rev 405)
@@ -1890,7 +1890,7 @@
 }
 
 static void
-current_file_menu(GtkWidget **parent_menu, GtkTooltips **tooltips)
+do_current_file_menu(GtkWidget **parent_menu, GtkTooltips **tooltips)
 {
 	GtkWidget *cur_file_menu = NULL;
     /* Menu which will hold the items in the current file menu */
@@ -1966,7 +1966,7 @@
 }
 
 static void
-current_dir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips)
+do_current_dir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips)
 {
     GtkWidget *cur_dir_menu = NULL;
     /* Menu which will hold the items in the current file menu */
@@ -1996,7 +1996,7 @@
 }
 
 static void
-basedir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips)
+do_basedir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips)
 {
     GtkWidget *basedir_menu = NULL;
     /* Menu which will hold the items in the current file menu */
@@ -2027,32 +2027,6 @@
 	g_signal_connect((gpointer) menu_vc_log_basedir, "activate",
 			 G_CALLBACK(vclog_basedir_activated), NULL);
 
-	gtk_container_add(GTK_CONTAINER(basedir_menu), gtk_separator_menu_item_new());
-    /* Status of basedir */
-	menu_vc_status = gtk_menu_item_new_with_mnemonic(_("_Status"));
-	gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_status);
-	gtk_tooltips_set_tip(*tooltips, menu_vc_status, _("Show status."), NULL);
-
-	g_signal_connect((gpointer) menu_vc_status, "activate",
-			 G_CALLBACK(vcstatus_activated), NULL);
-
-
-	/* complete update */
-	menu_vc_update = gtk_menu_item_new_with_mnemonic(_("Update"));
-	gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_update);
-	gtk_tooltips_set_tip(*tooltips, menu_vc_update, _("Update from remote repositary."), NULL);
-
-	g_signal_connect((gpointer) menu_vc_update, "activate",
-			 G_CALLBACK(vcupdate_activated), NULL);
-
-
-	/* Commit all changes */
-	menu_vc_commit = gtk_menu_item_new_with_mnemonic(_("_Commit"));
-	gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_commit);
-	gtk_tooltips_set_tip(*tooltips, menu_vc_commit, _("Commit changes."), NULL);
-
-	g_signal_connect((gpointer) menu_vc_commit, "activate",
-			 G_CALLBACK(vccommit_activated), NULL);
     /* connect to parent menu */
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(*parent_menu), basedir_menu);
 }
@@ -2108,15 +2082,43 @@
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_vc), menu_vc_menu);
 
     /* Create the current file Submenu */
-	current_file_menu(&menu_vc_file, &tooltips);
+	do_current_file_menu(&menu_vc_file, &tooltips);
 	gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_file);
     /* Create the current directory Submenu */
-    current_dir_menu(&menu_vc_dir, &tooltips);
+    do_current_dir_menu(&menu_vc_dir, &tooltips);
 	gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_dir);
     /* Create the current base directory Submenu */
-    basedir_menu(&menu_vc_basedir, &tooltips);
+    do_basedir_menu(&menu_vc_basedir, &tooltips);
 	gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_basedir);
 
+	gtk_container_add(GTK_CONTAINER(menu_vc_menu), gtk_separator_menu_item_new());
+    /* Status of basedir */
+	menu_vc_status = gtk_menu_item_new_with_mnemonic(_("_Status"));
+	gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_status);
+	gtk_tooltips_set_tip(tooltips, menu_vc_status, _("Show status."), NULL);
+
+	g_signal_connect((gpointer) menu_vc_status, "activate",
+			 G_CALLBACK(vcstatus_activated), NULL);
+
+
+	/* complete update */
+	menu_vc_update = gtk_menu_item_new_with_mnemonic(_("Update"));
+	gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_update);
+	gtk_tooltips_set_tip(tooltips, menu_vc_update, _("Update from remote repositary."), NULL);
+
+	g_signal_connect((gpointer) menu_vc_update, "activate",
+			 G_CALLBACK(vcupdate_activated), NULL);
+
+
+	/* Commit all changes */
+	menu_vc_commit = gtk_menu_item_new_with_mnemonic(_("_Commit"));
+	gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_commit);
+	gtk_tooltips_set_tip(tooltips, menu_vc_commit, _("Commit changes."), NULL);
+
+	g_signal_connect((gpointer) menu_vc_commit, "activate",
+			 G_CALLBACK(vccommit_activated), NULL);
+
+
 	gtk_widget_show_all(menu_vc);
 	gtk_widget_show_all(menu_vc_file);
 	gtk_widget_show_all(menu_vc_dir);


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