Commits

commits@gajim.org

17632 discussions

gajim: fix tab size
by Denis Fomin 28 Jan '13

28 Jan '13

changeset d65211386b14 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d65211386b14 description: fix tab size diffstat: data/gui/message_window.ui | 50 ++++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 19 deletions(-) diffs (99 lines): diff -r ebbb54c9f2dd -r d65211386b14 data/gui/message_window.ui --- a/data/gui/message_window.ui Mon Jan 28 21:04:21 2013 +0100 +++ b/data/gui/message_window.ui Tue Jan 29 01:11:25 2013 +0400 @@ -1,33 +1,19 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  - <object class="GtkWindow" id="message_window"> - <property name="default_width">480</property> - <property name="default_height">440</property> - <child> - <object class="GtkAlignment" id="msg_window_alignment"> - <property name="visible">True</property> - <property name="top_padding">2</property> - <child> - <object class="GtkNotebook" id="notebook"> - <property name="visible">True</property> - <property name="scrollable">True</property> - </object> - </child> - </object> - </child> - </object> +  <object class="GtkEventBox" id="chat_tab_ebox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="visible_window">False</property> <child> <object class="GtkHBox" id="tab_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">4</property> <child> <object class="GtkImage" id="tab_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-missing-image</property> </object> <packing> @@ -38,25 +24,32 @@ </child> <child> <object class="GtkLabel" id="tab_label"> + <property name="width_request">70</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="use_markup">True</property> <property name="ellipsize">end</property> <property name="max_width_chars">9</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkButton" id="tab_close_button"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <child> <object class="GtkImage" id="image1329"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-close</property> <property name="icon-size">1</property> </object> @@ -71,4 +64,23 @@ </object> </child> </object> + <object class="GtkWindow" id="message_window"> + <property name="can_focus">False</property> + <property name="default_width">480</property> + <property name="default_height">440</property> + <child> + <object class="GtkAlignment" id="msg_window_alignment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">2</property> + <child> + <object class="GtkNotebook" id="notebook"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="scrollable">True</property> + </object> + </child> + </object> + </child> + </object> </interface>

1 0

gajim: fix traceback
by Yann Leboulanger 28 Jan '13

28 Jan '13

changeset ebbb54c9f2dd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ebbb54c9f2dd description: fix traceback diffstat: src/command_system/tools.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 1e8133e96f48 -r ebbb54c9f2dd src/command_system/tools.py --- a/src/command_system/tools.py Mon Jan 28 20:31:01 2013 +0100 +++ b/src/command_system/tools.py Mon Jan 28 21:04:21 2013 +0100 @@ -27,10 +27,10 @@ from types import * def remove(sequence, target): - if isinstance(sequence, ListType): + if isinstance(sequence, list): if target in sequence: sequence.remove(target) - elif isinstance(sequence, DictType): + elif isinstance(sequence, dict): if target in sequence: del sequence[target]

1 0

gajim: initialize threads in GObject.
by Yann Leboulanger 28 Jan '13

28 Jan '13

changeset 1e8133e96f48 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1e8133e96f48 description: initialize threads in GObject. diffstat: src/gajim.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 6bcf6a7fc195 -r 1e8133e96f48 src/gajim.py --- a/src/gajim.py Mon Jan 28 01:32:17 2013 +0400 +++ b/src/gajim.py Mon Jan 28 20:31:01 2013 +0100 @@ -193,6 +193,7 @@ warnings.filterwarnings('error', module='gtk') try: from gi.repository import GObject + GObject.threads_init() GObject.set_prgname('gajim') from gi.repository import Gtk from gi.repository import Gdk

1 0

gajim: plugins_window.do not shrink vbox,expand plugin name coloumn
by Denis Fomin 27 Jan '13

27 Jan '13

