tagging 0.6.3

grendello · Jan 1, 2009 · 61fd3bb · 61fd3bb
2 parents 6489340 + 24237f3
commit 61fd3bb
Show file tree

Hide file tree

Showing 18 changed files with 118 additions and 48 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -22,5 +22,6 @@ SUBDIRS = 	src \
 
 update-po:
 	for PODIR in $(PODIRS); do \
-		$(MAKE) -C $$PODIR $@; \
+		echo $$PODIR; \
+		$(MAKE) -C $$PODIR $@ | egrep -e '(:$$|messages)'; \
 	done
diff --git a/po-Engine/da.po b/po-Engine/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:25+0100\n"
+"POT-Creation-Date: 2009-01-01 18:39+0100\n"
 "PO-Revision-Date: 2006-12-11 00:21+0100\n"
 "Last-Translator: Bjarke Sørensen <bs@wasd.dk>\n"
 "Language-Team: Danish <bs@wasd.dk>\n"
@@ -105,7 +105,12 @@ msgstr "Afbrydelse fejlede, kunne ikke finde server: {0}"
 msgid "Not connected to any network"
 msgstr "Ikke forbundet til noget netværk"
 
-#: ../src/Engine/Session.cs:876
+#: ../src/Engine/Session.cs:884
+#, csharp-format
+msgid "No protocol manager found for the protocol: {0}"
+msgstr ""
+
+#: ../src/Engine/Session.cs:904
 #, csharp-format
 msgid "Unknown protocol: {0}"
 msgstr ""

diff --git a/po-Engine/de.po b/po-Engine/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:25+0100\n"
+"POT-Creation-Date: 2009-01-01 18:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mirco Bauer <meebey@meebey.net>\n"
 "Language-Team: German <LL@li.org>\n"
@@ -112,7 +112,12 @@ msgstr ""
 msgid "Not connected to any network"
 msgstr "Keine Verbindung zu einem Netzwerk"
 
-#: ../src/Engine/Session.cs:876
+#: ../src/Engine/Session.cs:884
+#, csharp-format
+msgid "No protocol manager found for the protocol: {0}"
+msgstr "Kein Protokoll-Manager gefunden für das Protokoll: {0}"
+
+#: ../src/Engine/Session.cs:904
 #, csharp-format
 msgid "Unknown protocol: {0}"
 msgstr "Unbekanntes Protokoll: {0}"
diff --git a/po-Engine/es.po b/po-Engine/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:25+0100\n"
+"POT-Creation-Date: 2009-01-01 18:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Juan Miguel Carrero <streinleght@gmail.com>\n"
 "Language-Team: Spanish <streinleght@gmail.com>\n"
@@ -103,7 +103,12 @@ msgstr "Cambio de red fallido , no se puede encontrar la red con host: {0}"
 msgid "Not connected to any network"
 msgstr "No conectado a ninguna red"
 
-#: ../src/Engine/Session.cs:876
+#: ../src/Engine/Session.cs:884
+#, csharp-format
+msgid "No protocol manager found for the protocol: {0}"
+msgstr ""
+
+#: ../src/Engine/Session.cs:904
 #, csharp-format
 msgid "Unknown protocol: {0}"
 msgstr "Protocolo desconocido: {0}"
diff --git a/po-Engine/fr.po b/po-Engine/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:25+0100\n"
+"POT-Creation-Date: 2009-01-01 18:39+0100\n"
 "PO-Revision-Date: 2008-09-05 01:34+0100\n"
 "Last-Translator: Clement BOURGEOIS <moonpyk@gmail.com>\n"
 "Language-Team: French <moonpyk@gmail.com>\n"
@@ -107,7 +107,12 @@ msgstr "Changement de réseau impossible, aucun réseau pour l'hôte : {0}"
 msgid "Not connected to any network"
 msgstr "Connecté à aucun réseau"
 
-#: ../src/Engine/Session.cs:876
+#: ../src/Engine/Session.cs:884
+#, csharp-format
+msgid "No protocol manager found for the protocol: {0}"
+msgstr ""
+
+#: ../src/Engine/Session.cs:904
 #, csharp-format
 msgid "Unknown protocol: {0}"
 msgstr "Protocole inconnu : {0}"
diff --git a/po-Engine/it.po b/po-Engine/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:25+0100\n"
+"POT-Creation-Date: 2009-01-01 18:39+0100\n"
 "PO-Revision-Date: 2008-12-28 23:55+0100\n"
 "Last-Translator: David Paleino <d.paleino@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -107,7 +107,12 @@ msgstr "Cambio di rete fallito, impossibile trovare rete con host: {0}"
 msgid "Not connected to any network"
 msgstr "Non connesso ad alcuna rete"
 
