Commits August 2007

commits@gajim.org

7 participants
239 discussions

[commit-gajim] r8665 - in branches/gajim_0.11.1/src: . common
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:43:27 +0200 (Fri, 31 Aug 2007) New Revision: 8665 Modified: branches/gajim_0.11.1/src/common/rst_xhtml_generator.py branches/gajim_0.11.1/src/htmltextview.py Log: [sgala and I] better support of sizes in XHTML, simplify rst generator Modified: branches/gajim_0.11.1/src/common/rst_xhtml_generator.py =================================================================== --- branches/gajim_0.11.1/src/common/rst_xhtml_generator.py 2007-08-31 08:39:38 UTC (rev 8664) +++ branches/gajim_0.11.1/src/common/rst_xhtml_generator.py 2007-08-31 08:43:27 UTC (rev 8665) @@ -21,40 +21,71 @@ from docutils import nodes,utils from docutils.parsers.rst.roles import set_classes except: + print "Requires docutils 0.4 for set_classes to be available" def create_xhtml(text): return None else: - def jep_reference_role(role, rawtext, text, lineno, inliner, - options={}, content=[]): - '''Role to make handy references to Jabber Enhancement Proposals (JEP). + def pos_int_validator(text): + """Validates that text can be evaluated as a positive integer.""" + result = int(text) + if result < 0: + raise ValueError("Error: value '%(text)s' " + "must be a positive integer") + return result - Use as :JEP:`71` (or jep, or jep-reference). - Modeled after the sample in docutils documentation. + def generate_uri_role( role_name, aliases, + anchor_text, base_url, + interpret_url, validator): + '''Creates and register a uri based "interpreted role". + + Those are similar to the RFC, and PEP ones, and take + role_name: + name that will be registered + aliases: + list of alternate names + anchor_text: + text that will be used, together with the role + base_url: + base url for the link + interpret_url: + this, modulo the validated text, will be added to it + validator: + should return the validated text, or raise ValueError ''' + def uri_reference_role(role, rawtext, text, lineno, inliner, + options={}, content=[]): + try: + valid_text = validator(text) + except ValueError, e: + msg = inliner.reporter.error( e.message % dict(text=text), line=lineno) + prb = inliner.problematic(rawtext, rawtext, msg) + return [prb], [msg] + ref = base_url + interpret_url % valid_text + set_classes(options) + node = nodes.reference(rawtext, anchor_text + utils.unescape(text), refuri=ref, + **options) + return [node], [] - jep_base_url = 'http://www.jabber.org/jeps/' - jep_url = 'jep-%04d.html' - try: - jepnum = int(text) - if jepnum <= 0: - raise ValueError - except ValueError: - msg = inliner.reporter.error( - 'JEP number must be a number greater than or equal to 1; ' - '"%s" is invalid.' % text, line=lineno) - prb = inliner.problematic(rawtext, rawtext, msg) - return [prb], [msg] - ref = jep_base_url + jep_url % jepnum - set_classes(options) - node = nodes.reference(rawtext, 'JEP ' + utils.unescape(text), refuri=ref, - **options) - return [node], [] + uri_reference_role.__doc__ = """Role to make handy references to URIs. - roles.register_canonical_role('jep-reference', jep_reference_role) - from docutils.parsers.rst.languages.en import roles - roles['jep-reference'] = 'jep-reference' - roles['jep'] = 'jep-reference' + Use as :%(role_name)s:`71` (or any of %(aliases)s). + It will use %(base_url)s+%(interpret_url)s + validator should throw a ValueError, containing optionally + a %%(text)s format, if the interpreted text is not valid. + """ % locals() + roles.register_canonical_role(role_name, uri_reference_role) + from docutils.parsers.rst.languages import en + en.roles[role_name] = role_name + for alias in aliases: + en.roles[alias] = role_name + generate_uri_role('xep-reference', ('jep', 'xep'), + 'XEP #', 'http://www.xmpp.org/extensions/', 'xep-%04d.html', + pos_int_validator) + generate_uri_role('gajim-ticket-reference', ('ticket','gtrack'), + 'Gajim Ticket #', 'http://trac.gajim.org/ticket/', '%d', + pos_int_validator) + class HTMLGenerator: '''Really simple HTMLGenerator starting from publish_parts. @@ -108,7 +139,7 @@ if __name__ == '__main__': - print Generator.create_xhtml(''' + print "test 1\n", Generator.create_xhtml(""" test:: >>> print 1 @@ -118,9 +149,10 @@ this `` should trigger`` should trigger the   problem. -''') - print Generator.create_xhtml(''' +""") + print "test 2\n", Generator.create_xhtml(""" *test1 test2_ -''') +""") + print "test 3\n", Generator.create_xhtml(""":ticket:`316` implements :xep:`71`""") Modified: branches/gajim_0.11.1/src/htmltextview.py =================================================================== --- branches/gajim_0.11.1/src/htmltextview.py 2007-08-31 08:39:38 UTC (rev 8664) +++ branches/gajim_0.11.1/src/htmltextview.py 2007-08-31 08:43:27 UTC (rev 8665) @@ -40,10 +40,10 @@ import urllib2 import operator +if __name__ == '__main__': + from common import i18n from common import gajim -#from common import i18n - import tooltips @@ -56,13 +56,13 @@ display_resolution = 0.3514598*(gtk.gdk.screen_height() / float(gtk.gdk.screen_height_mm())) -#embryo of CSS classes +# embryo of CSS classes classes = { #'system-message':';display: none', 'problematic':';color: red', } -#styles for elemens +# styles for elements element_styles = { 'u' : ';text-decoration: underline', 'em' : ';font-style: oblique', @@ -83,9 +83,6 @@ element_styles['i'] = element_styles['em'] element_styles['b'] = element_styles['strong'] -class_styles = { -} - """ ========== JEP-0071 @@ -182,40 +179,43 @@ def build_patterns(view, config, interface): - #extra, rst does not mark _underline_ or /it/ up - #actually , or are not in the JEP-0071, but are seen in the wild + # extra, rst does not mark _underline_ or /it/ up + # actually , or are not in the JEP-0071, but are seen in the wild basic_pattern = r'(?<!\w|\<|/|:)' r'/[^\s/]' r'([^/]*[^\s/])?' r'/(?!\w|/|:)|'\ r'(?<!\w)' r'_[^\s_]' r'([^_]*[^\s_])?' r'_(?!\w)' view.basic_pattern_re = re.compile(basic_pattern) - #TODO: emoticons + # emoticons emoticons_pattern = '' - if config.get('emoticons_theme'): - # When an emoticon is bordered by an alpha-numeric character it is NOT - # expanded. e.g., foo:) NO, foo :) YES, (brb) NO, (:)) YES, etc. - # We still allow multiple emoticons side-by-side like :P:P:P - # sort keys by length so :qwe emot is checked before :q - keys = interface.emoticons.keys() - keys.sort(interface.on_emoticon_sort) - emoticons_pattern_prematch = '' - emoticons_pattern_postmatch = '' - emoticon_length = 0 - for emoticon in keys: # travel thru emoticons list - emoticon_escaped = re.escape(emoticon) # espace regexp metachars - emoticons_pattern += emoticon_escaped + '|'# | means or in regexp - if (emoticon_length != len(emoticon)): - # Build up expressions to match emoticons next to other emoticons - emoticons_pattern_prematch = emoticons_pattern_prematch[:-1] + ')|(?<=' - emoticons_pattern_postmatch = emoticons_pattern_postmatch[:-1] + ')|(?=' - emoticon_length = len(emoticon) - emoticons_pattern_prematch += emoticon_escaped + '|' - emoticons_pattern_postmatch += emoticon_escaped + '|' - # We match from our list of emoticons, but they must either have - # whitespace, or another emoticon next to it to match successfully - # [\w.] alphanumeric and dot (for not matching 8) in (2.8)) - emoticons_pattern = '|' + \ + try: + if config.get('emoticons_theme'): + # When an emoticon is bordered by an alpha-numeric character it is NOT + # expanded. e.g., foo:) NO, foo :) YES, (brb) NO, (:)) YES, etc. + # We still allow multiple emoticons side-by-side like :P:P:P + # sort keys by length so :qwe emot is checked before :q + keys = interface.emoticons.keys() + keys.sort(interface.on_emoticon_sort) + emoticons_pattern_prematch = '' + emoticons_pattern_postmatch = '' + emoticon_length = 0 + for emoticon in keys: # travel thru emoticons list + emoticon_escaped = re.escape(emoticon) # espace regexp metachars + emoticons_pattern += emoticon_escaped + '|'# | means or in regexp + if (emoticon_length != len(emoticon)): + # Build up expressions to match emoticons next to other emoticons + emoticons_pattern_prematch = emoticons_pattern_prematch[:-1] + ')|(?<=' + emoticons_pattern_postmatch = emoticons_pattern_postmatch[:-1] + ')|(?=' + emoticon_length = len(emoticon) + emoticons_pattern_prematch += emoticon_escaped + '|' + emoticons_pattern_postmatch += emoticon_escaped + '|' + # We match from our list of emoticons, but they must either have + # whitespace, or another emoticon next to it to match successfully + # [\w.] alphanumeric and dot (for not matching 8) in (2.8)) + emoticons_pattern = '|' + \ '(?:(?<![\w.]' + emoticons_pattern_prematch[:-1] + '))' + \ '(?:' + emoticons_pattern[:-1] + ')' + \ '(?:(?![\w.]' + emoticons_pattern_postmatch[:-1] + '))' + except: + pass # because emoticons match later (in the string) they need to be after # basic matches that may occur earlier @@ -230,10 +230,17 @@ return gtk.gdk.Color(r, g, b) else: return gtk.gdk.color_parse(color) + +def style_iter(style): + return (map(lambda x:x.strip(),item.split(':', 1)) for item in style.split(';') if len(item.strip())) class HtmlHandler(xml.sax.handler.ContentHandler): - + """A handler to display html to a gtk textview. + + It keeps a stack of "style spans" (start/end element pairs) + and a stack of list counters, for nested lists. + """ def __init__(self, textview, startiter): xml.sax.handler.ContentHandler.__init__(self) self.textbuf = textview.get_buffer() @@ -303,16 +310,20 @@ frac, callback, args): callback(allocation.width*frac, *args) - def _parse_length(self, value, font_relative, callback, *args): + def _parse_length(self, value, font_relative, block_relative, minl, maxl, callback, *args): '''Parse/calc length, converting to pixels, calls callback(length, *args) when the length is first computed or changes''' if value.endswith('%'): - frac = float(value[:-1])/100 + val = float(value[:-1]) + sign = cmp(val,0) + # limits: 1% to 500% + val = sign*max(1,min(abs(val),500)) + frac = val/100 if font_relative: attrs = self._get_current_attributes() font_size = attrs.font.get_size() / pango.SCALE callback(frac*display_resolution*font_size, *args) - else: + elif block_relative: # CSS says "Percentage values: refer to width of the closest # block-level ancestor" # This is difficult/impossible to implement, so we use @@ -323,28 +334,43 @@ self.textview.connect("size-allocate", self.__parse_length_frac_size_allocate, frac, callback, args) + else: + callback(frac, *args) + return - elif value.endswith('pt'): # points - callback(float(value[:-2])*display_resolution, *args) + val = float(value[:-2]) + sign = cmp(val,0) + # validate length + val = sign*max(minl,min(abs(val*display_resolution),maxl)) + if value.endswith('pt'): # points + callback(val*display_resolution, *args) - elif value.endswith('em'): # ems, the height of the element's font + elif value.endswith('em'): # ems, the width of the element's font attrs = self._get_current_attributes() font_size = attrs.font.get_size() / pango.SCALE - callback(float(value[:-2])*display_resolution*font_size, *args) + callback(val*display_resolution*font_size, *args) 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 attrs = self._get_current_attributes() font_size = attrs.font.get_size() / pango.SCALE - callback(float(value[:-2])*display_resolution*font_size, *args) + callback(val*display_resolution*font_size, *args) elif value.endswith('px'): # pixels - callback(int(value[:-2]), *args) + callback(val, *args) else: - warnings.warn("Unable to parse length value '%s'" % value) - + try: + # TODO: isn't "no units" interpreted as pixels? + val = int(value) + sign = cmp(val,0) + # validate length + val = sign*max(minl,min(abs(val),maxl)) + callback(val, *args) + except: + warnings.warn('Unable to parse length value "%s"' % value) + def __parse_font_size_cb(length, tag): tag.set_property("size-points", length/display_resolution) __parse_font_size_cb = staticmethod(__parse_font_size_cb) @@ -352,7 +378,7 @@ def _parse_style_display(self, tag, value): if value == 'none': tag.set_property('invisible','true') - #Fixme: display: block, inline + # FIXME: display: block, inline def _parse_style_font_size(self, tag, value): try: @@ -377,7 +403,8 @@ if value == 'larger': tag.set_property("scale", pango.SCALE_LARGE) return - self._parse_length(value, True, self.__parse_font_size_cb, tag) + # font relative (5 ~ 4pt, 110 ~ 72pt) + self._parse_length(value, True, False, 5, 110, self.__parse_font_size_cb, tag) def _parse_style_font_style(self, tag, value): try: @@ -399,11 +426,13 @@ #__frac_length_tag_cb = staticmethod(__frac_length_tag_cb) def _parse_style_margin_left(self, tag, value): - self._parse_length(value, False, self.__frac_length_tag_cb, + # block relative + self._parse_length(value, False, True, 1, 1000, self.__frac_length_tag_cb, tag, "left-margin") def _parse_style_margin_right(self, tag, value): - self._parse_length(value, False, self.__frac_length_tag_cb, + # block relative + self._parse_length(value, False, True, 1, 1000, self.__frac_length_tag_cb, tag, "right-margin") def _parse_style_font_weight(self, tag, value): @@ -469,13 +498,32 @@ tag.set_property("wrap_mode", gtk.WRAP_WORD) elif value == 'nowrap': tag.set_property("wrap_mode", gtk.WRAP_NONE) + + def __length_tag_cb(self, value, tag, propname): + try: + tag.set_property(propname, value) + except: + gajim.log.warn( "Error with prop: " + propname + " for tag: " + str(tag)) + + + def _parse_style_width(self, tag, value): + if value == 'auto': + return + self._parse_length(value, False, False, 1, 1000, self.__length_tag_cb, + tag, "width") + def _parse_style_height(self, tag, value): + if value == 'auto': + return + self._parse_length(value, False, False, 1, 1000, self.__length_tag_cb, + tag, "height") # build a dictionary mapping styles to methods, for greater speed __style_methods = dict() - for style in ["background-color", "color", "font-family", "font-size", - "font-style", "font-weight", "margin-left", "margin-right", - "text-align", "text-decoration", "white-space", 'display' ]: + for style in ['background-color', 'color', 'font-family', 'font-size', + 'font-style', 'font-weight', 'margin-left', 'margin-right', + 'text-align', 'text-decoration', 'white-space', 'display', + 'width', 'height' ]: try: method = locals()["_parse_style_%s" % style.replace('-', '_')] except KeyError: @@ -489,6 +537,8 @@ return [tag for tag in self.styles if tag is not None] def _create_url(self, href, title, type_, id_): + '''Process a url tag. + ''' tag = self.textbuf.create_tag(id_) if href and href[0] != '#': tag.href = href @@ -501,6 +551,125 @@ tag.title = title return tag + def _process_img(self, attrs): + '''Process a img tag. + ''' + try: + # Wait maximum 1s for connection + socket.setdefaulttimeout(1) + try: + f = urllib2.urlopen(attrs['src']) + except Exception, ex: + gajim.log.debug(str('Error loading image %s ' % attrs['src'] + ex)) + pixbuf = None + alt = attrs.get('alt', 'Broken image') + else: + # Wait 0.1s between each byte + try: + f.fp._sock.fp._sock.settimeout(0.5) + except: + pass + # Max image size = 2 MB (to try to prevent DoS) + mem = '' + deadline = time.time() + 3 + while True: + if time.time() > deadline: + gajim.log.debug(str('Timeout loading image %s ' % \ + attrs['src'] + ex)) + mem = '' + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Timeout loading image') + break + try: + temp = f.read(100) + except socket.timeout, ex: + gajim.log.debug('Timeout loading image %s ' % attrs['src'] + \ + str(ex)) + mem = '' + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Timeout loading image') + break + if temp: + mem += temp + else: + break + if len(mem) > 2*1024*1024: + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Image is too big') + break + pixbuf = None + if mem: + # Caveat: GdkPixbuf is known not to be safe to load + # images from network... this program is now potentially + # hackable ;) + loader = gtk.gdk.PixbufLoader() + dims = [0,0] + def height_cb(length): + dims[1] = length + def width_cb(length): + dims[0] = length + # process width and height attributes + w = attrs.get('width') + h = attrs.get('height') + # override with width and height styles + for attr, val in style_iter(attrs.get('style', '')): + if attr == 'width': + w = val + elif attr == 'height': + h = val + if w: + self._parse_length(w, False, False, 1, 1000, width_cb) + if h: + self._parse_length(h, False, False, 1, 1000, height_cb) + def set_size(pixbuf, w, h, dims): + '''FIXME: floats should be relative to the whole + textview, and resize with it. This needs new + pifbufs for every resize, gtk.gdk.Pixbuf.scale_simple + or similar. + ''' + if type(dims[0]) == float: + dims[0] = int(dims[0]*w) + elif not dims[0]: + dims[0] = w + if type(dims[1]) == float: + dims[1] = int(dims[1]*h) + if not dims[1]: + dims[1] = h + loader.set_size(*dims) + if w or h: + loader.connect('size-prepared', set_size, dims) + loader.write(mem) + loader.close() + pixbuf = loader.get_pixbuf() + alt = attrs.get('alt', '') + if pixbuf is not None: + tags = self._get_style_tags() + if tags: + tmpmark = self.textbuf.create_mark(None, self.iter, True) + self.textbuf.insert_pixbuf(self.iter, pixbuf) + self.starting = False + if tags: + start = self.textbuf.get_iter_at_mark(tmpmark) + for tag in tags: + self.textbuf.apply_tag(tag, start, self.iter) + self.textbuf.delete_mark(tmpmark) + else: + self._insert_text('[IMG: %s]' % alt) + except Exception, ex: + gajim.log.error('Error loading image ' + str(ex)) + pixbuf = None + alt = attrs.get('alt', 'Broken image') + try: + loader.close() + except: + pass + return pixbuf def _begin_span(self, style, tag=None, id_=None): if style is None: @@ -511,9 +680,9 @@ tag = self.textbuf.create_tag(id_) else: tag = self.textbuf.create_tag() # we create anonymous tag - for attr, val in [item.split(':', 1) for item in style.split(';') if len(item.strip())]: - attr = attr.strip().lower() - val = val.strip() + for attr, val in style_iter(style): + attr = attr.lower() + val = val try: method = self.__style_methods[attr] except KeyError: @@ -603,6 +772,7 @@ self.text += content return if allwhitespace_rx.match(content) is not None and self._starts_line(): + self.text += ' ' return self.text += content self.starting = False @@ -611,9 +781,8 @@ def startElement(self, name, attrs): self._flush_text() klass = [i for i in attrs.get('class',' ').split(' ') if i] - style = attrs.get('style','') + style = '' #Add styles defined for classes - #TODO: priority between class and style elements? for k in klass: if k in classes: style += classes[k] @@ -641,9 +810,13 @@ tag.is_anchor = True elif name in LIST_ELEMS: style += ';margin-left: 2em' + elif name == 'img': + tag = self._process_img(attrs) if name in element_styles: style += element_styles[name] - + # so that explicit styles override implicit ones, + # we add the attribute last + style += ";"+attrs.get('style','') if style == '': style = None self._begin_span(style, tag, id_) @@ -681,84 +854,8 @@ elif name == 'dt': if not self.starting: self._jump_line() - elif name == 'img': - # Wait maximum 1s for connection - socket.setdefaulttimeout(1) - try: - f = urllib2.urlopen(attrs['src']) - except Exception, ex: - gajim.log.debug(str('Error loading image %s ' % attrs['src'] + ex)) - pixbuf = None - alt = attrs.get('alt', 'Broken image') - else: - # Wait 10ms between each byte - try: - f.fp._sock.fp._sock.settimeout(0.1) - except: - pass - # Max image size = 2 MB (to try to prevent DoS) in Max 3s - mem = '' - deadline = time.time() + 3 - while True: - if time.time() > deadline: - gajim.log.debug(str('Timeout loading image %s ' % \ - attrs['src'] + ex)) - mem = '' - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Timeout loading image') - break - try: - temp = f.read(100) - except socket.timeout, ex: - gajim.log.debug('Timeout loading image %s ' % attrs['src'] + \ - str(ex)) - mem = '' - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Timeout loading image') - break - if temp: - mem += temp - else: - break - if len(mem) > 2*1024*1024: - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Image is too big') - break - - if mem: - # 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() - pixbuf = loader.get_pixbuf() - else: - pixbuf = None - if pixbuf is not None: - tags = self._get_style_tags() - if tags: - tmpmark = self.textbuf.create_mark(None, self.iter, True) - - self.textbuf.insert_pixbuf(self.iter, pixbuf) - - if tags: - start = self.textbuf.get_iter_at_mark(tmpmark) - for tag in tags: - self.textbuf.apply_tag(tag, start, self.iter) - self.textbuf.delete_mark(tmpmark) - else: - self._insert_text("[IMG: %s]" % alt) - elif name == 'body' or name == 'html': + elif name in ('a', 'img', 'body', 'html'): pass - elif name == 'a': - pass elif name in INLINE: pass else: @@ -807,10 +904,6 @@ # self.text = ' ' class HtmlTextView(gtk.TextView): - __gtype_name__ = 'HtmlTextView' - __gsignals__ = { - 'url-clicked': (gobject.SIGNAL_RUN_LAST, None, (str, str)), # href, type - } def __init__(self): gobject.GObject.__init__(self) @@ -886,18 +979,41 @@ parser.setContentHandler(HtmlHandler(self, eob)) parser.parse(StringIO(html)) + # too much space after :) #if not eob.starts_line(): # buffer.insert(eob, "\n") if gobject.pygtk_version < (2, 8): gobject.type_register(HtmlTextView) + change_cursor = None if __name__ == '__main__': + import os + from common import gajim + class log(object): + + def debug(self, text): + print "debug:", text + def warn(self, text): + print "warn;", text + def error(self,text): + print "error;", text + + gajim.log=log() + + if gajim.config.get('emoticons_theme'): + print "emoticons" + htmlview = HtmlTextView() + path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png') + # use this for hr + htmlview.focus_out_line_pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_file) + + tooltip = tooltips.BaseTooltip() def on_textview_motion_notify_event(widget, event): '''change the cursor to a hand when we are over a mail or an url''' @@ -967,9 +1083,9 @@ <body xmlns='http://www.w3.org/1999/xhtml'> Hey, are you licensed to <a href='http://www.jabber.org/'>Jabber</a>? <img src='http://www.jabber.org/images/psa-license.jpg' - alt='A License to Jabber' - height='261' - width='537'/> + alt='A License to Jabber' + width='50%' height='50%' + /> </body> """) htmlview.display_html("<hr />") @@ -994,8 +1110,9 @@ <li> One </li> <li> Two is nested: <ul style='background-color:rgb(200,200,100)'> <li> One </li> - <li> Two </li> - <li> Three </li> + <li style='font-size:50%'> Two </li> + <li style='font-size:200%'> Three </li> + <li style='font-size:9999pt'> Four </li> </ul></li> <li> Three </li></ol> </body>

