# HG changeset patch
# User insilmaril
# Date 1120807483 0
# Node ID 835f2eb4d74412e746c13ff9d114e5d0afdde76f
# Parent  c6a5c9e27740714f20e20c0da1553375d74310f2
changes for 1.6.9

diff -r c6a5c9e27740 -r 835f2eb4d744 main.cpp
--- a/main.cpp	Fri Jul 08 07:24:42 2005 +0000
+++ b/main.cpp	Fri Jul 08 07:24:43 2005 +0000
@@ -4,6 +4,7 @@
 #include <qdir.h>
 #include <qptrlist.h>
 #include <qtextcodec.h>
+#include <qnetwork.h>
 
 #include "settings.h"
 #include "options.h"
@@ -115,6 +116,7 @@
 {
     QApplication app(argc,argv);
 
+    qInitNetworkProtocols();
 
 	// Use /usr/share/vym or /usr/local/share/vym or .
 	QDir shareDir;
diff -r c6a5c9e27740 -r 835f2eb4d744 mainwindow.cpp
--- a/mainwindow.cpp	Fri Jul 08 07:24:42 2005 +0000
+++ b/mainwindow.cpp	Fri Jul 08 07:24:43 2005 +0000
@@ -1046,7 +1046,7 @@
 
 void Main::showEvent (QShowEvent * )
 {
-	if (textEditor->showWithMain()) textEditor->show();
+	if (textEditor->showWithMain()) textEditor->showNormal();
 }
 
 bool Main::reallyWriteDirectory(const QString &dir)