-#: ../src/Engine/Session.cs:876
+#: ../src/Engine/Session.cs:884
+#, csharp-format
+msgid "No protocol manager found for the protocol: {0}"
+msgstr "Nessun gestore trovato per il protocollo {0}"
+
+#: ../src/Engine/Session.cs:904
 #, csharp-format
 msgid "Unknown protocol: {0}"
 msgstr "Protocollo sconosciuto: {0}"
diff --git a/po-Engine/smuxi-engine.pot b/po-Engine/smuxi-engine.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:25+0100\n"
+"POT-Creation-Date: 2009-01-01 18:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -104,7 +104,12 @@ msgstr ""
 msgid "Not connected to any network"
 msgstr ""
 
-#: ../src/Engine/Session.cs:876
+#: ../src/Engine/Session.cs:884
+#, csharp-format
+msgid "No protocol manager found for the protocol: {0}"
+msgstr ""
+
+#: ../src/Engine/Session.cs:904
 #, csharp-format
 msgid "Unknown protocol: {0}"
 msgstr ""
diff --git a/po-Frontend-GNOME/de.po b/po-Frontend-GNOME/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:20+0100\n"
+"POT-Creation-Date: 2009-01-01 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mirco Bauer <meebey@meebey.net>\n"
 "Language-Team: German <LL@li.org>\n"
@@ -603,15 +603,15 @@ msgstr "_Caret-Modus"
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:730
+#: ../src/Frontend-GNOME/MainWindow.cs:724
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
 msgstr ""
 "Das Wechseln zur lokalen Engine wird Sie von der jetzigen Engine trennen!\n"
 "Möchten Sie das wirklich tun?"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:762
+#: ../src/Frontend-GNOME/MainWindow.cs:756
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"

diff --git a/po-Frontend-GNOME/en_GB.po b/po-Frontend-GNOME/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:20+0100\n"
+"POT-Creation-Date: 2009-01-01 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ryan Smith-Evans <Kimera.Kimera@gmail.com>\n"
 "Language-Team: English-GB <Kimera.Kimera@gmail.com>\n"
@@ -599,15 +599,15 @@ msgstr "_Caret Mode"
 msgid "_Help"
 msgstr "_Help"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:730
+#: ../src/Frontend-GNOME/MainWindow.cs:724
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
 msgstr ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:762
+#: ../src/Frontend-GNOME/MainWindow.cs:756
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"

diff --git a/po-Frontend-GNOME/es.po b/po-Frontend-GNOME/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:20+0100\n"
+"POT-Creation-Date: 2009-01-01 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Juan Miguel Carrero <streinleght@gmail.com>\n"
 "Language-Team: Spanish <streinleght@gmail.com>\n"
@@ -599,15 +599,15 @@ msgstr "_Modo Caret"
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:730
+#: ../src/Frontend-GNOME/MainWindow.cs:724
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
 msgstr ""
 "Cambiar al engine local te desconectará del engine actual!\n"
 "¿Estás seguro de que quieres hacer ésto?"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:762
+#: ../src/Frontend-GNOME/MainWindow.cs:756
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"

diff --git a/po-Frontend-GNOME/fr.po b/po-Frontend-GNOME/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:20+0100\n"
+"POT-Creation-Date: 2009-01-01 17:35+0100\n"
 "PO-Revision-Date: 2008-09-05 01:32+0100\n"
 "Last-Translator: Clement BOURGEOIS <moonpyk@gmail.com>\n"
 "Language-Team: French <moonpyk@gmail.com>\n"
@@ -607,7 +607,7 @@ msgstr "Mode _curseur"
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:730
+#: ../src/Frontend-GNOME/MainWindow.cs:724
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
@@ -616,7 +616,7 @@ msgstr ""
 "actuel !\n"
 "Êtes vous sûr(e) de vouloir continuer ?"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:762
+#: ../src/Frontend-GNOME/MainWindow.cs:756
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"

diff --git a/po-Frontend-GNOME/it.po b/po-Frontend-GNOME/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: smuxi VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:20+0100\n"
+"POT-Creation-Date: 2009-01-01 17:35+0100\n"
 "PO-Revision-Date: 2008-12-28 23:53+0100\n"
 "Last-Translator: David Paleino <d.paleino@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -604,15 +604,15 @@ msgstr "_Modalità Caret"
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:730
+#: ../src/Frontend-GNOME/MainWindow.cs:724
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
 msgstr ""
 "Cambiare all'engine locale ti disconnetterà dall'engine attuale!\n"
 "Sei sicuro di volerlo fare?"
 