1 0

[commit-gajim] r8664 - branches/gajim_0.11.1/src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:39:38 +0200 (Fri, 31 Aug 2007) New Revision: 8664 Modified: branches/gajim_0.11.1/src/groupchat_control.py Log: Fix a bug with changing status in groupchats. Always print "You are now %s" in groupchats, even if you change from "action menu". Modified: branches/gajim_0.11.1/src/groupchat_control.py =================================================================== --- branches/gajim_0.11.1/src/groupchat_control.py 2007-08-31 08:38:45 UTC (rev 8663) +++ branches/gajim_0.11.1/src/groupchat_control.py 2007-08-31 08:39:38 UTC (rev 8664) @@ -1331,7 +1331,6 @@ nick = instance.input_entry.get_text().decode('utf-8') nick = helpers.parse_resource(nick) gajim.connections[self.account].join_gc(nick, self.room_jid, None) - self.nick = nick instance = dialogs.InputDialog(title, prompt, proposed_nick, is_modal = False, ok_handler = on_ok)

1 0

[commit-gajim] r8663 - in branches/gajim_0.11.1: data/glade src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:38:45 +0200 (Fri, 31 Aug 2007) New Revision: 8663 Modified: branches/gajim_0.11.1/data/glade/service_registration_window.glade branches/gajim_0.11.1/src/config.py Log: introduce a FakeDataForm? class that draws a table from dict {entry: value} and use it for service registration Modified: branches/gajim_0.11.1/data/glade/service_registration_window.glade =================================================================== --- branches/gajim_0.11.1/data/glade/service_registration_window.glade 2007-08-31 08:28:42 UTC (rev 8662) +++ branches/gajim_0.11.1/data/glade/service_registration_window.glade 2007-08-31 08:38:45 UTC (rev 8663) @@ -2,6 +2,7 @@ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <glade-interface> + <widget class="GtkWindow" id="service_registration_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Register to</property> @@ -18,6 +19,7 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> <child> <widget class="GtkVBox" id="vbox12"> @@ -26,31 +28,6 @@ <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">4</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">4</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> <widget class="GtkTable" id="table"> <property name="visible">True</property> <property name="n_rows">1</property> @@ -232,4 +209,5 @@ </widget> </child> </widget> + </glade-interface> Modified: branches/gajim_0.11.1/src/config.py =================================================================== --- branches/gajim_0.11.1/src/config.py 2007-08-31 08:28:42 UTC (rev 8662) +++ branches/gajim_0.11.1/src/config.py 2007-08-31 08:38:45 UTC (rev 8663) @@ -2077,204 +2077,80 @@ self.on_checkbutton_toggled(widget, 'enable_zeroconf') -class DataFormWindow: - def __init__(self, account, config): - self.account = account - self.config = config - self.xml = gtkgui_helpers.get_glade('data_form_window.glade', 'data_form_window') - self.window = self.xml.get_widget('data_form_window') - self.window.set_transient_for(gajim.interface.roster.window) - self.config_vbox = self.xml.get_widget('config_vbox') - if config: - self.fill_vbox() - else: - self.config_vbox.set_no_show_all(True) - self.config_vbox.hide() - self.xml.signal_autoconnect(self) - self.window.show_all() +class FakeDataForm(gtk.Table, object): + '''Class for forms that are in XML format <entry1>value1</entry1> + infos in a table {entry1: value1, }''' + def __init__(self, infos): + gtk.Table.__init__(self) + self.infos = infos + self.entries = {} + self._draw_table() - def on_cancel_button_clicked(self, widget): - self.window.destroy() - - def on_ok_button_clicked(self, widget): - '''NOTE: child class should implement this''' - pass - - def on_data_form_window_destroy(self, widget): - '''NOTE: child class should implement this''' - pass - - def on_checkbutton_toggled(self, widget, index): - self.config[index]['values'][0] = widget.get_active() - - def on_checkbutton_toggled2(self, widget, index1, index2): - val = self.config[index1]['options'][index2]['values'][0] - if widget.get_active() and val not in self.config[index1]['values']: - self.config[index1]['values'].append(val) - elif not widget.get_active() and val in self.config[index1]['values']: - self.config[index1]['values'].remove(val) - - def on_combobox_changed(self, widget, index): - self.config[index]['values'][0] = self.config[index]['options'][ \ - widget.get_active()]['values'][0] - - def on_entry_changed(self, widget, index): - self.config[index]['values'][0] = widget.get_text().decode('utf-8') - - def on_textbuffer_changed(self, widget, index): - begin, end = widget.get_bounds() - self.config[index]['values'][0] = widget.get_text(begin, end) - - def fill_vbox(self): - '''see JEP0004''' - if self.config.has_key('title'): - self.window.set_title(self.config['title']) - if self.config.has_key('instructions'): - self.xml.get_widget('instructions_label').set_text( - self.config['instructions']) - i = 0 - while self.config.has_key(i): - if not self.config[i].has_key('type'): - i += 1 + def _draw_table(self): + '''Draw the table in the window''' + nbrow = 0 + if self.infos.has_key('instructions'): + nbrow = 1 + self.resize(rows = nbrow, columns = 2) + label = gtk.Label(self.infos['instructions']) + self.attach(label, 0, 2, 0, 1, 0, 0, 0, 0) + for name in self.infos.keys(): + if name in ('key', 'instructions', 'x', 'registered'): continue - ctype = self.config[i]['type'] - if ctype == 'hidden': - i += 1 + if not name: continue - hbox = gtk.HBox(spacing = 5) - label = gtk.Label('') - label.set_line_wrap(True) - label.set_alignment(0.0, 0.5) - label.set_property('width_request', 150) - hbox.pack_start(label, False) - if self.config[i].has_key('label'): - label.set_text(self.config[i]['label']) - if ctype == 'boolean': - desc = None - if self.config[i].has_key('desc'): - desc = self.config[i]['desc'] - widget = gtk.CheckButton(desc, False) - activ = False - if self.config[i].has_key('values'): - activ = self.config[i]['values'][0] - widget.set_active(activ) - widget.connect('toggled', self.on_checkbutton_toggled, i) - elif ctype == 'fixed': - widget = gtk.Label('\n'.join(self.config[i]['values'])) - widget.set_line_wrap(True) - widget.set_alignment(0.0, 0.5) - elif ctype == 'jid-multi': - #FIXME - widget = gtk.Label('') - elif ctype == 'jid-single': - #FIXME - widget = gtk.Label('') - elif ctype == 'list-multi': - j = 0 - widget = gtk.Table(1, 1) - while self.config[i]['options'].has_key(j): - widget.resize(j + 1, 1) - child = gtk.CheckButton(self.config[i]['options'][j]['label'], - False) - if self.config[i]['options'][j]['values'][0] in \ - self.config[i]['values']: - child.set_active(True) - child.connect('toggled', self.on_checkbutton_toggled2, i, j) - widget.attach(child, 0, 1, j, j+1) - j += 1 - elif ctype == 'list-single': - widget = gtk.combo_box_new_text() - widget.connect('changed', self.on_combobox_changed, i) - index = 0 - j = 0 - while self.config[i]['options'].has_key(j): - if self.config[i]['options'][j]['values'][0] == \ - self.config[i]['values'][0]: - index = j - widget.append_text(self.config[i]['options'][j]['label']) - j += 1 - widget.set_active(index) - elif ctype == 'text-multi': - widget = gtk.TextView() - widget.set_size_request(100, -1) - widget.get_buffer().connect('changed', self.on_textbuffer_changed, \ - i) - widget.get_buffer().set_text('\n'.join(self.config[i]['values'])) - elif ctype == 'text-private': - widget = gtk.Entry() - widget.connect('changed', self.on_entry_changed, i) - if not self.config[i].has_key('values'): - self.config[i]['values'] = [''] - widget.set_text(self.config[i]['values'][0]) - widget.set_visibility(False) - elif ctype == 'text-single': - widget = gtk.Entry() - widget.connect('changed', self.on_entry_changed, i) - if not self.config[i].has_key('values'): - self.config[i]['values'] = [''] - widget.set_text(self.config[i]['values'][0]) - i += 1 - hbox.pack_start(widget, False) - hbox.pack_start(gtk.Label('')) # So that widhet doesn't take all space - self.config_vbox.pack_start(hbox, False) - self.config_vbox.show_all() -class ServiceRegistrationWindow(DataFormWindow): + nbrow = nbrow + 1 + self.resize(rows = nbrow, columns = 2) + label = gtk.Label(name.capitalize() + ':') + self.attach(label, 0, 1, nbrow - 1, nbrow, 0, 0, 0, 0) + entry = gtk.Entry() + entry.set_activates_default(True) + if self.infos[name]: + entry.set_text(self.infos[name]) + if name == 'password': + entry.set_visibility(False) + self.attach(entry, 1, 2, nbrow - 1, nbrow, 0, 0, 0, 0) + self.entries[name] = entry + if nbrow == 1: + entry.grab_focus() + + def get_infos(self): + for name in self.entries.keys(): + self.infos[name] = self.entries[name].get_text().decode('utf-8') + return self.infos + +class ServiceRegistrationWindow: '''Class for Service registration window: Window that appears when we want to subscribe to a service if is_form we use DataFormWindow else we use service_registarion_window''' def __init__(self, service, infos, account, is_form): self.service = service - self.infos = infos self.account = account self.is_form = is_form if self.is_form: - DataFormWindow.__init__(self, account, infos) + dataform = dataforms.ExtendForm(node = infos) + self.data_form_widget = dataforms_widget.DataFormWidget(dataform) + if self.data_form_widget.title: + self.window.set_title('%s - Gajim' % self.data_form_widget.title) + table = self.xml.get_widget('table') + table.attach(self.data_form_widget, 0, 2, 0, 1) else: - self.xml = gtkgui_helpers.get_glade( - 'service_registration_window.glade') - self.window = self.xml.get_widget('service_registration_window') - self.window.set_transient_for(gajim.interface.roster.window) if infos.has_key('registered'): self.window.set_title(_('Edit %s') % service) else: self.window.set_title(_('Register to %s') % service) - self.xml.get_widget('label').set_text(infos['instructions']) - self.entries = {} - self.draw_table() + self.data_form_widget = FakeDataForm(infos) + table = self.xml.get_widget('table') + table.attach(self.data_form_widget, 0, 2, 0, 1) self.xml.signal_autoconnect(self) self.window.show_all() def on_cancel_button_clicked(self, widget): self.window.destroy() - def draw_table(self): - '''Draw the table in the window''' - nbrow = 0 - table = self.xml.get_widget('table') - for name in self.infos.keys(): - if name in ('key', 'instructions', 'x', 'registered'): - continue - if not name: - continue - - nbrow = nbrow + 1 - table.resize(rows = nbrow, columns = 2) - label = gtk.Label(name.capitalize() + ':') - table.attach(label, 0, 1, nbrow - 1, nbrow, 0, 0, 0, 0) - entry = gtk.Entry() - entry.set_activates_default(True) - if self.infos[name]: - entry.set_text(self.infos[name]) - if name == 'password': - entry.set_visibility(False) - table.attach(entry, 1, 2, nbrow - 1, nbrow, 0, 0, 0, 0) - self.entries[name] = entry - if nbrow == 1: - entry.grab_focus() - table.show_all() - def on_ok_button_clicked(self, widget): + # send registration info to the core if self.is_form: # We pressed OK button of the DataFormWindow if self.infos.has_key('registered'): @@ -2282,20 +2158,15 @@ gajim.connections[self.account].register_agent(self.service, self.infos, True) # True is for is_form else: - # we pressed OK of service_registration_window - # send registration info to the core - for name in self.entries.keys(): - self.infos[name] = self.entries[name].get_text().decode('utf-8') - if self.infos.has_key('instructions'): - del self.infos['instructions'] - if self.infos.has_key('registered'): - del self.infos['registered'] - gajim.connections[self.account].register_agent(self.service, - self.infos) - + infos = self.data_form_widget.get_infos() + if infos.has_key('instructions'): + del infos['instructions'] + if infos.has_key('registered'): + del infos['registered'] + gajim.connections[self.account].register_agent(self.service, infos) + self.window.destroy() - class GroupchatConfigWindow(DataFormWindow): '''GroupchatConfigWindow class''' def __init__(self, account, room_jid, config = None):

