* src/EventEdit.py: Display error message if event type not specified.

* src/gramps_main.py: fix merge callback


svn: r4240

src/const.py.in

@@ -114,6 +114,7 @@ dialogFile     = "%s/gramps.glade" % rootDir
 srcselFile     = "%s/gramps.glade" % rootDir
 findFile       = "%s/find.glade" % rootDir
 mergeFile      = "%s/mergedata.glade" % rootDir
+merge2File     = "%s/merge.glade" % rootDir
 filterFile     = "%s/rule.glade" % rootDir
 errdialogsFile = "%s/gramps.glade" % rootDir