-#: ../src/Frontend-GNOME/MainWindow.cs:762
+#: ../src/Frontend-GNOME/MainWindow.cs:756
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"

diff --git a/po-Frontend-GNOME/smuxi-frontend-gnome.pot b/po-Frontend-GNOME/smuxi-frontend-gnome.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-28 23:20+0100\n"
+"POT-Creation-Date: 2009-01-01 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -583,13 +583,13 @@ msgstr ""
 msgid "_Help"
 msgstr ""
 
-#: ../src/Frontend-GNOME/MainWindow.cs:730
+#: ../src/Frontend-GNOME/MainWindow.cs:724
 msgid ""
 "Switching to local engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"
 msgstr ""
 
-#: ../src/Frontend-GNOME/MainWindow.cs:762
+#: ../src/Frontend-GNOME/MainWindow.cs:756
 msgid ""
 "Switching the remote engine will disconnect you from the current engine!\n"
 "Are you sure you want to do this?"

diff --git a/src/Engine/ChangeLog b/src/Engine/ChangeLog
@@ -1,3 +1,24 @@
+2009-01-01  Mirco Bauer <meebey@meebey.net> 
+
+	* Session.cs: use variable in translatable strings
+
+2009-01-01  Mirco Bauer <meebey@meebey.net> 
+
+	* Session.cs: nicer message
+
+2009-01-01  Mirco Bauer <meebey@meebey.net> 
+
+	* FrontendManager.cs: Don't prevent removing chats when they are not synced
+	  yet, as that causes a race condition when someone enters and leaves
+	  right-away a chat and thus is not being on the frontend side. Also
+	  problematic servers (like psyBNC) could cause such "enter chat, no sync,
+	  can't remove chat" situation. (closes trac bug #144)
+
+2008-12-31  Mirco Bauer <meebey@meebey.net> 
+
+	* Session.cs: Added Connect() method that allows frontends to create new
+	  connections in a protocol neutral way.
+
 2008-12-28  Mirco Bauer <meebey@meebey.net> 
 
 	* Config/Config.cs: Make sure Username and Password are initialized empty,

diff --git a/src/Engine/FrontendManager.cs b/src/Engine/FrontendManager.cs
@@ -274,15 +274,6 @@ public void AddMessageToCurrentChat(MessageModel msg)
         }
 
         public void RemoveChat(ChatModel chat)
-        {
-            if (!_SyncedChats.Contains(chat)) {
-                return;
-            }
-
-            _RemoveChat(chat);
-        }
-
-        private void _RemoveChat(ChatModel chat)
         {
             f_TaskQueue.Queue(delegate {
                 _UI.RemoveChat(chat);

diff --git a/src/Engine/Session.cs b/src/Engine/Session.cs
@@ -868,6 +868,34 @@ public IList<string> GetSupportedProtocols()
             return _ProtocolManagerFactory.GetProtocols();
         }
 
+        public void Connect(FrontendManager frontendManager, string protocol,
+                            string hostname, int port,
+                            string username, string password)
+        {
+            Trace.Call(frontendManager, protocol, hostname, port, username, "XXX");
+
+            IProtocolManager protocolManager = _CreateProtocolManager(
+                frontendManager,
+                protocol
+            );
+            if (protocolManager == null) {
+                throw new ApplicationException(
+                    String.Format(
+                        _("No protocol manager found for the protocol: {0}"),
+                        protocol
+                    )
+                );
+            }
+
+            _ProtocolManagers.Add(protocolManager);
+            // only pass non-empty passwords to Connect()
+            if (String.IsNullOrEmpty(password)) {
+                password = null;
+            }
+            protocolManager.Connect(frontendManager, hostname, port,
+                                    username, password);
+        }
+
         private IProtocolManager _CreateProtocolManager(FrontendManager fm, string protocol)
         {
             ProtocolManagerInfoModel info = _ProtocolManagerFactory.GetProtocolManagerInfoByAlias(protocol); 

diff --git a/src/Frontend-GNOME/ChangeLog b/src/Frontend-GNOME/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-31  Mirco Bauer <meebey@meebey.net> 
+
+	* MainWindow.cs: Use Session.Connect() API instead of faking user input and
+	  hoping the protocol manager will like our format. (closes trac bug #141)
+
 2008-12-28  Mirco Bauer <meebey@meebey.net> 
 
 	* MainWindow.cs: White space fix.