1 0

[commit-gajim] r8662 - branches/gajim_0.11.1/src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:28:42 +0200 (Fri, 31 Aug 2007) New Revision: 8662 Modified: branches/gajim_0.11.1/src/notify.py Log: Use good funtion so we can see icon for pynotify notifs Modified: branches/gajim_0.11.1/src/notify.py =================================================================== --- branches/gajim_0.11.1/src/notify.py 2007-08-31 08:27:15 UTC (rev 8661) +++ branches/gajim_0.11.1/src/notify.py 2007-08-31 08:28:42 UTC (rev 8662) @@ -316,7 +316,7 @@ notification.set_data('jid', jid) notification.set_data('account', account) notification.set_data('msg_type', event_type) - notification.set_data('path_to_image', path_to_image) + notification.set_property('icon-name', path_to_image) notification.add_action('default', 'Default Action', on_pynotify_notification_clicked)

1 0

[commit-gajim] r8661 - in branches/gajim_0.11.1/src: . common
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:27:15 +0200 (Fri, 31 Aug 2007) New Revision: 8661 Modified: branches/gajim_0.11.1/src/common/connection_handlers.py branches/gajim_0.11.1/src/common/contacts.py branches/gajim_0.11.1/src/gajim.py Log: show transport nickname if there is one and user hasn't set a nickname. fixes #3094 Modified: branches/gajim_0.11.1/src/common/connection_handlers.py =================================================================== --- branches/gajim_0.11.1/src/common/connection_handlers.py 2007-08-31 08:16:41 UTC (rev 8660) +++ branches/gajim_0.11.1/src/common/connection_handlers.py 2007-08-31 08:27:15 UTC (rev 8661) @@ -1582,6 +1582,7 @@ user_nick = prs.getTagData('nick') if not user_nick: user_nick = '' + contact_nickname = None transport_auto_auth = False xtags = prs.getTags('x') for x in xtags: @@ -1592,7 +1593,8 @@ sigTag = x if namespace == common.xmpp.NS_VCARD_UPDATE: avatar_sha = x.getTagData('photo') - if namespace == common.xmpp.NS_DELAY: + contact_nickname = x.getTagData('nickname') + elif namespace == common.xmpp.NS_DELAY: # JEP-0091 tim = prs.getTimestamp() tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') @@ -1631,7 +1633,7 @@ errcode = prs.getErrorCode() if errcode == '502': # Internal Timeout: self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, - prio, keyID, timestamp)) + prio, keyID, timestamp, None)) elif errcode == '401': # password required to join self.dispatch('ERROR', (_('Unable to join group chat'), _('A password is required to join this group chat.'))) @@ -1716,7 +1718,7 @@ self.connection.send(p) if who.find("@") <= 0 or transport_auto_auth: self.dispatch('NOTIFY', (jid_stripped, 'offline', 'offline', - resource, prio, keyID, timestamp)) + resource, prio, keyID, timestamp, None)) if transport_auto_auth: self.automatically_added.append(jid_stripped) self.request_subscription(jid_stripped, name = user_nick) @@ -1767,7 +1769,7 @@ errcode = prs.getErrorCode() if errcode == '502': # Internal Timeout: self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, - prio, keyID, timestamp)) + prio, keyID, timestamp, None)) else: # print in the window the error self.dispatch('ERROR_ANSWER', ('', jid_stripped, errmsg, errcode)) @@ -1791,7 +1793,7 @@ except exceptions.PysqliteOperationalError, e: self.dispatch('ERROR', (_('Disk Write Error'), str(e))) self.dispatch('NOTIFY', (jid_stripped, show, status, resource, prio, - keyID, timestamp)) + keyID, timestamp, contact_nickname)) # END presenceCB def _StanzaArrivedCB(self, con, obj): self.last_io = gajim.idlequeue.current_time() Modified: branches/gajim_0.11.1/src/common/contacts.py =================================================================== --- branches/gajim_0.11.1/src/common/contacts.py 2007-08-31 08:16:41 UTC (rev 8660) +++ branches/gajim_0.11.1/src/common/contacts.py 2007-08-31 08:27:15 UTC (rev 8661) @@ -23,6 +23,7 @@ chatstate=None, last_status_time=None, msg_id = None, composing_jep = None): self.jid = jid self.name = name + self.contact_name = '' # nick choosen by contact self.groups = groups self.show = show self.status = status @@ -57,6 +58,8 @@ def get_shown_name(self): if self.name: return self.name + if self.contact_name: + return self.contact_name return self.jid.split('@')[0] def is_hidden_from_roster(self): Modified: branches/gajim_0.11.1/src/gajim.py =================================================================== --- branches/gajim_0.11.1/src/gajim.py 2007-08-31 08:16:41 UTC (rev 8660) +++ branches/gajim_0.11.1/src/gajim.py 2007-08-31 08:27:15 UTC (rev 8661) @@ -453,7 +453,7 @@ def handle_event_notify(self, account, array): # 'NOTIFY' (account, (jid, status, status message, resource, priority, - # keyID, timestamp)) + # keyID, timestamp, contact_nickname)) # if we're here it means contact changed show statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible'] @@ -465,6 +465,7 @@ status_message = array[2] jid = array[0].split('/')[0] keyID = array[5] + contact_nickname = array[7] attached_keys = gajim.config.get_per('accounts', account, 'attached_gpg_keys').split() if jid in attached_keys: @@ -493,6 +494,10 @@ if contact1: if contact1.show in statuss: old_show = statuss.index(contact1.show) + if contact_nickname is not None and \ + contact1.contact_name != contact_nickname: + contact1.contact_name = contact_nickname + self.roster.draw_contact(jid, account) if old_show == new_show and contact1.status == status_message and \ contact1.priority == priority: # no change return @@ -547,6 +552,7 @@ elif not gajim.block_signed_in_notifications[account]: # We're connected since more that 30 seconds contact1.last_status_time = time.localtime() + contact1.contact_nickname = contact_nickname if gajim.jid_is_transport(jid): # It must be an agent if ji in jid_list:

