pass distcheck...

SVN revision: 21219

diff --git a/Makefile.am b/Makefile.am
index df8e0b0..57b298f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
 bin_SCRIPTS = enlightenment-config
 
 EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN enlightenment.spec \
-            debian/changelog debian/copyright \
+            debian/changelog debian/changelog.in debian/copyright \
             debian/rules debian/enlightenment.install \
             debian/enlightenment.docs debian/enlightenment-data.install \
             debian/libe.install debian/libe-dev.install debian/control \

diff --git a/src/bin/e_int_config_display.c b/src/bin/e_int_config_display.c
index 06bc3e2..1bf923c 100644 (file)
--- a/src/bin/e_int_config_display.c
+++ b/src/bin/e_int_config_display.c
@@ -91,6 +91,7 @@ _surebox_text_fill(SureBox *sb)
 {
    char buf[4096];
    
+   if (!sb->dia) return;
    snprintf(buf, sizeof(buf),
            _("Does this look OK? Press <hilight>Yes</hilight> if it does, or No if not.<br>"
              "If you do not press a button the old resolution of<br>"
@@ -120,6 +121,7 @@ _surebox_timer_cb(void *data)
        e_config_save_queue();
        sb->timer = NULL;
        e_object_del(E_OBJECT(sb->dia));
+       sb->dia = NULL;
        return 0;
      }
    return 1;