aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 08:31:56 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 08:31:56 +0000
commit55375ea8e8adb1bbf161f54ba9f82c130d68c8ce (patch)
tree4af033bef6f01a610e34f317cb3cf93f7db766ee
parent4857d86db313cb281e98682ed93193783c5f21b6 (diff)
downloadenlightenment-55375ea8e8adb1bbf161f54ba9f82c130d68c8ce.tar.gz
enlightenment-55375ea8e8adb1bbf161f54ba9f82c130d68c8ce.tar.xz
enlightenment-55375ea8e8adb1bbf161f54ba9f82c130d68c8ce.zip
backport previous module dialog commit
SVN revision: 83127
-rw-r--r--ChangeLog8
-rw-r--r--NEWS3
-rw-r--r--src/bin/e_module.c6
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index a2fbb1bf8..1a5649263 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-2013-01-22 Lucas De Marchi
+2013-01-23 Mike Blumenkrantz
- * Fixed crash when changing desktops configuration
+ * module error dialog is no longer remembered across restarts
2013-01-22 Massimo Maiurana
@@ -60,6 +60,10 @@
* Fix build with uClibc.
+2013-01-04 Lucas De Marchi
+
+ * Fixed crash when changing desktops configuration
+
2013-01-03 Cedric Bail
* Fix E17 restart after manually monitoring it
diff --git a/NEWS b/NEWS
index 42e1cf777..e7a1eb3c4 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ Fixes:
* Fixed bug where disabled slider widgets could be changed with mouse wheel
* Fixed bug where fileman config slider widgets were not properly disabled
* Tasks gadgets now apply the selected style
+ * Fixed crash when changing desktops configuration
* fixed bug where window border insets were not applied to initial positioning geometry, causing them to be placed incorrectly
* Fixed bug with desktop config profile where conf module version variable was misnamed
* fixed bug where internal dialogs would not redraw after unfullscreening
@@ -36,4 +37,4 @@ Fixes:
* fixed bug where backlight settings would try to update dummy backlight devices
* fixed gadget dragging on desktop near screen edges
* fixed bug where "don't composite fullscreen windows" option would cause some windows to stop appearing
- * Fixed crash when changing desktops configuration
+ * module error dialog is no longer remembered across restarts
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 12bed9c8d..0bf4b7f2c 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -521,9 +521,8 @@ _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m)
char buf[4096];
printf("MODULE ERR:\n%s\n", body);
- dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
- "E", "_module_unload_dialog");
- if (!dia) return;
+ dia = e_dialog_new(NULL, "E", "_module_unload_dialog");
+ EINA_SAFETY_ON_NULL_RETURN(dia);
snprintf(buf, sizeof(buf), "%s<br>%s", body,
_("What action should be taken with this module?<br>"));
@@ -534,6 +533,7 @@ _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m)
e_dialog_button_add(dia, _("Unload"), NULL, _e_module_cb_dialog_disable, m);
e_dialog_button_add(dia, _("Keep"), NULL, NULL, NULL);
e_win_centered_set(dia->win, 1);
+ dia->win->state.no_remember = 1;
e_dialog_show(dia);
}