1 0

[commit-gajim] r8660 - branches/gajim_0.11.1/src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:16:41 +0200 (Fri, 31 Aug 2007) New Revision: 8660 Modified: branches/gajim_0.11.1/src/dialogs.py Log: don't add a line break to the status message when we press ctrl+enter. Fixes #3106 Modified: branches/gajim_0.11.1/src/dialogs.py =================================================================== --- branches/gajim_0.11.1/src/dialogs.py 2007-08-31 08:14:36 UTC (rev 8659) +++ branches/gajim_0.11.1/src/dialogs.py 2007-08-31 08:16:41 UTC (rev 8660) @@ -380,6 +380,8 @@ event.keyval == gtk.keysyms.KP_Enter: # catch CTRL+ENTER if (event.state & gtk.gdk.CONTROL_MASK): self.window.response(gtk.RESPONSE_OK) + # Stop the event + return True def toggle_sensitiviy_of_save_as_preset(self, widget): btn = self.xml.get_widget('save_as_preset_button')

1 0

[commit-gajim] r8659 - branches/gajim_0.11.1/data/glade
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:14:36 +0200 (Fri, 31 Aug 2007) New Revision: 8659 Modified: branches/gajim_0.11.1/data/glade/vcard_information_window.glade Log: re-make vcard window resizable. fixes #2255 Modified: branches/gajim_0.11.1/data/glade/vcard_information_window.glade =================================================================== --- branches/gajim_0.11.1/data/glade/vcard_information_window.glade 2007-08-31 08:13:14 UTC (rev 8658) +++ branches/gajim_0.11.1/data/glade/vcard_information_window.glade 2007-08-31 08:14:36 UTC (rev 8659) @@ -9,7 +9,7 @@ <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> - <property name="resizable">False</property> + <property name="resizable">True</property> <property name="destroy_with_parent">False</property> <property name="decorated">True</property> <property name="skip_taskbar_hint">False</property>