changeset 6bcf6a7fc195 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6bcf6a7fc195 description: plugins_window.do not shrink vbox,expand plugin name coloumn diffstat: data/gui/plugins_window.ui | 111 ++++++++++++++++++++++++++++++++++++++------ src/plugins/gui.py | 1 + 2 files changed, 95 insertions(+), 17 deletions(-) diffs (truncated from 474 to 300 lines): diff -r 1cff39892de0 -r 6bcf6a7fc195 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Sun Jan 27 19:51:11 2013 +0100 +++ b/data/gui/plugins_window.ui Mon Jan 28 01:32:17 2013 +0400 @@ -1,39 +1,43 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  + <object class="GtkTextBuffer" id="textbuffer1"> + <property name="text" translatable="yes">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property> + </object> <object class="GtkWindow" id="plugins_window"> <property name="width_request">650</property> <property name="height_request">500</property> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Plugins</property> <property name="default_width">650</property> <property name="default_height">500</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_plugins_window_destroy"/> + <signal name="destroy" handler="on_plugins_window_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkNotebook" id="plugins_notebook"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="switch_page" handler="on_plugins_notebook_switch_page"/> + <signal name="switch-page" handler="on_plugins_notebook_switch_page" swapped="no"/> <child> <object class="GtkHPaned" id="hpaned1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="position">250</property> + <property name="position_set">True</property> <child> <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <child> <object class="GtkVBox" id="vbox6"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> @@ -44,44 +48,59 @@ <object class="GtkTreeView" id="installed_plugins_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkAspectFrame" id="aspectframe1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <property name="xalign">0</property> <child> <object class="GtkButton" id="install_plugin_button"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <signal name="clicked" handler="on_install_plugin_button_clicked"/> + <property name="use_action_appearance">False</property> + <signal name="clicked" handler="on_install_plugin_button_clicked" swapped="no"/> <child> <object class="GtkHBox" id="hbox8"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkImage" id="image2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-apply</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="configure_plugin_button_label2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Install from zip</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -92,6 +111,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">5</property> <property name="position">1</property> </packing> @@ -107,12 +127,13 @@ <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="plugin_name_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">&lt;empty&gt;</property> <property name="selectable">True</property> @@ -122,58 +143,70 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Version:</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="plugin_version_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><empty></property> <property name="selectable">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="yalign">0</property> <property name="label" translatable="yes">Authors:</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="plugin_authors_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><empty></property> @@ -182,61 +215,76 @@ <property name="ellipsize">end</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label6"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Homepage:</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLinkButton" id="plugin_homepage_linkbutton"> <property name="label" translatable="yes">homepage url</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <property name="xalign">0</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox5"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label7"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Description:</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -246,6 +294,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -263,44 +312,58 @@ <property name="buffer">textbuffer1</property> </object> <packing> + <property name="expand">True</property>

1 0

gajim: fix command system
by Yann Leboulanger 27 Jan '13

27 Jan '13

