Changeset 7845 for branches/gajim_0.11/src

Timestamp:

01/16/07 19:21:46 (23 months ago)

Author:

asterix

Message:

latest merge from trunk before string freeze

Location:

branches/gajim_0.11/src

Files:

• common/config.py (modified) (1 diff)
• htmltextview.py (modified) (8 diffs)

branches/gajim_0.11/src/common/config.py

@@ -98 +98 @@
                         'remove */_ . So *abc* will be bold but with * * not removed.')],
                 'rst_formatting_outgoing_messages': [ opt_bool, False,
-                        _('Uses ReStructured text markup for HTML, plus ascii formatting if selected. (If you want to use this, install docutils)')],
+                        _('Uses ReStructured text markup to send HTML, plus ascii formatting if selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (If you want to use this, install docutils)')],
                 'sounds_on': [ opt_bool, True ],
                 # 'aplay', 'play', 'esdplay', 'artsplay' detected first time only

branches/gajim_0.11/src/htmltextview.py

@@ -51 +51 @@
 allwhitespace_rx = re.compile("^\\s*$")
 
-## pixels = points * display_resolution
+# pixels = points * display_resolution
 display_resolution = 0.3514598*(gtk.gdk.screen_height() /
                                         float(gtk.gdk.screen_height_mm()))
@@ -267 +267 @@
         else:
                 
-                ## Workaround http://bugzilla.gnome.org/show_bug.cgi?id=317455
+                # Workaround http://bugzilla.gnome.org/show_bug.cgi?id=317455
                 def _get_current_style_attr(self, propname, comb_oper=None):
                         tags = [tag for tag in self.styles if tag is not None]
@@ -312 +312 @@
                                 callback(frac*display_resolution*font_size, *args)
                         else:
-                                ## CSS says "Percentage values: refer to width of the closest
-                                ##           block-level ancestor"
-                                ## This is difficult/impossible to implement, so we use
-                                ## textview width instead; a reasonable approximation..
+                                # CSS says "Percentage values: refer to width of the closest
+                                #           block-level ancestor"
+                                # This is difficult/impossible to implement, so we use
+                                # textview width instead; a reasonable approximation..
                                 alloc = self.textview.get_allocation()
                                 self.__parse_length_frac_size_allocate(self.textview, alloc,
@@ -332 +332 @@
 
                 elif value.endswith('ex'): # x-height, ~ the height of the letter 'x'
-                        ## FIXME: figure out how to calculate this correctly
-                        ##        for now 'em' size is used as approximation
+                        # FIXME: figure out how to calculate this correctly
+                        #        for now 'em' size is used as approximation
                         attrs = self._get_current_attributes()
                         font_size = attrs.font.get_size() / pango.SCALE
@@ -406 +406 @@
 
         def _parse_style_font_weight(self, tag, value):
-                ## TODO: missing 'bolder' and 'lighter'
+                # TODO: missing 'bolder' and 'lighter'
                 try:
                         weight = {
@@ -470 +470 @@
          
         
-        ## build a dictionary mapping styles to methods, for greater speed
+        # build a dictionary mapping styles to methods, for greater speed
         __style_methods = dict()
         for style in ["background-color", "color", "font-family", "font-size",
@@ -482 +482 @@
                         __style_methods[style] = method
         del style
-        ## --
+        # --
 
         def _get_style_tags(self):
@@ -682 +682 @@
                 elif name == 'img':
                         try:
-                                ## Max image size = 10 MB (to try to prevent DoS)
-                                mem = urllib2.urlopen(attrs['src']).read(10*1024*1024)
-                                ## Caveat: GdkPixbuf is known not to be safe to load
-                                ## images from network... this program is now potentially
-                                ## hackable ;)
+                                # Max image size = 2 MB (to try to prevent DoS)
+                                mem = urllib2.urlopen(attrs['src']).read(2*1024*1024)
+                                # Caveat: GdkPixbuf is known not to be safe to load
+                                # images from network... this program is now potentially
+                                # hackable ;)
                                 loader = gtk.gdk.PixbufLoader()
                                 loader.write(mem); loader.close()