1 0

[commit-gajim] r8658 - branches/gajim_0.11.1/src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:13:14 +0200 (Fri, 31 Aug 2007) New Revision: 8658 Modified: branches/gajim_0.11.1/src/roster_window.py Log: send status to connecting accounts when we change global status combobox. Fixes #3133 Modified: branches/gajim_0.11.1/src/roster_window.py =================================================================== --- branches/gajim_0.11.1/src/roster_window.py 2007-08-31 08:11:35 UTC (rev 8657) +++ branches/gajim_0.11.1/src/roster_window.py 2007-08-31 08:13:14 UTC (rev 8658) @@ -2931,7 +2931,7 @@ # status if not global_sync_connected_accounts > 0 or \ - gajim.account_is_connected(account): + gajim.connections[account].connected > 0: self.send_status(account, status, message) self.update_status_combobox()

1 0

[commit-gajim] r8657 - branches/gajim_0.11.1/src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:11:35 +0200 (Fri, 31 Aug 2007) New Revision: 8657 Modified: branches/gajim_0.11.1/src/message_window.py Log: prevent TB when closing a window. fixes #3152 Modified: branches/gajim_0.11.1/src/message_window.py =================================================================== --- branches/gajim_0.11.1/src/message_window.py 2007-08-31 08:10:44 UTC (rev 8656) +++ branches/gajim_0.11.1/src/message_window.py 2007-08-31 08:11:35 UTC (rev 8657) @@ -235,6 +235,11 @@ def show_title(self, urgent = True, control = None): '''redraw the window's title''' + if not control: + control = self.get_active_control() + if not control: + # No more control in this window + return unread = 0 for ctrl in self.controls(): if ctrl.type_id == message_control.TYPE_GC and not \ @@ -253,8 +258,6 @@ else: urgent = False - if not control: - control = self.get_active_control() if control.type_id == message_control.TYPE_GC: name = control.room_jid.split('@')[0] urgent = control.attention_flag

