Commits January 2013

commits@gajim.org

4 participants
198 discussions

gajim: fix AcronymsExpanderPlugin
by Denis Fomin 31 Jan '13

31 Jan '13

changeset d5098768ad37 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d5098768ad37 description: fix AcronymsExpanderPlugin diffstat: plugins/acronyms_expander/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (6 lines): diff -r 23e84c33ab1c -r d5098768ad37 plugins/acronyms_expander/__init__.py --- a/plugins/acronyms_expander/__init__.py Tue Jan 29 23:59:21 2013 +0400 +++ b/plugins/acronyms_expander/__init__.py Thu Jan 31 14:05:51 2013 +0400 @@ -1,1 +1,1 @@ -from acronyms_expander import AcronymsExpanderPlugin +from .acronyms_expander import AcronymsExpanderPlugin

1 0

gajim: fix ellipsize in plugin_homepage_linkbutton
by Denis Fomin 29 Jan '13

29 Jan '13

changeset 23e84c33ab1c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=23e84c33ab1c description: fix ellipsize in plugin_homepage_linkbutton diffstat: src/plugins/gui.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 0d8cbcb2d64e -r 23e84c33ab1c src/plugins/gui.py --- a/src/plugins/gui.py Tue Jan 29 23:07:25 2013 +0400 +++ b/src/plugins/gui.py Tue Jan 29 23:59:21 2013 +0400 @@ -134,10 +134,10 @@ self.plugin_name_label.set_text(plugin.name) self.plugin_version_label.set_text(plugin.version) self.plugin_authors_label.set_text(plugin.authors) + self.plugin_homepage_linkbutton.set_uri(plugin.homepage) + self.plugin_homepage_linkbutton.set_label(plugin.homepage) label = self.plugin_homepage_linkbutton.get_children()[0] label.set_ellipsize(Pango.EllipsizeMode.END) - self.plugin_homepage_linkbutton.set_uri(plugin.homepage) - self.plugin_homepage_linkbutton.set_label(plugin.homepage) self.plugin_homepage_linkbutton.set_property('sensitive', True) desc_textbuffer = self.plugin_description_textview.get_buffer()

1 0

gajim: cleaning
by Denis Fomin 29 Jan '13

29 Jan '13

changeset 0d8cbcb2d64e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0d8cbcb2d64e description: cleaning diffstat: src/common/helpers.py | 38 -------------------------------------- 1 files changed, 0 insertions(+), 38 deletions(-) diffs (48 lines): diff -r d65211386b14 -r 0d8cbcb2d64e src/common/helpers.py --- a/src/common/helpers.py Tue Jan 29 01:11:25 2013 +0400 +++ b/src/common/helpers.py Tue Jan 29 23:07:25 2013 +0400 @@ -448,44 +448,6 @@ return output -#def decode_string(string): - #""" - #Try to decode (to make it Unicode instance) given string - #""" - #if isinstance(string, unicode): - #return string - ## by the time we go to iso15 it better be the one else we show bad characters - #encodings = (locale.getpreferredencoding(), 'utf-8', 'iso-8859-15') - #for encoding in encodings: - #try: - #string = string.decode(encoding) - #except UnicodeError: - #continue - #break - - #return string - -#def ensure_utf8_string(string): - #""" - #Make sure string is in UTF-8 - #""" - #try: - #string = decode_string(string).encode('utf-8') - #except Exception: - #pass - #return string - -#def wrapped_ensure_utf8_string(fn): - #def wrapped(n): - #return ensure_utf8_string(n) - #return wrapped - -#@wrapped_ensure_utf8_string -#def escape_text(text): - #return GObject.markup_escape_text(text) - -#GObject.markup_escape_text = escape_text - def get_windows_reg_env(varname, default=''): """ Ask for paths commonly used but not exposed as ENVs in english Windows 2003

1 0

gajim: [themazay] update Gajim.nsi to stop using deprecated mess...
by Yann Leboulanger 29 Jan '13

29 Jan '13

