[Pkg-mozext-commits] [SCM] system tray extension for thunderbird/firefox alike apps branch, upstream, updated. upstream/0.3.4-4-g23803ad

Sascha Girrulat sascha at girrulat.de
Wed Feb 8 19:00:19 UTC 2012 

The following commit has been merged in the upstream branch:
commit 23803ad96e324f898771c7a0a94686e11b7632a0
Author: fsoltrash at gmail.com <fsoltrash at gmail.com@1aa13f37-862e-0410-bb36-2ba89cdadaa9>
Date:   Sat Feb 4 16:34:14 2012 +0000

    + Applied vimftw patch to build using gecko sdk 10
    + Applied Hicham.Haouari's patch from Issue 212
    
    git-svn-id: http://firetray.googlecode.com/svn/trunk@144 1aa13f37-862e-0410-bb36-2ba89cdadaa9

diff --git a/build.sh b/build.sh
index 91bc292..164a0d4 100755
--- a/build.sh
+++ b/build.sh
@@ -216,8 +216,9 @@ export LIB_ARCH=_`uname -m`
 
 
 
-
-rm install.rdf
+if [ -e install.rdf ];then
+  rm install.rdf
+fi
 source ./generate_install_rdf.sh > install.rdf
 
 FILE=firetray.xpi
diff --git a/changes b/changes
index 89e724c..07e702f 100644
--- a/changes
+++ b/changes
@@ -1,4 +1,6 @@
 0.3.6  Added compose new message code (Issue 177)
+       Applied vimftw patch to build using gecko sdk 10
+	   Applied Hicham.Haouari's patch from Issue 212
 
 0.3.5  Applied vimftw patch to build using gecko sdk 9
 
diff --git a/components/SConscript b/components/SConscript
index 06011af..ce5ca1c 100644
--- a/components/SConscript
+++ b/components/SConscript
@@ -74,8 +74,8 @@ with open(gecko_include + os.sep + 'mozilla-config.h', 'r') as f:
             break
 
 # Create two builders to create xpt and header files from idl.
-bxpt = Builder(action = 'typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl')
-bhdr = Builder(action = 'header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl')
+bxpt = Builder(action = 'typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE' + ' --cachedir="."', suffix = '.xpt', src_suffix = '.idl')
+bhdr = Builder(action = 'header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE' + ' --cachedir="."', suffix = '.h', src_suffix = '.idl')
 
 
 # Create environment object for build