1 0

[commit-gajim] r8656 - in branches/gajim_0.11.1/data: emoticons iconsets
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:10:44 +0200 (Fri, 31 Aug 2007) New Revision: 8656 Modified: branches/gajim_0.11.1/data/emoticons/Makefile.am branches/gajim_0.11.1/data/iconsets/Makefile.am Log: [Tobu] Fix a bug when srcdir != builddir Modified: branches/gajim_0.11.1/data/emoticons/Makefile.am =================================================================== --- branches/gajim_0.11.1/data/emoticons/Makefile.am 2007-08-31 08:09:52 UTC (rev 8655) +++ branches/gajim_0.11.1/data/emoticons/Makefile.am 2007-08-31 08:10:44 UTC (rev 8656) @@ -8,28 +8,28 @@ install-data-local: - @for d in $(EMOTICONS_DIRS);do \ - if test -d $$d;then \ + @for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \ + if test -d $(srcdir)/$$d;then \ echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d || exit 1; \ fi; \ done; \ - for f in $(EMOTICONS_FILES);do \ - if test -f $$f; then \ - echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \ - $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \ + for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \ + if test -f $(srcdir)/$$f; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \ + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \ fi; \ done; dist-hook: - @for d in $(EMOTICONS_DIRS);do \ - if test -d $$d;then \ + @for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \ + if test -d $(srcdir)/$$d;then \ echo " $(mkdir_p) $(distdir)/$$d"; \ $(mkdir_p) $(distdir)/$$d || exit 1; \ fi; \ done; \ - for f in $(EMOTICONS_FILES);do \ - if test -f $$f; then \ + for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \ + if test -f $(srcdir)/$$f; then \ echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \ cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \ fi; \ Modified: branches/gajim_0.11.1/data/iconsets/Makefile.am =================================================================== --- branches/gajim_0.11.1/data/iconsets/Makefile.am 2007-08-31 08:09:52 UTC (rev 8655) +++ branches/gajim_0.11.1/data/iconsets/Makefile.am 2007-08-31 08:10:44 UTC (rev 8656) @@ -9,28 +9,28 @@ transports/**/{16x16,32x32,48x48}/{*.gif,*.png} install-data-local: - @for d in $(ICONSET_DIRS);do \ - if test -d $$d;then \ + @for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \ + if test -d $(srcdir)/$$d;then \ echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d || exit 1; \ fi; \ done - for f in $(ICONSET_FILES);do \ - if test -f $$f; then \ - echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f"; \ - $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f || exit 1; \ + for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \ + if test -f $(srcdir)/$$f; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f"; \ + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f || exit 1; \ fi; \ done; dist-hook: - @for d in $(ICONSET_DIRS);do \ - if test -d $$d;then \ + @for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \ + if test -d $(srcdir)/$$d;then \ echo " $(mkdir_p) $(distdir)/$$d"; \ $(mkdir_p) $(distdir)/$$d || exit 1; \ fi; \ done - for f in $(ICONSET_FILES);do \ - if test -f $$f; then \ + for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \ + if test -f $(srcdir)/$$f; then \ echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \ cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \ fi; \

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2007