<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -63,22 +63,22 @@ function getAvatar(account, address, XMPP){
 
 // ShowS an alert popup and play a sound alert
 function showmsgpopup(avatar, contact, text){
-    
-    /*    
-    // Listening for callbacks 
-    var listener = {
-	observe: function(subject, topic, data) {
-	    dump(&quot;subject=&quot; + subject + &quot;, topic=&quot; + topic + &quot;, data=&quot; + data);
+  dump(&quot;\n Entered showmsgpopup in util_impl \n&quot;);
+  /*    
+  // Listening for callbacks 
+  var listener = {
+  observe: function(subject, topic, data) {
+  dump(&quot;subject=&quot; + subject + &quot;, topic=&quot; + topic + &quot;, data=&quot; + data);
 	}
-    }
-    alertService.showAlertNotification(avatar, contact, text, true, &quot;cookie&quot;, listener);
-    */
-    alertService.showAlertNotification(avatar, contact, text, false, &quot;&quot;, null);
-    
-    // Forces avatar to default avatar due a lag in avatar update
-    //avatar = defaultAvatar;
-
-    // Checks prefs to play / not to play a sound alert
-    var sound = eval(pref.getBoolPref('sound'));
-    if (sound) player.play(music);
+	}
+	alertService.showAlertNotification(avatar, contact, text, true, &quot;cookie&quot;, listener);
+  */
+  alertService.showAlertNotification(avatar, contact, text, false, &quot;&quot;, null);
+  
+  // Forces avatar to default avatar due a lag in avatar update
+  //avatar = defaultAvatar;
+  
+  // Checks prefs to play / not to play a sound alert
+  var sound = eval(pref.getBoolPref('sound'));
+  if (sound) player.play(music);
 }
\ No newline at end of file</diff>
      <filename>chrome/content/lib/util_impl.js</filename>
    </modified>
    <modified>
      <diff>@@ -62,7 +62,7 @@
     &lt;separator class=&quot;groove&quot; /&gt;
     
     &lt;hbox flex=&quot;1&quot; align=&quot;baseline&quot;&gt;
-      &lt;label value=&quot;Reset status and status message:&quot; /&gt;
+      &lt;label value=&quot;Reset stored status and status message:&quot; /&gt;
       &lt;button label=&quot;Do it!&quot; oncommand=&quot;notifymePrefs.reset();&quot;/&gt;
     &lt;/hbox&gt;
   &lt;/groupbox&gt;</diff>
      <filename>chrome/content/preferences_notifyme.xul</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,7 @@
 &lt;?xml version=&quot;1.0&quot;?&gt;
 
 &lt;!--
-  This file is part of 'Notify me' (SamePlace addon).
+  This file is part of 'Notify me'.
 
   'Notify me' is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -15,6 +15,8 @@
   
   You should have received a copy of the GNU General Public License
   along with 'Notify me'.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
+
+   Author: Ivan Morgillo &lt; imorgillo [at] sanniolug [dot] org &gt;
 --&gt;
 
 &lt;?xml-stylesheet href=&quot;chrome://notifyme/skin/overlay.css&quot; type=&quot;text/css&quot;?&gt;</diff>
      <filename>chrome/content/preferences_roomsautojoin.xul</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,5 @@
 /*
-  This file is part of 'Notify me' (SamePlace addon).
+  This file is part of 'Notify me'.
 
   'Notify me' is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -13,6 +13,8 @@
   
   You should have received a copy of the GNU General Public License
   along with 'Notify me'.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
+
+  Author: Ivan Morgillo &lt; imorgillo [at] sanniolug [dot] org &gt;
 */
 
 /// GLOBAL DEFINITIONS</diff>
      <filename>chrome/content/preferences_roomsautojoin_impl.js</filename>
    </modified>
    <modified>
      <diff>@@ -71,23 +71,24 @@ function init() {
   loader.loadSubScript('chrome://notifyme/content/lib/util_impl.js', utils);
 
     
-
-  // Application detecting
-  var children = appCheck.getChildList(&quot;&quot;, {});
-  if (children == &quot;thunderbird&quot;){
-    dump(&quot;XPCOM Component has been loaded in Thunderbird \n&quot;);
-    isThunderbird = true;
-    isFirefox = false;
+  runInFirefox();
+
+  // // Application detecting
+  // var children = appCheck.getChildList(&quot;&quot;, {});
+  // if (children == &quot;thunderbird&quot;){
+  //   dump(&quot;XPCOM Component has been loaded in Thunderbird \n&quot;);
+  //   isThunderbird = true;
+  //   isFirefox = false;
 	
-    runInThunderbird();
-  }
-  if (children == &quot;firefox&quot;){
-    dump(&quot;XPCOM Component has been loaded in Firefox \n&quot;);
-    isFirefox = true;
-    isThunderbird = false;
+  //   runInThunderbird();
+  // }
+  // if (children == &quot;firefox&quot;){
+  //   dump(&quot;XPCOM Component has been loaded in Firefox \n&quot;);
+  //   isFirefox = true;
+  //   isThunderbird = false;
 	
-    runInFirefox();
-  }
+  //   runInFirefox();
+  // }
 
 }
 
@@ -210,6 +211,7 @@ function detectMsgTypeNSend(message, address, account){
   }
     
   else if(message.stanza.@type == &quot;chat&quot; &amp;&amp; popup){
+    dump(&quot;\n Message received. going to call composeAndSend \n&quot;);
     // Obtains contact nick as you aliased it in your contact list, i.e. Ivan for imorgillo@sameplace.cc
     var nick = XMPP.nickFor(message.account, XMPP.JID(message.stanza.@from).address);
     avatar = utils.getAvatar(account, address, XMPP);</diff>
      <filename>chrome/content/service.js</filename>
    </modified>
    <modified>
      <diff>@@ -10,6 +10,8 @@ const INTERFACE = Components.interfaces.nsIXMPPPresenceNotificationService;
 /* ---------------------------------------------------------------------- */
 /*                           Template code                                */
 
+dump(&quot;\n XPCOM Component: loading...\n&quot;);
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
@@ -76,4 +78,5 @@ var Module = {
     canUnload: function(aCompMgr) { return true; }
 };
 
-function NSGetModule(aCompMgr, aFileSpec) { return Module; }
\ No newline at end of file
+function NSGetModule(aCompMgr, aFileSpec) { return Module; }
+dump(&quot;\n XPCOM Component: loaded...\n&quot;);</diff>
      <filename>components/XMPPPresenceNotificationService.js</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d4e3945271e9affa6975be721c98c38fdbfac193</id>
    </parent>
    <parent>
      <id>bd785ffe3ca57a9ee0f8e508d6f88b97c9bdd9fb</id>
    </parent>
  </parents>
  <author>
    <name>Ivan Morgillo</name>
    <email>imorgillo [at] sanniolug [dot] org</email>
  </author>
  <url>http://github.com/hamen/notifyme/commit/0231f5b11779cd6492bc2413f32ec2dd93ce56f7</url>
  <id>0231f5b11779cd6492bc2413f32ec2dd93ce56f7</id>
  <committed-date>2009-07-06T09:22:00-07:00</committed-date>
  <authored-date>2009-07-06T09:22:00-07:00</authored-date>
  <message>Merge branch 'devel'</message>
  <tree>287bc796123c4c25b57a17abb401f70499c494e7</tree>
  <committer>
    <name>Ivan Morgillo</name>
    <email>imorgillo [at] sanniolug [dot] org</email>
  </committer>
</commit>