diff --git a/components/nsTray.cpp b/components/nsTray.cpp
index 5d515da..1a888ad 100644
--- a/components/nsTray.cpp
+++ b/components/nsTray.cpp
@@ -52,7 +52,7 @@ PRUint32 PRUstrlen(const PRUnichar *text) {
 }
 
 void nsTray::activate(GtkStatusIcon* status_icon, gpointer user_data) {
-    PRBool ret = TRUE;
+    bool ret = TRUE;
     nsTray *data = static_cast<nsTray*>(user_data);
 
     data->tray_callback->Call(&ret);
@@ -75,7 +75,7 @@ gboolean nsTray::scroll(GtkStatusIcon  *status_icon, GdkEventScroll *event, gpoi
 
     if(!event || !user_data) return false;
 
-    PRBool ret = TRUE;
+    bool ret = TRUE;
     nsTray *data = static_cast<nsTray*>(user_data);
 
     PRUint32 dir=0;
@@ -129,7 +129,7 @@ void nsTray::popup(GtkStatusIcon *status_icon, guint button, guint activate_time
 
 void nsTray::item_event(GtkWidget *widget, gpointer user_data) {
     DEBUG_CALL("item_event")
-    PRBool ret = TRUE;
+    bool ret = TRUE;
     nsTray *data = static_cast<nsTray*>(user_data);
 
     if(data->item_callback_list[(PRUint64)widget]) {
@@ -785,7 +785,7 @@ bool nsTray::SetIcon(const char *filename, GdkPixbuf *& icon)
 
 
   /* boolean setDefaultIcon (in string filename); */
-NS_IMETHODIMP nsTray::SetDefaultIcon(const char *filename, PRBool *_retval)
+NS_IMETHODIMP nsTray::SetDefaultIcon(const char *filename, bool *_retval)
 {
     DEBUG_CALL("setDefaultIcon")
 
@@ -796,7 +796,7 @@ NS_IMETHODIMP nsTray::SetDefaultIcon(const char *filename, PRBool *_retval)
 }
 
   /* boolean setSpecialIcon (in string filename); */
-NS_IMETHODIMP nsTray::SetSpecialIcon(const char *filename, PRBool *_retval) 
+NS_IMETHODIMP nsTray::SetSpecialIcon(const char *filename, bool *_retval) 
 {
     DEBUG_CALL("setSpecialIcon")
 
@@ -997,7 +997,7 @@ NS_IMETHODIMP nsTray::Init_tooltip_image() {
 */
 
 /* void setCloseBlocking (in boolean block); */
-NS_IMETHODIMP nsTray::SetCloseBlocking(PRBool val)  
+NS_IMETHODIMP nsTray::SetCloseBlocking(bool val)  
 {
     DEBUG_CALL("setCloseBlocking")
     block_close=val;
@@ -1005,7 +1005,7 @@ NS_IMETHODIMP nsTray::SetCloseBlocking(PRBool val)
 }
 
 /* void getCloseBlocking (out boolean block); */
-NS_IMETHODIMP nsTray::GetCloseBlocking(PRBool *val) 
+NS_IMETHODIMP nsTray::GetCloseBlocking(bool *val) 
 {
     DEBUG_CALL("getCloseBlocking")
 
@@ -1014,7 +1014,7 @@ NS_IMETHODIMP nsTray::GetCloseBlocking(PRBool *val)
 }
 
 /* void setMinimizeBlocking (in boolean val); */
-NS_IMETHODIMP nsTray::SetMinimizeBlocking(PRBool val)
+NS_IMETHODIMP nsTray::SetMinimizeBlocking(bool val)
 {
     DEBUG_CALL("SetMinimizeBlocking")
     block_minimize=val;
@@ -1022,7 +1022,7 @@ NS_IMETHODIMP nsTray::SetMinimizeBlocking(PRBool val)
 }
 
 /* void getMinimizeBlocking (out boolean val); */
-NS_IMETHODIMP nsTray::GetMinimizeBlocking(PRBool *val)
+NS_IMETHODIMP nsTray::GetMinimizeBlocking(bool *val)
 {
     DEBUG_CALL("GetMinimizeBlocking")
     if(val)*val=this->block_minimize;
@@ -1176,7 +1176,7 @@ GdkFilterReturn key_filter_func(GdkXEvent *xevent, GdkEvent *event, gpointer dat
 
    XKeyEvent *kev=(XKeyEvent *)e;
    nsTray *tray = (nsTray *)data;   
-   PRBool ret = TRUE;
+   bool ret = TRUE;
 
    DEBUGSTR("KEYPRESS EVENT: KEY="<<kev->keycode) 
 
@@ -1257,7 +1257,7 @@ void nsTray::minimizeEvent()
 {
    DEBUG_CALL("minimizeEvent") 
 
-   PRBool ret = TRUE;    
+   bool ret = TRUE;    
    if(block_minimize) 
     { 
        FDEBUGSTR("MINIMIZING TO TRAY")
@@ -1272,7 +1272,7 @@ bool nsTray::closeEvent()
 {    
    DEBUG_CALL("closeEvent")       
    
-   PRBool ret = TRUE;
+   bool ret = TRUE;
    if(block_close) 
     { 
        FDEBUGSTR("CLOSE BLOCKING")
@@ -1326,7 +1326,7 @@ NS_IMETHODIMP nsTray::SetWindowHandler(nsIBaseWindow *aBaseWindow)
 
 
 /* boolean addHandledKeyCode (in PRUint64 key_code); */
-NS_IMETHODIMP nsTray::AddHandledKeyCode(PRUint64 key_code, PRBool *_retval) {
+NS_IMETHODIMP nsTray::AddHandledKeyCode(PRUint64 key_code, bool *_retval) {
   #ifdef _KEYSYMS_
 
       CAPTURE_ERRORS()
@@ -1354,7 +1354,7 @@ NS_IMETHODIMP nsTray::AddHandledKeyCode(PRUint64 key_code, PRBool *_retval) {
 }
 
 /* boolean addHandledKey (in string key_string); */
-NS_IMETHODIMP nsTray::AddHandledKey(const char *key_string, PRBool *_retval) {
+NS_IMETHODIMP nsTray::AddHandledKey(const char *key_string, bool *_retval) {
     DEBUG_CALL("addHandledKey")
       
 #ifdef _KEYSYMS_
@@ -1373,7 +1373,7 @@ NS_IMETHODIMP nsTray::AddHandledKey(const char *key_string, PRBool *_retval) {
      
       if(!key) RELEASE_CAPTURE_RETURN("NOKEY_CODE",NS_OK)
       
-      PRBool ret=true; 
+      bool ret=true; 
 
       RELEASE_CAPTURE("Couldn't get grab on key "<< key_string)
 
@@ -1412,7 +1412,7 @@ NS_IMETHODIMP nsTray::GetKeycodeString(PRUint64 key_code, char **_retval)
 
 
 /*     boolean getFocusState(in nsIBaseWindow aBaseWindow); */
-NS_IMETHODIMP nsTray::GetFocusState(nsIBaseWindow *aBaseWindow, PRBool *_retval) 
+NS_IMETHODIMP nsTray::GetFocusState(nsIBaseWindow *aBaseWindow, bool *_retval) 
 {
     DEBUG_CALL("getFocusState")
 
diff --git a/generate_install_rdf.sh b/generate_install_rdf.sh
index 73014b3..736ead2 100755
--- a/generate_install_rdf.sh
+++ b/generate_install_rdf.sh
@@ -15,8 +15,8 @@ APP_SEPARATOR=';'
 #SUPPORTED APPS:
 # "name;id;min.ver;max.ver"
 SUPPORTED_APPS=( \
-"Mozilla Firefox;{ec8030f7-c20a-464f-9b0e-13a3a9e97384};3.0;9.*" \
-"Mozilla Thunderbird;{3550f703-e582-4d05-9a08-453d09bdfdc6};3.0;9.*" \
+"Mozilla Firefox;{ec8030f7-c20a-464f-9b0e-13a3a9e97384};3.0;10.*" \
+"Mozilla Thunderbird;{3550f703-e582-4d05-9a08-453d09bdfdc6};3.0;10.*" \
 "Songbird;songbird at songbirdnest.com;0.8;1.8.0" \
 "SeaMonkey;{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a};2.0a1;2.0.*   " \
 "Sunbird;{718e30fb-e89b-41dd-9da7-e25a45638b28};1.0b1;1.0pre" \

-- 
system tray extension for thunderbird/firefox alike apps

More information about the Pkg-mozext-commits mailing list