SF.net SVN: geany:[4653] branches/geany-0.18.1

[eht16 at users.sourceforge.net]

Revision: 4653
          http://geany.svn.sourceforge.net/geany/?rev=4653&view=rev
Author:   eht16
Date:     2010-02-07 18:24:45 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
Revert last commit.

Modified Paths:
--------------
    branches/geany-0.18.1/ChangeLog
    branches/geany-0.18.1/src/geanymenubuttonaction.c
    branches/geany-0.18.1/src/templates.c

Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog	2010-02-07 18:19:25 UTC (rev 4652)
+++ branches/geany-0.18.1/ChangeLog	2010-02-07 18:24:45 UTC (rev 4653)
@@ -1,3 +1,9 @@
+2010-02-07  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/geanymenubuttonaction.c, src/templates.c:
+   Revert last commit.
+
+
 2010-02-06  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/geanymenubuttonaction.c, src/templates.c:

Modified: branches/geany-0.18.1/src/geanymenubuttonaction.c
===================================================================
--- branches/geany-0.18.1/src/geanymenubuttonaction.c	2010-02-07 18:19:25 UTC (rev 4652)
+++ branches/geany-0.18.1/src/geanymenubuttonaction.c	2010-02-07 18:24:45 UTC (rev 4653)
@@ -166,10 +166,7 @@
 	priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(action);
 
 	if (priv->menu != NULL && GTK_IS_WIDGET(priv->menu))
-	{
 		g_signal_handlers_disconnect_by_func(priv->menu, menu_items_changed_cb, action);
-		g_object_unref(priv->menu);
-	}
 	if (menu != NULL)
 	{
 		g_signal_connect(menu, "add", G_CALLBACK(menu_items_changed_cb), action);

Modified: branches/geany-0.18.1/src/templates.c
===================================================================
--- branches/geany-0.18.1/src/templates.c	2010-02-07 18:19:25 UTC (rev 4652)
+++ branches/geany-0.18.1/src/templates.c	2010-02-07 18:24:45 UTC (rev 4653)
@@ -797,10 +797,6 @@
 	{
 		gtk_widget_destroy(GTK_WIDGET(item->data));
 	}
-
-	geany_menu_button_action_set_menu(
-		GEANY_MENU_BUTTON_ACTION(toolbar_get_action_by_name("New")), NULL);
-	new_with_template_menu = NULL;
 }
 
 


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