SF.net SVN: geany:[4652] trunk

[eht16 at users.sourceforge.net]

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

Log Message:
-----------
Partly revert last commit:
Unref the new files toolbar menu when freeing templates as it was done before but unref it *after* the menu has been removed from the GeanyMenuButtonAction.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/geanymenubuttonaction.c
    trunk/src/templates.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-02-07 08:31:37 UTC (rev 4651)
+++ trunk/ChangeLog	2010-02-07 18:19:25 UTC (rev 4652)
@@ -1,3 +1,12 @@
+2010-02-07  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/geanymenubuttonaction.c, src/templates.c:
+   Partly revert last commit:
+   Unref the new files toolbar menu when freeing templates as it
+   was done before but unref it *after* the menu has been removed
+   from the GeanyMenuButtonAction.
+
+
 2010-02-06  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/document.c:

Modified: trunk/src/geanymenubuttonaction.c
===================================================================
--- trunk/src/geanymenubuttonaction.c	2010-02-07 08:31:37 UTC (rev 4651)
+++ trunk/src/geanymenubuttonaction.c	2010-02-07 18:19:25 UTC (rev 4652)
@@ -236,10 +236,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: trunk/src/templates.c
===================================================================
--- trunk/src/templates.c	2010-02-07 08:31:37 UTC (rev 4651)
+++ trunk/src/templates.c	2010-02-07 18:19:25 UTC (rev 4652)
@@ -670,6 +670,7 @@
 
 	geany_menu_button_action_set_menu(
 		GEANY_MENU_BUTTON_ACTION(toolbar_get_action_by_name("New")), NULL);
+	g_object_unref(new_with_template_menu);
 	new_with_template_menu = NULL;
 }
 


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