changeset 1cff39892de0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1cff39892de0 description: fix command system diffstat: src/command_system/dispatcher.py | 4 +++- src/command_system/framework.py | 6 +++--- src/command_system/mapping.py | 4 ++-- src/plugins/pluginmanager.py | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diffs (74 lines): diff -r 23de2f5dd58a -r 1cff39892de0 src/command_system/dispatcher.py --- a/src/command_system/dispatcher.py Sat Jan 26 22:31:17 2013 +0100 +++ b/src/command_system/dispatcher.py Sun Jan 27 19:51:11 2013 +0100 @@ -66,11 +66,13 @@ yield attribute def is_command(attribute): - from framework import Command + from .framework import Command return isinstance(attribute, Command) def is_root(namespace): metaclass = namespace.get("__metaclass__", None) + if not metaclass: + return False return issubclass(metaclass, Dispatchable) def get_command(host, name): diff -r 23de2f5dd58a -r 1cff39892de0 src/command_system/framework.py --- a/src/command_system/framework.py Sat Jan 26 22:31:17 2013 +0100 +++ b/src/command_system/framework.py Sun Jan 27 19:51:11 2013 +0100 @@ -28,7 +28,7 @@ from .mapping import parse_arguments, adapt_arguments from .errors import DefinitionError, CommandError, NoCommandError -class CommandHost(object): +class CommandHost(metaclass=Host): """ Command host is a hub between numerous command processors and command containers. Aimed to participate in a dispatching process in @@ -40,7 +40,7 @@ """ __metaclass__ = Host -class CommandContainer(object): +class CommandContainer(metaclass=Container): """ Command container is an entity which holds defined commands, allowing them to be dispatched and proccessed correctly. Each @@ -143,7 +143,7 @@ def list_commands(self): commands = list_commands(self.COMMAND_HOST) commands = dict(commands) - return sorted(commands.values()) + return sorted(list(commands.values()), key=lambda k: k.__repr__()) class Command(object): diff -r 23de2f5dd58a -r 1cff39892de0 src/command_system/mapping.py --- a/src/command_system/mapping.py Sat Jan 26 22:31:17 2013 +0100 +++ b/src/command_system/mapping.py Sun Jan 27 19:51:11 2013 +0100 @@ -230,8 +230,8 @@ # Stripping down position information supplied with arguments and # options as it won't be needed again. - args = map(lambda t: t[0], t[1]) - opts = map(lambda t: (t[0], t[1]), opts) + args = list(map(lambda t: t[0], args)) + opts = list(map(lambda t: (t[0], t[1]), opts)) # If command has extra option enabled - collect all extra arguments # and pass them to a last positional argument command defines as a diff -r 23de2f5dd58a -r 1cff39892de0 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sat Jan 26 22:31:17 2013 +0100 +++ b/src/plugins/pluginmanager.py Sun Jan 27 19:51:11 2013 +0100 @@ -41,7 +41,7 @@ from plugins.helpers import GajimPluginActivateException from plugins.plugin import GajimPlugin, GajimPluginException -class PluginManager(object): +class PluginManager(metaclass=Singleton): ''' Main plug-in management class.

1 0

gajim: support min_gajim_version and max_gajim_version in plugins
by Yann Leboulanger 26 Jan '13

26 Jan '13

changeset 23de2f5dd58a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=23de2f5dd58a description: support min_gajim_version and max_gajim_version in plugins diffstat: src/common/defs.py | 2 +- src/plugins/pluginmanager.py | 72 ++++++++++++++++++++++++++----------------- 2 files changed, 45 insertions(+), 29 deletions(-) diffs (116 lines): diff -r f61b0d6163e0 -r 23de2f5dd58a src/common/defs.py --- a/src/common/defs.py Sat Jan 26 19:40:59 2013 +0100 +++ b/src/common/defs.py Sat Jan 26 22:31:17 2013 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15.2.0' +version = '0.15.10.0' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, diff -r f61b0d6163e0 -r 23de2f5dd58a src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sat Jan 26 19:40:59 2013 +0100 +++ b/src/plugins/pluginmanager.py Sat Jan 26 22:31:17 2013 +0100 @@ -420,39 +420,61 @@ for elem_name in dir_list: file_path = os.path.join(path, elem_name) - module = None - if os.path.isfile(file_path) and fnmatch.fnmatch(file_path, '*.py'): module_name = os.path.splitext(elem_name)[0] - try: - module = __import__(module_name) - except ValueError as value_error: - log.debug(str(value_error)) - except ImportError as import_error: - log.debug(str(import_error)) - elif os.path.isdir(file_path) and scan_dirs: module_name = elem_name - if module_name in sys.modules: - # do not load the module twice - continue file_path += os.path.sep - try: - module = __import__(module_name) - except ValueError as value_error: - log.debug(str(value_error)) - except ImportError as import_error: - log.debug(str(import_error)) - - - if module is None: - continue manifest_path = os.path.join(os.path.dirname(file_path), 'manifest.ini') if scan_dirs and (not os.path.isfile(manifest_path)): continue + # read metadata from manifest.ini + conf.remove_section('info') + conf_file = open(manifest_path) + conf.read_file(conf_file) + conf_file.close() + + try: + min_v = conf.get('info', 'min_gajim_version') + except Exception: + min_v = None + try: + max_v = conf.get('info', 'max_gajim_version') + except Exception: + max_v = None + + gajim_v = gajim.config.get('version') + gajim_v = gajim_v.split('-', 1)[0] + gajim_v = gajim_v.split('.') + + if min_v: + min_v = min_v.split('.') + if gajim_v < min_v: + continue + if max_v: + max_v = max_v.split('.') + if gajim_v > max_v: + continue + + + module = None + + if module_name in sys.modules: + # do not load the module twice + continue + try: + module = __import__(module_name) + except ValueError as value_error: + log.debug(str(value_error)) + except ImportError as import_error: + log.debug(str(import_error)) + + if module is None: + continue + log.debug('Attributes processing started') for module_attr_name in [attr_name for attr_name in dir(module) if not (attr_name.startswith('__') or attr_name.endswith('__'))]: @@ -467,16 +489,10 @@ module_attr.__path__ = os.path.abspath( os.path.dirname(file_path)) - # read metadata from manifest.ini - conf_file = open(manifest_path) - conf.read_file(conf_file) - conf_file.close() - for option in fields: if conf.get('info', option) is '': raise configparser.NoOptionError('field empty') setattr(module_attr, option, conf.get('info', option)) - conf.remove_section('info') plugins_found.append(module_attr) except TypeError:

1 0

gajim: fix XML window
by Yann Leboulanger 26 Jan '13

26 Jan '13

changeset f61b0d6163e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f61b0d6163e0 description: fix XML window diffstat: data/gui/xml_console_window.ui | 113 +++++++++++++++++++++++++++++----------- 1 files changed, 81 insertions(+), 32 deletions(-) diffs (truncated from 375 to 300 lines): diff -r 2c3b3ecd0c18 -r f61b0d6163e0 data/gui/xml_console_window.ui --- a/data/gui/xml_console_window.ui Sat Jan 26 19:35:56 2013 +0100 +++ b/data/gui/xml_console_window.ui Sat Jan 26 19:40:59 2013 +0100 @@ -1,20 +1,21 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  <object class="GtkWindow" id="xml_console_window"> + <property name="can_focus">False</property> <property name="border_width">12</property> <property name="default_width">550</property> <property name="default_height">450</property> - <signal name="destroy" handler="on_xml_console_window_destroy"/> + <signal name="destroy" handler="on_xml_console_window_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label342"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Jabber Traffic</b></property> <property name="use_markup">True</property> @@ -29,8 +30,6 @@ <object class="GtkScrolledWindow" id="scrolledwindow43"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTextView" id="stanzas_log_textview"> @@ -42,49 +41,49 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2988"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="enable_checkbutton"> <property name="label" translatable="yes" comments="XML Console enable checkbutton">_Enable</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_enable_checkbutton_toggled"/> + <signal name="toggled" handler="on_enable_checkbutton_toggled" swapped="no"/> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label351"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> <object class="GtkButton" id="clear_button"> <property name="label">gtk-clear</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_clear_button_clicked"/> + <signal name="clicked" handler="on_clear_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -102,84 +101,113 @@ <child> <object class="GtkVBox" id="input_vbox1"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="in_stanza_checkbutton"> <property name="label" translatable="yes">Hide IN stanzas</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_in_stanza_checkbutton_toggled"/> + <signal name="toggled" handler="on_in_stanza_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="out_stanza_checkbutton"> <property name="label" translatable="yes">Hide OUT stanzas</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_out_stanza_checkbutton_toggled"/> + <signal name="toggled" handler="on_out_stanza_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="presence_stanza_checkbutton"> <property name="label" translatable="yes">Hide Presence stanzas</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_presence_stanza_checkbutton_toggled"/> + <signal name="toggled" handler="on_presence_stanza_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkCheckButton" id="iq_stanza_checkbutton"> <property name="label" translatable="yes">Hide IQ stanzas</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_iq_stanza_checkbutton_toggled"/> + <signal name="toggled" handler="on_iq_stanza_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> <object class="GtkCheckButton" id="message_stanza_checkbutton"> <property name="label" translatable="yes">Hide Message stanzas</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_message_stanza_checkbutton_toggled"/> + <signal name="toggled" handler="on_message_stanza_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">4</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -188,6 +216,8 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -196,6 +226,7 @@ <child type="label"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Filter</b></property> <property name="use_markup">True</property> @@ -204,6 +235,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> @@ -212,11 +244,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="spacing">6</property> - <signal name="activate" handler="on_expander_activate"/> + <signal name="activate" handler="on_expander_activate" swapped="no"/> <child> <object class="GtkVBox" id="input_vbox"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow42"> @@ -234,23 +266,28 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHButtonBox" id="hbuttonbox31"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="iq_button"> <property name="label" translatable="yes" comments="Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))">_IQ</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Info/Query</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_iq_button_clicked"/> + <signal name="clicked" handler="on_iq_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -261,11 +298,13 @@ <child> <object class="GtkButton" id="presence_button"> <property name="label" translatable="yes">_Presence</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property>

1 0

gajim: fix browsing muc components
by Yann Leboulanger 26 Jan '13

26 Jan '13

changeset 2c3b3ecd0c18 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2c3b3ecd0c18 description: fix browsing muc components diffstat: src/disco.py | 28 +++++----------------------- 1 files changed, 5 insertions(+), 23 deletions(-) diffs (44 lines): diff -r 35f14d8cf57f -r 2c3b3ecd0c18 src/disco.py --- a/src/disco.py Thu Jan 24 22:00:28 2013 +0100 +++ b/src/disco.py Sat Jan 26 19:35:56 2013 +0100 @@ -1906,35 +1906,17 @@ self._fetch_source = GObject.timeout_add(100, self._start_info_query) return # We have to do this in a pygtk <2.8 compatible way :/ - #start, end = self.window.services_treeview.get_visible_range() - rect = view.get_visible_rect() - iter_ = end = None - # Top row - try: - sx, sy = view.convert_tree_to_bin_window_coords(rect.x, rect.y) - spath = view.get_path_at_pos(sx, sy)[0] - iter_ = self.model.get_iter(spath) - except TypeError: - self._fetch_source = None - return - # Bottom row - # Iter compare is broke, use the path instead - try: - ex, ey = view.convert_tree_to_bin_window_coords(rect.x + \ - rect.height, rect.y + rect.height) - end = view.get_path_at_pos(ex, ey)[0] - # end is the last visible, we want to query that aswell - end = (end[0] + 1,) - except TypeError: - # We're at the end of the model, we can leave end=None though. - pass - while iter_ and self.model.get_path(iter_) != end: + start, end = view.get_visible_range() + iter_ = self.model.get_iter(start) + while iter_: if not self.model.get_value(iter_, 6): jid = self.model.get_value(iter_, 0) node = self.model.get_value(iter_, 1) self.cache.get_info(jid, node, self._agent_info) self._fetch_source = True return + if self.model.get_path(iter_) == end: + break iter_ = self.model.iter_next(iter_) self._fetch_source = None

1 0

gajim: start supporting animated images in treeview.
by Yann Leboulanger 24 Jan '13

24 Jan '13

changeset 35f14d8cf57f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=35f14d8cf57f description: start supporting animated images in treeview. diffstat: src/cell_renderer_image.py | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diffs (62 lines): diff -r 44e33b821a74 -r 35f14d8cf57f src/cell_renderer_image.py --- a/src/cell_renderer_image.py Tue Jan 22 00:32:09 2013 +0400 +++ b/src/cell_renderer_image.py Thu Jan 24 22:00:28 2013 +0100 @@ -21,7 +21,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## - +from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GObject @@ -62,21 +62,23 @@ col = tree.get_column(self.col_index) cell_area = tree.get_cell_area(path, col) - tree.queue_draw_area(cell_area.x, cell_area.y, - cell_area.width, cell_area.height) + tree.queue_draw_area(cell_area.x, cell_area.y, cell_area.width, + cell_area.height) def animation_timeout(self, tree, image): if image.get_storage_type() != Gtk.ImageType.ANIMATION: return self.redraw = 0 iter_ = self.iters[image] - iter_.advance() + timeval = GLib.TimeVal() + timeval.tv_sec = GLib.get_current_time() + iter_.advance(timeval) model = tree.get_model() if model: model.foreach(self.func, (image, tree)) if self.redraw: GObject.timeout_add(iter_.get_delay_time(), - self.animation_timeout, tree, image) + self.animation_timeout, tree, image) elif image in self.iters: del self.iters[image] @@ -89,7 +91,9 @@ if not isinstance(widget, Gtk.TreeView): return animation = self.image.get_animation() - iter_ = animation.get_iter() + timeval = GLib.TimeVal() + timeval.tv_sec = GLib.get_current_time() + iter_ = animation.get_iter(timeval) self.iters[self.image] = iter_ GObject.timeout_add(iter_.get_delay_time(), self.animation_timeout, widget, self.image) @@ -115,7 +119,9 @@ return 0, 0, 0, 0 if self.image.get_storage_type() == Gtk.ImageType.ANIMATION: animation = self.image.get_animation() - pix = animation.get_iter().get_pixbuf() + timeval = GLib.TimeVal() + timeval.tv_sec = GLib.get_current_time() + pix = animation.get_iter(timeval).get_pixbuf() elif self.image.get_storage_type() == Gtk.ImageType.PIXBUF: pix = self.image.get_pixbuf() else:

1 0

gajim: correctly close file when we cancel a transfer. Fixes #7281
by Yann Leboulanger 24 Jan '13

24 Jan '13

changeset 0ad7f7647d92 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0ad7f7647d92 description: correctly close file when we cancel a transfer. Fixes #7281 diffstat: src/common/protocol/bytestream.py | 7 +++++-- src/common/socks5.py | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diffs (55 lines): diff -r 4a3d180f6d68 -r 0ad7f7647d92 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Jan 22 17:38:43 2013 +0100 +++ b/src/common/protocol/bytestream.py Thu Jan 24 21:23:57 2013 +0100 @@ -790,6 +790,7 @@ rep = nbxmpp.Protocol('iq', stanza.getFrom(), 'result', stanza.getTo(), {'id': stanza.getID()}) file_props.block_size = blocksize + file_props.direction = '<' file_props.seq = 0 file_props.received_len = 0 file_props.last_time = time.time() @@ -820,7 +821,6 @@ if session.weinitiate: session.cancel_session() - def OpenStream(self, sid, to, fp, blocksize=4096): """ Start new stream. You should provide stream id 'sid', the endpoind jid @@ -997,7 +997,10 @@ break else: if stanza.getTag('data'): - if self.IBBMessageHandler(conn, stanza): + sid = stanza.getTagAttr('data', 'sid') + file_props = FilesProp.getFileProp(self.name, sid) + if file_props.connected and self.IBBMessageHandler(conn, + stanza): reply = stanza.buildReply('result') reply.delChild('data') conn.send(reply) diff -r 4a3d180f6d68 -r 0ad7f7647d92 src/common/socks5.py --- a/src/common/socks5.py Tue Jan 22 17:38:43 2013 +0100 +++ b/src/common/socks5.py Thu Jan 24 21:23:57 2013 +0100 @@ -538,6 +538,7 @@ raise IOError, e def close_file(self): + # Close file we're sending from if self.file: if not self.file.closed: try: @@ -545,6 +546,12 @@ except Exception: pass self.file = None + # Close file we're receiving into + if self.file_props.fd: + try: + self.file_props.fd.close() + except Exception: + pass def get_fd(self): """

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