do-plugins team mailing list archive
-
do-plugins team
-
Mailing list archive
-
Message #01392
[Merge] lp:~luismmontielg/do-plugins/Emesene into lp:do-plugins
Luis Montiel has proposed merging lp:~luismmontielg/do-plugins/Emesene into lp:do-plugins.
Requested reviews:
Do Plugins Team (do-plugins)
Just changed to point to correct xml file with msn contacts, because somehow emesene devs changed the name of the xml file with contacts. now its working fine.
--
https://code.launchpad.net/~luismmontielg/do-plugins/Emesene/+merge/24777
Your team Do Plugins Team is requested to review the proposed merge of lp:~luismmontielg/do-plugins/Emesene into lp:do-plugins.
=== removed file 'Emesene/Resources/Emesene.addin.xml.in'
--- Emesene/Resources/Emesene.addin.xml.in 2009-06-25 15:14:11 +0000
+++ Emesene/Resources/Emesene.addin.xml.in 1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-<Addin
- id="Emesene"
- namespace="Do"
- version="1.0"
- name="Emesene"
- description="Search your buddies and initiate chats."
- author="Luis Miguel Montiel G"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Emesene_Plugin";
->
-
- <Runtime>
- <Import assembly="Emesene.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <!-- Sources -->
- <Extension path="/Do/ItemSource">
- <ItemSource type="Do.Universe.EmeseneContactItemSource" />
- <ItemSource type="Do.Universe.EmeseneStatusItemSource" />
- <ItemSource type="Do.Universe.EmeseneAvatarItemSource" />
- </Extension>
-
- <!--- Actions -->
- <Extension path= "/Do/Action">
- <Action type="Do.Universe.EmeseneChatAction" />
- <Action type="Do.Universe.EmeseneChangeNickAction" />
- <Action type="Do.Universe.EmeseneChangeAvatarAction" />
- <Action type="Do.Universe.EmeseneChangePSMAction" />
- <Action type="Do.Universe.EmeseneChangeStatusAction" />
- <Action type="Do.Universe.EmeseneOpenConversationHistoryAction" />
- <Action type="Do.Universe.EmeseneOpenAvatarHistoryAction" />
- </Extension>
-
-</Addin>
=== modified file 'Emesene/src/Emesene.cs'
--- Emesene/src/Emesene.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/Emesene.cs 2010-05-05 20:54:28 +0000
@@ -1,3 +1,23 @@
+/* Emesene.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using NDesk.DBus;
using org.freedesktop.DBus;
@@ -5,7 +25,7 @@
using Do.Universe;
using Do.Platform;
-namespace Do.Universe
+namespace Emesene
{
public class Emesene
{
=== modified file 'Emesene/src/EmeseneAvatarItem.cs'
--- Emesene/src/EmeseneAvatarItem.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneAvatarItem.cs 2010-05-05 20:54:28 +0000
@@ -1,8 +1,28 @@
+/* EmeseneAvatarItem.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using Do.Universe;
using Do.Platform;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneAvatarItem : Item, IFileItem
{
=== modified file 'Emesene/src/EmeseneAvatarItemSource.cs'
--- Emesene/src/EmeseneAvatarItemSource.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneAvatarItemSource.cs 2010-05-05 20:54:28 +0000
@@ -1,10 +1,31 @@
+/* EmeseneAvatarItemSource.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
using System;
using System.IO;
using Do.Universe;
using Do.Platform;
using System.Collections.Generic;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneAvatarItemSource : ItemSource
{
=== modified file 'Emesene/src/EmeseneChangeAvatarAction.cs'
--- Emesene/src/EmeseneChangeAvatarAction.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneChangeAvatarAction.cs 2010-05-05 20:54:28 +0000
@@ -1,10 +1,30 @@
+/* EmeseneChangeAvatarAction.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using Do.Universe;
using System.Collections.Generic;
using System.IO;
using System.Linq;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneChangeAvatarAction : Act
{
=== modified file 'Emesene/src/EmeseneChangeNickAction.cs'
--- Emesene/src/EmeseneChangeNickAction.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneChangeNickAction.cs 2010-05-05 20:54:28 +0000
@@ -1,8 +1,29 @@
+/* EmeseneChangeNickAction.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using System.Collections.Generic;
using System.Linq;
+using Do.Universe;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneChangeNickAction : Act
{
=== modified file 'Emesene/src/EmeseneChangePSMAction.cs'
--- Emesene/src/EmeseneChangePSMAction.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneChangePSMAction.cs 2010-05-05 20:54:28 +0000
@@ -1,9 +1,29 @@
+/* EmeseneChangePSMAction.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using System.Linq;
using Do.Universe;
using System.Collections.Generic;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneChangePSMAction : Act
{
=== modified file 'Emesene/src/EmeseneChangeStatusAction.cs'
--- Emesene/src/EmeseneChangeStatusAction.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneChangeStatusAction.cs 2010-05-05 20:54:28 +0000
@@ -1,9 +1,29 @@
+/* EmeseneChangeStatusAction.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using Do.Universe;
using System.Collections.Generic;
using System.Linq;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneChangeStatusAction : Act
{
=== modified file 'Emesene/src/EmeseneChatAction.cs'
--- Emesene/src/EmeseneChatAction.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneChatAction.cs 2010-05-05 20:54:28 +0000
@@ -1,3 +1,23 @@
+/* EmeseneChatAction.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using System.Linq;
using System.Collections.Generic;
@@ -6,7 +26,7 @@
using NDesk.DBus;
using org.freedesktop.DBus;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneChatAction : Act
{
=== modified file 'Emesene/src/EmeseneContactItemSource.cs'
--- Emesene/src/EmeseneContactItemSource.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneContactItemSource.cs 2010-05-05 20:54:28 +0000
@@ -1,3 +1,23 @@
+/* EmeseneContactItemSource.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using System.IO;
using System.Xml;
@@ -5,7 +25,7 @@
using Do.Universe;
using Do.Platform;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneContactItemSource : ItemSource
{
@@ -99,7 +119,7 @@
contactsFile = Environment.GetFolderPath
(Environment.SpecialFolder.Personal)+
"/.config/emesene1.0/"+contactsFile.Replace("@","_")+
- "/cache/"+Emesene.getCurrentEmeseneUser()+"_di.xml";
+ "/cache/"+Emesene.getCurrentEmeseneUser()+"_ml.xml";
//Log<EmeseneContactItemSource>.Debug (" ------------------EmeseneContactItemSource------------------");
Log<EmeseneContactItemSource>.Debug ("XML file with contacts: {0}", contactsFile);
XmlDocument blist;
@@ -113,7 +133,7 @@
int i = 0 ;
int withDP = 0;
string photo;
- foreach (XmlNode buddy_node in blist.GetElementsByTagName ("passportName"))
+ foreach (XmlNode buddy_node in blist.GetElementsByTagName ("PassportName"))
{
i++;
mail = buddy_node.InnerText;
=== modified file 'Emesene/src/EmeseneOpenAvatarHistoryAction.cs'
--- Emesene/src/EmeseneOpenAvatarHistoryAction.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneOpenAvatarHistoryAction.cs 2010-05-05 20:54:28 +0000
@@ -1,9 +1,29 @@
+/* EmeseneOpenAvatarHistoryAction.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using System.Linq;
using System.Collections.Generic;
using Do.Universe;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneOpenAvatarHistoryAction : Act
{
=== modified file 'Emesene/src/EmeseneOpenConversationHistoryAction.cs'
--- Emesene/src/EmeseneOpenConversationHistoryAction.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneOpenConversationHistoryAction.cs 2010-05-05 20:54:28 +0000
@@ -1,9 +1,29 @@
+/* EmeseneOpenConversationHistoryAction.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using System.Collections.Generic;
using Do.Universe;
using System.Linq;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneOpenConversationHistoryAction : Act
{
=== modified file 'Emesene/src/EmeseneStatusItem.cs'
--- Emesene/src/EmeseneStatusItem.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneStatusItem.cs 2010-05-05 20:54:28 +0000
@@ -1,7 +1,27 @@
+/* EmeseneStatusItem.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using Do.Universe;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneStatusItem : Item
{
=== modified file 'Emesene/src/EmeseneStatusItemSource.cs'
--- Emesene/src/EmeseneStatusItemSource.cs 2009-02-01 20:21:24 +0000
+++ Emesene/src/EmeseneStatusItemSource.cs 2010-05-05 20:54:28 +0000
@@ -1,8 +1,28 @@
+/* EmeseneStatusItemSource.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
using System;
using Do.Universe;
using System.Collections.Generic;
-namespace Do.Universe
+namespace Emesene
{
public class EmeseneStatusItemSource : ItemSource
{
Follow ups
