diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2009-12-15 02:40:38 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2009-12-15 02:40:38 +0000 |
commit | 3b4ba972e0c6108f2464784b39eeaaf828004f4f (patch) | |
tree | 7f397381ee1b7f415f7804e92bb5e2655a76046e | |
parent | 2a0d666188a10c418bba6cc9b5156cfc8e8ae6f1 (diff) |
don't show update dialog if modal dialog exists or incorporation is active.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2389 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | src/update_check.c | 23 |
2 files changed, 19 insertions, 9 deletions
@@ -1,5 +1,10 @@ 2009-12-15 + * src/update_check.c: don't show update dialog if modal dialog exists + or incorporation is active. + +2009-12-15 + * src/icons/folder-search.png: modified. * src/icons/folder-group.png: added. * src/stock_pixmap.[ch] diff --git a/src/update_check.c b/src/update_check.c index 94cb141d..af9fdfe7 100644 --- a/src/update_check.c +++ b/src/update_check.c @@ -33,6 +33,7 @@ #include "update_check.h" #include "manage_window.h" +#include "inc.h" #include "gtkutils.h" #include "alertpanel.h" #include "prefs_common.h" @@ -211,15 +212,19 @@ static void update_check_cb(GPid pid, gint status, gpointer data) gdk_threads_enter(); - if (result) - update_dialog(new_ver, show_dialog_always); - else if (show_dialog_always) { - if (got_version) - alertpanel_message(_("Information"), - _("Sylpheed is already the latest version."), - ALERT_NOTICE); - else - alertpanel_error(_("Couldn't get the version information.")); + if (!gtkut_window_modal_exist() && !inc_is_active()) { + if (result) + update_dialog(new_ver, show_dialog_always); + else if (show_dialog_always) { + if (got_version) + alertpanel_message(_("Information"), + _("Sylpheed is already the latest version."), + ALERT_NOTICE); + else + alertpanel_error(_("Couldn't get the version information.")); + } + } else { + debug_print("update_check_cb: modal dialog exists or incorporation is active. Disabling update dialog.\n"); } g_free(new_ver); |