[goffice] FontSelector: fix crash.



commit ee3a9e75cb9cc0bb1b9f6636ee8e03688c049d60
Author: Morten Welinder <terra gnome org>
Date:   Fri Oct 4 12:37:36 2013 -0400

    FontSelector: fix crash.

 ChangeLog                   |    5 +++++
 NEWS                        |    1 +
 goffice/gtk/go-optionmenu.c |    2 ++
 3 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bbe5217..8ed21f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-04  Morten Welinder  <terra gnome org>
+
+       * goffice/gtk/go-optionmenu.c (go_option_menu_set_menu): When a
+       new menu is set, clear the selected item.  [#709438]
+
 2013-10-01  Morten Welinder  <terra gnome org>
 
        * goffice/Makefile.am (ALL_HDRS): We also need goffice.h
diff --git a/NEWS b/NEWS
index e12208d..bc7f1b3 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Jean:
 Morten:
        * Build fixes.
        * Win32 work.
+       * Fix font selector crash.  [#709438]
 
 --------------------------------------------------------------------------
 goffice 0.10.7:
diff --git a/goffice/gtk/go-optionmenu.c b/goffice/gtk/go-optionmenu.c
index 9c053bd..295eae4 100644
--- a/goffice/gtk/go-optionmenu.c
+++ b/goffice/gtk/go-optionmenu.c
@@ -310,6 +310,8 @@ go_option_menu_set_menu (GOOptionMenu *option_menu,
        if (option_menu->menu == shell)
                return;
 
+       option_menu->selected = NULL;
+
        if (option_menu->menu) {
                if (option_menu->active)
                        gtk_menu_shell_cancel (option_menu->menu);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]