changeset a8ab5806dbf4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a8ab5806dbf4 description: [themazay] update Gajim.nsi to stop using deprecated messagebox plugin. Fixes #7292 diffstat: gajim.nsi | 36 ++++++++---------------------------- 1 files changed, 8 insertions(+), 28 deletions(-) diffs (88 lines): diff -r 1cf7d602453e -r a8ab5806dbf4 gajim.nsi --- a/gajim.nsi Thu Jan 24 20:26:18 2013 +0100 +++ b/gajim.nsi Tue Jan 29 10:27:51 2013 +0100 @@ -58,9 +58,7 @@ LangString DESC_SecGtk ${LANG_ENGLISH} "Installs Gtk+ 2 (necessary to run Gajim)." LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_ENGLISH} "If set, Gajim will be automatically started when Windows starts." -LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed." -LangString STR_Uninstall ${LANG_ENGLISH} "Launch Uninstaller" -LangString STR_Cancel ${LANG_ENGLISH} "Cancel" +LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed. Uninstall it?" LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\n\ Please quit Gajim and restart the uninstaller." @@ -76,9 +74,7 @@ LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (nécessaire à Gajim)." LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." -LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déja installé." -LangString STR_Uninstall ${LANG_FRENCH} "Lancer la Désinstallation" -LangString STR_Cancel ${LANG_FRENCH} "Annuler" +LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\n\ Fermez-le et redémarrez le désinstallateur." @@ -94,9 +90,7 @@ LangString DESC_SecGtk ${LANG_GERMAN} "Installert Gtk+ 2 (notwendig um Gajim zu benutzen)." LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt." LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird." -LangString STR_Installed ${LANG_GERMAN} "Gajim scheint bereits installiert zu sein." -LangString STR_Uninstall ${LANG_GERMAN} "Deinstallations-Programm starten" -LangString STR_Cancel ${LANG_GERMAN} "Abbrechen" +LangString STR_Installed ${LANG_GERMAN} "Gajim is apparently already installed. Uninstall it?" LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits läuft.$\n\ Bitte beenden Sie es und starten Sie den Installer erneut.." @@ -112,9 +106,7 @@ LangString DESC_SecGtk ${LANG_ITALIAN} "Installa Gtk+ 2 (necessario per eseguire Gajim)." LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." -LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed." -LangString STR_Uninstall ${LANG_ITALIAN} "Launch Uninstall" -LangString STR_Cancel ${LANG_ITALIAN} "Cancel" +LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\n\ Close it and restart uninstaller." @@ -130,11 +122,8 @@ LangString DESC_SecGtk ${LANG_RUSSIAN} "Óñòàíîâêà Gtk+ 2 (íåîáõîäèìî äëÿ ðàáîòû Gajim)." LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, íà ðàáî÷åì ñòîëå áóäåò ñîçäàí ÿðëûê Gajim." LangString DESC_SecAutostart ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, Gajim áóäåò àâòîìàòè÷åñêè çàïóñêàòüñÿ ïðè çàãðóçêå Windows." -LangString STR_Installed ${LANG_RUSSIAN} "Gajim is apparently already installed." -LangString STR_Uninstall ${LANG_RUSSIAN} "Launch Uninstall" -LangString STR_Cancel ${LANG_RUSSIAN} "Cancel" -LangString STR_Running ${LANG_RUSSIAN} "It appears that Gajim is currently running.$\n\ - Close it and restart uninstaller." +LangString STR_Installed ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå óñòàíîâëåí. Äåèíñòàëëèðîâàòü óñòàíîâëåííóþ âåðñèþ?" +LangString STR_Running ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå çàïóùåí.$\nÇàêðîéòå åãî è çàïóñòèòå äåèíñòàëëÿòîð ñíîâà." Section "Gajim" SecGajim SectionIn RO @@ -678,11 +667,7 @@ IntOp $0 $0 - 2 strcpy $1 $R0 $0 1 IfFileExists $1 +1 NotInstalled - messagebox::show MB_DEFBUTTON4|MB_TOPMOST "Gajim" \ - "0,103" \ - $(STR_Installed) \ - $(STR_Uninstall) $(STR_Cancel) - Pop $R1 + MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit StrCmp $R1 2 Quit +1 ExecWait '$R0 _?=$INSTDIR' $R2 StrCmp $R2 0 +1 Quit @@ -691,12 +676,7 @@ ; Check to see if new installer (NSIS)already installed ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" IfFileExists $R3 +1 ReallyNotInstalled - - messagebox::show MB_DEFBUTTON4|MB_TOPMOST "Gajim" \ - "0,103" \ - $(STR_Installed) \ - $(STR_Uninstall) $(STR_Cancel) - Pop $R4 + MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit StrCmp $R4 2 Quit +1 ExecWait '$R3 _?=$INSTDIR' $R5 StrCmp $R5 0 ReallyNotInstalled Quit

1 0

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

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 January 2013