[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/12/09 20:39:38

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverControlers.ml 

Log message:
        patch #6337

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1333&r2=1.1334
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.109&r2=1.110

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1333
retrieving revision 1.1334
diff -u -b -r1.1333 -r1.1334
--- distrib/ChangeLog   3 Nov 2007 22:04:51 -0000       1.1333
+++ distrib/ChangeLog   9 Dec 2007 20:39:37 -0000       1.1334
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2007/12/09
+6337: Fix inequality test for option html_mods_theme (pango)
+
 2007/11/03
 6255: Fix compile warnings for GTK2 GUI and DC++ (pango)
 -------------------------------------------------------------------------------

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- src/daemon/driver/driverControlers.ml       1 Jul 2007 13:01:40 -0000       
1.109
+++ src/daemon/driver/driverControlers.ml       9 Dec 2007 20:39:38 -0000       
1.110
@@ -860,7 +860,7 @@
       let this_page = "dheader.html" in
       Buffer.add_string buf
         (
-                if !!html_mods_theme != "" && theme_page_exists this_page then
+                if !!html_mods_theme <> "" && theme_page_exists this_page then
                         read_theme_page this_page else
                         if !!html_mods then 
!!CommonMessages.download_html_header_mods0
                         else !!CommonMessages.download_html_header_old);
@@ -871,7 +871,7 @@
    
         let this_page = "header.html" in
     Buffer.add_string buf (
-                if !!html_mods_theme != "" && theme_page_exists this_page then
+                if !!html_mods_theme <> "" && theme_page_exists this_page then
                         read_theme_page this_page else
                         if !!html_mods then !!CommonMessages.html_header_mods0
                         else !!CommonMessages.html_header_old);
@@ -1037,7 +1037,7 @@
             html_open_page buf t r true;
             let this_page = "commands.html" in
             Buffer.add_string buf (
-              if !!html_mods_theme != "" && theme_page_exists this_page then
+              if !!html_mods_theme <> "" && theme_page_exists this_page then
                 read_theme_page this_page else
               if !!html_mods then !!CommonMessages.web_common_header_mods0
               else !!CommonMessages.web_common_header_old)
@@ -1045,14 +1045,14 @@
             html_open_page buf t r true;
             let this_page = "multidllink.html" in
             Buffer.add_string buf (
-              if !!html_mods_theme != "" && theme_page_exists this_page then
+              if !!html_mods_theme <> "" && theme_page_exists this_page then
                 read_theme_page this_page else
               if !!html_mods then !!CommonMessages.multidllink_mods0
               else !!CommonMessages.multidllink_old)
         | "" | "index.html" ->
                 html_open_page buf t r false;
                 let this_page = "frames.html" in
-                if !!html_mods_theme != "" && theme_page_exists this_page then
+                if !!html_mods_theme <> "" && theme_page_exists this_page then
                   Buffer.add_string buf (read_theme_page this_page) else
                 if !!html_mods then
                   (if !!html_frame_border then
@@ -1467,7 +1467,7 @@
             http_add_text_header r CSS;
             let this_page = "h.css" in
             Buffer.add_string buf (
-              if !!html_mods_theme != "" && theme_page_exists this_page then
+              if !!html_mods_theme <> "" && theme_page_exists this_page then
                 read_theme_page this_page else
               if !!html_mods then !CommonMessages.html_css_mods
               else !!CommonMessages.html_css_old)
@@ -1477,7 +1477,7 @@
             http_add_text_header r CSS;
             let this_page = "dh.css" in
             Buffer.add_string buf (
-              if !!html_mods_theme != "" && theme_page_exists this_page then
+              if !!html_mods_theme <> "" && theme_page_exists this_page then
                 read_theme_page this_page else
               if !!html_mods then !CommonMessages.download_html_css_mods
               else !!CommonMessages.download_html_css_old)
@@ -1487,7 +1487,7 @@
             http_add_text_header r JAVASCRIPT;
             let this_page = "i.js" in
             Buffer.add_string buf (
-              if !!html_mods_theme != "" && theme_page_exists this_page then
+              if !!html_mods_theme <> "" && theme_page_exists this_page then
                 read_theme_page this_page else
               if !!html_mods then !!CommonMessages.html_js_mods0
               else !!CommonMessages.html_js_old)
@@ -1497,7 +1497,7 @@
             http_add_text_header r JAVASCRIPT;
             let this_page = "di.js" in
             Buffer.add_string buf (
-              if !!html_mods_theme != "" && theme_page_exists this_page then
+              if !!html_mods_theme <> "" && theme_page_exists this_page then
                 read_theme_page this_page else
               if !!html_mods then !!CommonMessages.download_html_js_mods0
               else !!CommonMessages.download_html_js_old)