Merge branch 'master' of git+ssh://gitorious.process-one.net/oneteam/…

…oneteam Conflicts: po/es.po po/fr.po po/oneteam.pot po/pl.po
processone · Jun 22, 2011 · d9f7a65 · d9f7a65
2 parents 6439aeb + b63de65
commit d9f7a65
Show file tree

Hide file tree

Showing 19 changed files with 89 additions and 72 deletions.
diff --git a/application.ini b/application.ini
@@ -9,7 +9,7 @@ ID={3aea3f07-ffe3-4060-bb03-bff3a5365e90}
 
 [Gecko]
 MinVersion=1.9.2
-MaxVersion=2.0.*
+MaxVersion=5.0.*
 
 [Shell]
 Icon=chrome/icons/default/oneteam

diff --git a/chrome/oneteam/content/bindings/verifier.xml b/chrome/oneteam/content/bindings/verifier.xml
@@ -80,8 +80,8 @@
             if (this._condition != this.condition) {
               this._condition = this.condition;
               try {
-                this._conditionFun = eval("(function(val){try{return !!("+
-                                          this._condition+")}catch(e){return false}})");
+                this._conditionFun = new Function("val", "function(val){try{return !!("+
+                                          this._condition+")}catch(e){return false}}");
               } catch(e) {
                 this._conditionFun = function(){return false};
               }
@@ -91,7 +91,8 @@
             if (this._regex != this.regex) {
               this._regex = this.regex;
               try {
-                this._conditionFun = new RegExp(this._regex);
+                var rx = new RegExp(this._regex);
+                this._conditionFun = function(val) {return rx.exec(val)};
               } catch(e) {
                 this._conditionFun = function(){return false};
               }

diff --git a/defaults/preferences/pref.js b/defaults/preferences/pref.js
@@ -45,3 +45,5 @@ pref("chat.status.autoxa.status", "");
 
 pref("oneteam.onlyJingleNodes", false);
 pref("extensions.oneteam.firstrun", true);
+
+pref("app.update.channel", "devel");
diff --git a/install.rdf b/install.rdf
@@ -9,7 +9,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>3.5</em:minVersion>
-        <em:maxVersion>4.0.*</em:maxVersion>
+        <em:maxVersion>5.0.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:updateURL>https://oneteam.im/update.rdf</em:updateURL>

diff --git a/platform/Darwin_x86-gcc3/components/liboneteam.dylib b/platform/Darwin_x86-gcc3/components/liboneteam.dylib
diff --git a/platform/Darwin_x86_64-gcc3/components/liboneteam.dylib b/platform/Darwin_x86_64-gcc3/components/liboneteam.dylib
diff --git a/platform/Linux_x86-gcc3/components/liboneteam.so b/platform/Linux_x86-gcc3/components/liboneteam.so
diff --git a/platform/Linux_x86_64-gcc3/components/liboneteam.so b/platform/Linux_x86_64-gcc3/components/liboneteam.so
diff --git a/platform/WINNT_x86-msvc/components/oneteam.dll b/platform/WINNT_x86-msvc/components/oneteam.dll
diff --git a/po/branding/oneteam.pot b/po/branding/oneteam.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OneTeam 1.0\n"
-"POT-Creation-Date: 2011-06-20 14:56+0200\n"
+"POT-Creation-Date: 2011-06-22 16:05+0200\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"

diff --git a/po/es.po b/po/es.po
@@ -72,6 +72,8 @@ msgid "New Nick:"
 msgstr "Nuevo Apodo:"
 
 #: ../chrome/oneteam/content/status.xul:8
+#: ../chrome/oneteam/content/waveBrowser.xul:8
+#: ../chrome/oneteam/content/waveTest.xul:8
 msgid "Status Message"
 msgstr "Mensaje de Estado"
 

diff --git a/po/fr.po b/po/fr.po
@@ -70,6 +70,8 @@ msgid "New Nick:"
 msgstr "Nouveau pseudo :"
 
 #: ../chrome/oneteam/content/status.xul:8
+#: ../chrome/oneteam/content/waveBrowser.xul:8
+#: ../chrome/oneteam/content/waveTest.xul:8
 msgid "Status Message"
 msgstr "Message de statut"
 

diff --git a/po/oneteam.pot b/po/oneteam.pot
@@ -67,6 +67,8 @@ msgid "New Nick:"
 msgstr ""
 
 #: ../chrome/oneteam/content/status.xul:8
+#: ../chrome/oneteam/content/waveBrowser.xul:8
+#: ../chrome/oneteam/content/waveTest.xul:8
 msgid "Status Message"
 msgstr ""
 

diff --git a/po/pl.po b/po/pl.po
@@ -71,6 +71,8 @@ msgid "New Nick:"
 msgstr "Nowy pseudonim:"
 
 #: ../chrome/oneteam/content/status.xul:8
+#: ../chrome/oneteam/content/waveBrowser.xul:8
+#: ../chrome/oneteam/content/waveTest.xul:8
 msgid "Status Message"
 msgstr "Komunikat stanu"
 
@@ -2181,8 +2183,16 @@ msgid "Invitation into {0} chat room"
 msgstr "Zaproszenie do konferencji {0}"
 
 #: ../chrome/oneteam/content/JavaScript/model/conference.js:227
-msgid "User *{0}* invited you to chat room *{1}*.\\n\\nTo join this chat room please click on this link:\\n{2}\\n"
-msgstr "Użytkownik *{0}* zaprosił Cię do konferencji *{1}*.\\n\\nAby dołączyć do tej konferencji kliknij ten link:\\n{2}\\n"
+msgid ""
+"User *{0}* invited you to chat room *{1}*.\\n"
+"\\n"
+"To join this chat room please click on this link:\\n"
+"{2}\\n"
+msgstr ""
+"Użytkownik *{0}* zaprosił Cię do konferencji *{1}*.\\n"
+"\\n"
+"Aby dołączyć do tej konferencji kliknij ten link:\\n"
+"{2}\\n"
 
 #: ../chrome/oneteam/content/JavaScript/model/conference.js:469
 msgid "Chat room server can't be contacted or room reached maximum number of users"
@@ -2338,112 +2348,104 @@ msgid "This is version {0} (from {1}), {2}"
 msgstr "To jest wersja {0} (z {1}), {2}"
 
 #: ../chrome/oneteam/content/manageBookmarks.xul:168
-#, fuzzy
-msgid "Entered informations are invalid.\\nDo you want to correct entered informations,\\nor to restore previous values instead ?"
-msgstr "Wprowadzone informacje są nieprawidłowe.\\nCzy chcesz przywrócić poprzednie wartości?\\nKliknij \"Anuluj\" jeśli chcesz dokonać poprawek."
+msgid ""
+"Entered informations are invalid.\\n"
+"Do you want to correct entered informations,\\n"
+"or to restore previous values instead ?"
+msgstr ""
+"Wprowadzone informacje nie są prawidłowe.\\n"
+"Czy chcesz poprawić wprowadzone dane,\\n"
+"czy przywrócić poprzednie wartości?"
 
 #: ../chrome/oneteam/content/manageBookmarks.xul:169
-#, fuzzy
-msgid "Entered informations are invalid.\\nDo you want to correct entered informations,\\nor to remove the bookmark you have just created ?"
-msgstr "Wprowadzone informacje są nieprawidłowe.\\nCzy chcesz przywrócić poprzednie wartości?\\nKliknij \"Anuluj\" jeśli chcesz dokonać poprawek."
+msgid ""
+"Entered informations are invalid.\\n"
+"Do you want to correct entered informations,\\n"
+"or to remove the bookmark you have just created ?"
+msgstr ""
+"Wprowadzone informacje nie są prawidłowe.\\n"
+"Czy chcesz poprawić wprowadzone dane,\\n"
+"czy usunąć właśnie utworzoną zakładkę?"
 
 #: ../chrome/oneteam/content/manageBookmarks.xul:173
-#, fuzzy
 msgid "Restore Previous Values"
-msgstr "See Previous Version"
+msgstr "Przywróć poprzednią wersję"
 
 #: ../chrome/oneteam/content/manageBookmarks.xul:173
-#, fuzzy
 msgid "Remove Bookmark"
-msgstr "Zakładka"
+msgstr "Usuń zakładkę"
 
 #: ../chrome/oneteam/content/manageBookmarks.xul:174
-#, fuzzy
 msgid "Correct Informations"
-msgstr "Dane kontaktu"
+msgstr "Popraw wiadomości"
 
 #: ../chrome/oneteam/content/main.xul:346
-#, fuzzy
 msgid "Status messages overview"
-msgstr "Komunikat stanu"
+msgstr "Zestawienie komunikatów stanu"
 
 #: ../chrome/oneteam/content/overlays/macMenuOverlay.xul:42
-#, fuzzy
 msgid "_Status Messages Overview..."
-msgstr "Komunikat stanu"
+msgstr "_Zestawienie komunikatów stanu"
 
 #: ../chrome/oneteam/content/overlays/rosterContextMenus.xul:234
-#, fuzzy
 msgid "Ask to see his/her status"
-msgstr "{0} zezwolił Ci na widzenie jej/jego statusu"
+msgstr "Poproś o widzenie jej/jego statusu"
 
 #: ../chrome/oneteam/content/overlays/rosterContextMenus.xul:236
 msgid "Allow him/her to see my status"
-msgstr ""
+msgstr "Zezwól na widzenie mojego statusu"
 
 #: ../chrome/oneteam/content/overlays/rosterContextMenus.xul:238
-#, fuzzy
 msgid "Cancel authorization"
-msgstr "Anuluj subskrypcję"
+msgstr "Anululowano subskrypcję"
 
 #: ../chrome/oneteam/content/JavaScript/notification.js:501
-#, fuzzy
 msgid "Contact changed status"
-msgstr "Zmiana statusu kontaktu"
+msgstr "Kontakt zmienił status"
 
 #: ../chrome/oneteam/content/JavaScript/notification.js:503
-#, fuzzy
 msgid "Chat room participant changed status"
-msgstr "Zmiana pseudonimu uczestnika konferencji"
+msgstr "Uczestnik konferencji zmienił status"
 
 #: ../chrome/oneteam/content/JavaScript/model/account.js:58
-#, fuzzy
 msgid "My other connections"
-msgstr "Moje inne zasoby"
+msgstr "Moje inne połączenia"
 
 #: ../chrome/oneteam/content/JavaScript/notification.js:509
-#, fuzzy
 msgid "Subscription accepted or denied"
-msgstr "Otrzymano prośbę o subskrypcję"
+msgstr "Subskrybcje"
 
 #: ../chrome/oneteam/content/JavaScript/notification.js:538
-#, fuzzy
 msgid "Connections to server"
-msgstr "Utracono połączenie z serwerem"
+msgstr "Połączenie z serwerem"
 
 #: ../chrome/oneteam/content/JavaScript/notification.js:542
-#, fuzzy
 msgid "Contact events"
-msgstr "Szczegóły kontaktu"
+msgstr "Kontakty"
 
 #: ../chrome/oneteam/content/JavaScript/notification.js:547
-#, fuzzy
 msgid "Chat room events"
-msgstr "Serwer konferencji"
+msgstr "Konferencje"
 
 #: ../chrome/oneteam/content/JavaScript/notification.js:552
-#, fuzzy
 msgid "File transfer"
 msgstr "Transmisja plików"
 
 #: ../chrome/oneteam/content/JavaScript/notification.js:556
-#, fuzzy
 msgid "Voice call"
-msgstr "Połączenie głosowe..."
+msgstr "Połączenie głosowe"
 
 #: ../chrome/oneteam/content/preferences.xul:306
 msgid "Software updates"
-msgstr ""
+msgstr "Aktualizacja oprogramowania"
 
 #: ../chrome/oneteam/content/preferences.xul:318
-#, fuzzy
 msgid "Notification global settings"
-msgstr "Użyj wartości globalnych"
+msgstr "Globalne ustawienia powiadomień"
 
 #: ../chrome/oneteam/content/preferences.xul:304
-#, fuzzy
 msgid "Advanced"
-msgstr "Anulowano"
+msgstr "Zaawansowane"
 
 #: ../chrome/oneteam/content/subscribe.xul:81
 msgid "Deny"

diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt
@@ -28,13 +28,17 @@ XPCOM_IDL_ADD_FILES(idl_INCLUDES oneteam.xpt
 INSTALL(FILES ${PROJECT_BINARY_DIR}/oneteam.xpt DESTINATION ${PROJECT_SOURCE_DIR}/../../components)
 
 IF(WIN32)
-    SET(GLIB_DIR "${PROJECT_SOURCE_DIR}/libs/extra/libglib2")
+    IF(NOT GLIB_DIR)
+        SET(GLIB_DIR "${PROJECT_SOURCE_DIR}/libs/extra/libglib2" CACHE PATH "Glib library location")
+    ENDIF(NOT GLIB_DIR)
     SET(GLIB_INCLUDE_DIRS "${GLIB_DIR}/include/glib-2.0" "${GLIB_DIR}/lib/glib-2.0/include")
     SET(GLIB_LIBRARIES glib-2.24s gobject-2.24s gthread-2.24s intl)
     SET(GLIB_STATIC_LIBRARY_DIRS "${GLIB_DIR}/lib")
     SET(GLIB_BIN_DIR "${GLIB_DIR}/bin/")
 ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    SET(GLIB_DIR "/usr/local")
+    IF(NOT GLIB_DIR)
+        SET(GLIB_DIR "/opt/local" CACHE PATH "Glib library location")
+    ENDIF(NOT GLIB_DIR)
     SET(GLIB_INCLUDE_DIRS "${GLIB_DIR}/include/glib-2.0" "${GLIB_DIR}/lib/glib-2.0/include")
     SET(GLIB_STATIC_LIBRARY_DIRS "")
     SET(GLIB_BIN_DIR "${GLIB_DIR}/bin/")

diff --git a/src/components/libs/libnice/CMakeLists.txt b/src/components/libs/libnice/CMakeLists.txt
@@ -7,24 +7,29 @@ IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
 
-IF(UNIX)
-    find_package(PkgConfig)
-    pkg_check_modules(GLIB REQUIRED glib-2.0 gobject-2.0)
-ENDIF(UNIX)
-
-IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    SET(GLIB_DIR "/usr/local")
+IF(WIN32)
+    IF(NOT GLIB_DIR)
+        SET(GLIB_DIR "${PROJECT_SOURCE_DIR}/libs/extra/libglib2" CACHE PATH "Glib library location")
+    ENDIF(NOT GLIB_DIR)
     SET(GLIB_INCLUDE_DIRS "${GLIB_DIR}/include/glib-2.0" "${GLIB_DIR}/lib/glib-2.0/include")
+    SET(GLIB_LIBRARIES glib-2.24s gobject-2.24s gthread-2.24s intl)
     SET(GLIB_STATIC_LIBRARY_DIRS "${GLIB_DIR}/lib")
     SET(GLIB_BIN_DIR "${GLIB_DIR}/bin/")
-ENDIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-
-IF(WIN32)
-    SET(GLIB_DIR "${PROJECT_SOURCE_DIR}/../extra/libglib2")
+ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    IF(NOT GLIB_DIR)
+        SET(GLIB_DIR "/opt/local" CACHE PATH "Glib library location")
+    ENDIF(NOT GLIB_DIR)
     SET(GLIB_INCLUDE_DIRS "${GLIB_DIR}/include/glib-2.0" "${GLIB_DIR}/lib/glib-2.0/include")
-    SET(GLIB_LIBRARIES glib-2.24s gobject-2.24s gthread-2.24s intl)
-    SET(GLIB_LIBRARY_DIRS "${GLIB_DIR}/lib")
+    SET(GLIB_STATIC_LIBRARY_DIRS "")
     SET(GLIB_BIN_DIR "${GLIB_DIR}/bin/")
+    SET(GLIB_LIBRARIES ${GLIB_DIR}/lib/libglib-2.0.a
+		       ${GLIB_DIR}/lib/libgobject-2.0.a
+		       ${GLIB_DIR}/lib/libgthread-2.0.a
+		       ${GLIB_DIR}/lib/libintl.a
+		       -liconv)
+ELSE(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    FIND_PACKAGE(PkgConfig)
+    PKG_CHECK_MODULES(GLIB REQUIRED glib-2.0 gobject-2.0 gthread-2.0)
 ENDIF(WIN32)
 
 GET_FILENAME_COMPONENT(_signals_marshal_list "agent/agent-signals-marshal.list" ABSOLUTE)

diff --git a/src/components/src/codecs/otCodecInfo.h b/src/components/src/codecs/otCodecInfo.h
@@ -29,7 +29,7 @@ class otCodecInfo : public otICodecInfo {
               PRUint16 maxptime, PRUint16 weight, otCodecInfoAttribute** attrs,
               PRUint32 attrsCount);
 
-  ~otCodecInfo();
+  virtual ~otCodecInfo();
 
 private:
   nsCOMPtr<otICodecService> mService;

diff --git a/src/components/src/codecs/otG711.cpp b/src/components/src/codecs/otG711.cpp
@@ -54,6 +54,7 @@ otG711::GetMedias(PRInt16 *firstFreePayloadId NS_INOUTPARAM,
     nsMemory::Free(codecs);
     return NS_ERROR_OUT_OF_MEMORY;
   }
+  NS_ADDREF(codecs[1]);
 
   *medias = codecs;
   *count = 2;

diff --git a/src/components/src/systray/otPr0nObserver.cpp b/src/components/src/systray/otPr0nObserver.cpp
@@ -80,12 +80,8 @@ otPr0nObserver::Load(nsISupports *image, otSystrayBase *listener)
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  nsCOMPtr<nsIDOMHTMLImageElement> imgEl = do_QueryInterface(image);
+  nsCOMPtr<nsIImageLoadingContent> loader = do_QueryInterface(image);
 
-  if (!imgEl)
-    return NS_ERROR_NOT_AVAILABLE;
-
-  nsCOMPtr<nsIImageLoadingContent> loader = do_QueryInterface(imgEl);
   if (loader) {
     nsCOMPtr<imgIRequest> imgRequest;
     rv = loader->GetRequest(nsIImageLoadingContent::CURRENT_REQUEST,