Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix typo
by Yann Leboulanger 06 Sep '17

06 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 16fcb3a3 by Yann Leboulanger at 2017-09-06T14:26:30+02:00 fix typo - - - - - 1 changed file: - data/gui/shortcuts_window.ui Changes: ===================================== data/gui/shortcuts_window.ui ===================================== --- a/data/gui/shortcuts_window.ui +++ b/data/gui/shortcuts_window.ui @@ -103,7 +103,7 @@ <object class="GtkShortcutsShortcut"> <property name="visible">1</property> <property name="accelerator"><shift>Page_Down</property> - <property name="title" translatable="yes">Sroll down</property> + <property name="title" translatable="yes">Scroll down</property> </object> </child> <child> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16fcb3a3fcf7bdf9b742f055ffff0c5e9f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16fcb3a3fcf7bdf9b742f055ffff0c5e9f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Layout in Synchronise Contacts Dialog
by Philipp Hörist 04 Sep '17

04 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5f5fdc1 by Philipp Hörist at 2017-09-04T17:37:42+02:00 Fix Layout in Synchronise Contacts Dialog - - - - - 2 changed files: - data/gui/synchronise_select_account_dialog.ui - data/gui/synchronise_select_contacts_dialog.ui Changes: ===================================== data/gui/synchronise_select_account_dialog.ui ===================================== --- a/data/gui/synchronise_select_account_dialog.ui +++ b/data/gui/synchronise_select_account_dialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkDialog" id="synchronise_select_account_dialog"> @@ -89,7 +89,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">3</property> </packing> ===================================== data/gui/synchronise_select_contacts_dialog.ui ===================================== --- a/data/gui/synchronise_select_contacts_dialog.ui +++ b/data/gui/synchronise_select_contacts_dialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkDialog" id="synchronise_select_contacts_dialog"> @@ -89,7 +89,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">3</property> </packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5f5fdc19ca3942b9e90a5bef35e5c0f8b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5f5fdc19ca3942b9e90a5bef35e5c0f8b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add more log output in case we drop carbons
by Philipp Hörist 03 Sep '17

03 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8bc2ab09 by Philipp Hörist at 2017-09-03T22:35:56+02:00 Add more log output in case we drop carbons - - - - - 2 changed files: - gajim/common/connection.py - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -741,7 +741,7 @@ class Connection(CommonConnection, ConnectionHandlers): def check_jid(self, jid): return helpers.parse_jid(jid) - def get_own_jid(self): + def get_own_jid(self, warn=False): """ Return the last full JID we received on a bind event. In case we were never connected it returns the bare JID from config. @@ -750,6 +750,8 @@ class Connection(CommonConnection, ConnectionHandlers): # This returns the full jid we received on the bind event return self.registered_name else: + if warn: + log.warning('only bare JID available') # This returns the bare jid return nbxmpp.JID(app.get_jid_from_account(self.name)) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1156,12 +1156,12 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.encrypted = False account = self.conn.name - if self.stanza.getFrom() == self.conn.get_own_jid(): + if self.stanza.getFrom() == self.conn.get_own_jid(warn=True): # Drop messages sent from our own full jid # It can happen that when we sent message to our own bare jid # that the server routes that message back to us - log.info('Received message from self: %s, message is dropped' - % self.stanza.getFrom()) + log.info('Received message from self: %s, message is dropped', + self.stanza.getFrom()) return # check if the message is a roster item exchange (XEP-0144) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8bc2ab096eeff932b1626d7542bcd8443f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8bc2ab096eeff932b1626d7542bcd8443f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update gajim manpage
by Philipp Hörist 02 Sep '17

02 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6bb822f8 by Philipp Hörist at 2017-09-02T12:41:34+02:00 Update gajim manpage - - - - - 1 changed file: - data/gajim.1 Changes: ===================================== data/gajim.1 ===================================== --- a/data/gajim.1 +++ b/data/gajim.1 @@ -1,4 +1,4 @@ -.Dd August 26, 2015 +.Dd September 02, 2017 .Dt GAJIM 1 URM .Os UNIX .Sh NAME @@ -10,8 +10,10 @@ .Nm .Op Fl q .Op Fl v +.Op Fl w .Op Fl l Ar subsystem=level .Op Fl p Ar name +.Op Fl s .Op Fl c Ar directory .Sh DESCRIPTION .Nm @@ -33,8 +35,12 @@ on the XMPP protocol see <https://xmpp.org/about-xmpp/>. Show help options .It Fl q Fl Fl quiet Show only critical errors +.It Fl s Fl Fl separate +Separate profiles completely (even history db and plugins) .It Fl v Fl Fl verbose Print xml stanzas and other debug information +.It Fl w Fl Fl warnings +Show all GTK warnings with traceback .It Fl l Fl Fl loglevel Em subsystem=level Bq , Em subsystem=level Bq Em ... Configure logging system. Subsystem can be @@ -74,23 +80,20 @@ is not specified. Directory where certificates are stored. .It $XDG_DATA_DIR/gajim/logs.db The history database log file. -For more information on database logs see <https://trac.gajim.org/wiki/LogsDatabase>. +For more information on database logs see +<https://dev.gajim.org/gajim/gajim/wikis/development/LogsDatabase>. .El .Sh AUTHORS .An -nosplit .Nm is written and maintained by -.An Yann Leboulanger , +.An Yann Leboulanger and -.An Denis Fomin , +.An Philipp Hörist , with contributions and patches merged from many individuals around the world. -See files -.Pa AUTHORS -and -.Pa THANKS , -for a complete list. +See the About Dialog for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2015 Gajim Team +Copyright (C) 2003-2017 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. @@ -103,7 +106,7 @@ You should have received a copy of the GNU General Public License along with If not, see <https://www.gnu.org/licenses/>. .Sh FEEDBACK You can report bugs or feature requests in our bug tracker at -.Em trac.gajim.org +.Em https://dev.gajim.org/gajim/gajim/issues or in the .Em gajim-devel mailing list; if you want to send us a patch, please do so in our bug tracker. @@ -126,9 +129,9 @@ https://lists.gajim.org/cgi-bin/listinfo .Sh BUGS Please submit bugs at .Bd -literal -offset indent -https://trac.gajim.org/ -https://trac-plugins.gajim.org/ -https://python-nbxmpp.gajim.org/ +https://dev.gajim.org/gajim/gajim/issues +https://dev.gajim.org/gajim/gajim-plugins +https://dev.gajim.org/gajim/python-nbxmpp .Ed .Sh SEE ALSO .Xr gajim-remote 1 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6bb822f88494f8363532a321cf67076f88… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6bb822f88494f8363532a321cf67076f88… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update makefile
by Philipp Hörist 02 Sep '17

02 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b532a7b9 by Philipp Hörist at 2017-09-02T12:13:17+02:00 Update makefile - - - - - 1 changed file: - Makefile.am Changes: ===================================== Makefile.am ===================================== --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,6 @@ ACLOCAL_AMFLAGS = -I m4 bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote EXTRA_DIST = \ - THANKS.artists \ autogen.sh \ intltool-extract.in \ intltool-merge.in \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b532a7b9960fb05c298bad9e395624f090… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b532a7b9960fb05c298bad9e395624f090… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add dummy AUTHORS file
by Philipp Hörist 02 Sep '17

02 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5837c470 by Philipp Hörist at 2017-09-02T12:05:32+02:00 Add dummy AUTHORS file we need this for automake as it seems - - - - - a462af55 by Philipp Hörist at 2017-09-02T12:07:14+02:00 Hide License Button only on Windows - - - - - 2 changed files: - + AUTHORS - gajim/dialogs.py Changes: ===================================== AUTHORS ===================================== --- /dev/null +++ b/AUTHORS ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1329,7 +1329,9 @@ class AboutDialog(Gtk.AboutDialog): self.show_all() # GTK Bug, We have to manually hide the License Button - self.get_action_area().get_children()[1].hide() + # Bug exists only on Windows + if os.name == 'nt': + self.get_action_area().get_children()[1].hide() class Dialog(Gtk.Dialog): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4372b67433efae9f599fbed2acc501ce8… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4372b67433efae9f599fbed2acc501ce8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor AboutDialog
by Philipp Hörist 02 Sep '17

02 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4372b674 by Philipp Hörist at 2017-09-02T11:22:18+02:00 Refactor AboutDialog - Move Credits to const.py - Minor Refactoring - - - - - 4 changed files: - − AUTHORS - − THANKS.artists - THANKS → gajim/common/const.py - gajim/dialogs.py Changes: ===================================== AUTHORS deleted ===================================== --- a/AUTHORS +++ /dev/null @@ -1,18 +0,0 @@ -CURRENT DEVELOPERS: - -Yann Leboulanger (asterix AT lagaule.org) -Philipp Hörist (philipp AT hoerist.com) - -PAST DEVELOPERS: - -Stefan Bethge (stefan AT lanpartei.de) -Alexander Cherniuk (ts33kr AT gmail.com) -Stephan Erb (steve-e AT h3c.de) -Vincent Hanquez (tab AT snarc.org) -Dimitur Kirov (dkirov AT gmail.com) -Nikos Kouremenos (kourem AT gmail.com) -Julien Pivotto (roidelapluie AT gmail.com) -Jonathan Schleifer (js-gajim AT webkeks.org) -Travis Shirk (travis AT pobox.com) -Brendan Taylor (whateley AT gmail.com) -Jean-Marie Traissard (jim AT lapin.org) ===================================== THANKS.artists deleted ===================================== --- a/THANKS.artists +++ /dev/null @@ -1,10 +0,0 @@ -Anders Ström -Christophe Got -Dennis Craven -Dmitry Korzhevin -Guillaume Morin -Gvorcek Spajreh -Josef Vybíral -Membris Khan -Rederick Asher -Jakub Szypulka ===================================== THANKS → gajim/common/const.py ===================================== --- a/THANKS +++ b/gajim/common/const.py @@ -1,3 +1,4 @@ +THANKS = u"""\ Alexander Futász Alexander V. Butenko Alexey Nezhdanov @@ -41,5 +42,36 @@ Urtzi Alfaro Witold Kieraś Yakov Bezrukov Yavor Doganov +""".strip().split("\n") -Last but not least, we thank all the package maintainers. +ARTISTS = u"""\ +Anders Ström +Christophe Got +Dennis Craven +Dmitry Korzhevin +Guillaume Morin +Gvorcek Spajreh +Josef Vybíral +Membris Khan +Rederick Asher +Jakub Szypulka +""".strip().split("\n") + +DEVS_CURRENT = u"""\ +Yann Leboulanger (asterix AT lagaule.org) +Philipp Hörist (philipp AT hoerist.com) +""".strip().split("\n") + +DEVS_PAST = u"""\ +Stefan Bethge (stefan AT lanpartei.de) +Alexander Cherniuk (ts33kr AT gmail.com) +Stephan Erb (steve-e AT h3c.de) +Vincent Hanquez (tab AT snarc.org) +Dimitur Kirov (dkirov AT gmail.com) +Nikos Kouremenos (kourem AT gmail.com) +Julien Pivotto (roidelapluie AT gmail.com) +Jonathan Schleifer (js-gajim AT webkeks.org) +Travis Shirk (travis AT pobox.com) +Brendan Taylor (whateley AT gmail.com) +Jean-Marie Traissard (jim AT lapin.org) +""".strip().split("\n") ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -47,6 +47,7 @@ from gajim.common import defs from random import randrange from gajim.common import pep from gajim.common import ged +from gajim.common import const try: from gajim import gtkspell @@ -1287,98 +1288,49 @@ class AddNewContactWindow: self.gateway_prompt[obj.jid]['prompt'] = obj.prompt class AboutDialog(Gtk.AboutDialog): - """ - Class for about dialog - """ - def __init__(self): Gtk.AboutDialog.__init__(self) self.set_transient_for(app.interface.roster.window) self.set_name('Gajim') self.set_version(app.version) - s = 'Copyright © 2003-2017 Gajim Team' - self.set_copyright(s) - copying_file_path = self.get_path('COPYING') - if copying_file_path: - with open(copying_file_path) as a_file: - text = a_file.read() - self.set_license(text) - - gtk_ver = '%i.%i.%i' % (Gtk.get_major_version(), - Gtk.get_minor_version(), Gtk.get_micro_version()) - gobject_ver = self.tuple2str(GObject.pygobject_version) - nbxmpp_ver = nbxmpp.__version__ - self.set_comments('%s\n%s %s\n%s %s\n%s %s' % (_('A GTK+ XMPP client'), - _('GTK+ Version:'), gtk_ver, _('PyGobject Version:'), gobject_ver, - _('python-nbxmpp Version:'), nbxmpp_ver)) + self.set_copyright('Copyright © 2003-2017 Gajim Team') + self.set_license_type(Gtk.License.GPL_3_0) self.set_website('https://gajim.org/') - authors_file_path = self.get_path('AUTHORS') - if authors_file_path: - authors = [] - with open(authors_file_path) as a_file: - authors_file = a_file.read() - authors_file = authors_file.split('\n') - for author in authors_file: - if author == 'CURRENT DEVELOPERS:': - authors.append(_('Current Developers:')) - elif author == 'PAST DEVELOPERS:': - authors.append('\n' + _('Past Developers:')) - elif author != '': # Real author line - authors.append(author) - - thanks_file_path = self.get_path('THANKS') - if thanks_file_path: - authors.append('\n' + _('THANKS:')) - with open(thanks_file_path) as a_file: - text = a_file.read() - text_splitted = text.split('\n') - text = '\n'.join(text_splitted[:-2]) # remove one english sentence - # and add it manually as translatable - text += '\n%s\n' % _('Last but not least, we would like to ' - 'thank all the package maintainers.') - authors.append(text) - - self.set_authors(authors) - - self.props.wrap_license = True - - pixbuf = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', 128) - - self.set_logo(pixbuf) - #here you write your name in the form Name FamilyName <someone@somewhere> + gtk_ver = '%i.%i.%i' % ( + Gtk.get_major_version(), + Gtk.get_minor_version(), + Gtk.get_micro_version()) + gobject_ver = '.'.join(map(str, GObject.pygobject_version)) + + comments = [] + comments.append(_('A GTK+ XMPP client')) + comments.append(_('GTK+ Version: %s' % gtk_ver)) + comments.append(_('PyGObject Version: %s') % gobject_ver) + comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) + self.set_comments("\n".join(comments)) + + self.add_credit_section(_('Current Developers'), const.DEVS_CURRENT) + self.add_credit_section(_('Past Developers'), const.DEVS_PAST) + self.add_credit_section(_('Artists'), const.ARTISTS) + + thanks = const.THANKS + thanks.append('') + thanks.append(_('Last but not least')) + thanks.append(_('we would like to thank all the package maintainers.')) + self.add_credit_section('Thanks', thanks) + self.set_translator_credits(_('translator-credits')) + self.set_logo(gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', 128)) - thanks_artists_file_path = self.get_path('THANKS.artists') - if thanks_artists_file_path: - with open(thanks_artists_file_path) as a_file: - artists_text = a_file.read() - artists = artists_text.split('\n') - self.set_artists(artists) + self.connect( + 'response', lambda dialog, *args: Gtk.AboutDialog.do_close(dialog)) - self.connect('response', self.on_response) self.show_all() - def on_response(self, dialog, response_id): - if response_id == Gtk.ResponseType.DELETE_EVENT: - dialog.destroy() - - def tuple2str(self, tuple_): - str_ = '' - for num in tuple_: - str_ += str(num) + '.' - return str_[0:-1] # remove latest . + # GTK Bug, We have to manually hide the License Button + self.get_action_area().get_children()[1].hide() - def get_path(self, filename): - """ - Where can we find this Credits file? - """ - if os.path.isfile(os.path.join(defs.docdir, filename)): - return os.path.join(defs.docdir, filename) - elif os.path.isfile('../' + filename): - return ('../' + filename) - else: - return None class Dialog(Gtk.Dialog): def __init__(self, parent, title, buttons, default=None, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4372b67433efae9f599fbed2acc501ce80… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4372b67433efae9f599fbed2acc501ce80… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: add issue templates
by Yann Leboulanger 30 Aug '17

30 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 6d3c1d97 by Yann Leboulanger at 2017-08-30T21:25:06+02:00 add issue templates - - - - - 30efd222 by Yann Leboulanger at 2017-08-30T21:32:49+02:00 Merge branch 'master' into 'master' Add issue templates See merge request !127 - - - - - 2 changed files: - + .gitlab/issue_templates/Bug.md - + .gitlab/issue_templates/Enhancement.md Changes: ===================================== .gitlab/issue_templates/Bug.md ===================================== --- /dev/null +++ b/.gitlab/issue_templates/Bug.md @@ -0,0 +1,21 @@ +**Please first check if another issue has been opened for your problem** + +## Versions + + - OS: + - Gajim version: + - GTK version: + - Python-nbxmpp version: + +## Steps to reproduce the problem + + 1. + 1. + 1. + +## Expected behavior + + +## Actual behavior + + ===================================== .gitlab/issue_templates/Enhancement.md ===================================== --- /dev/null +++ b/.gitlab/issue_templates/Enhancement.md @@ -0,0 +1,5 @@ +**Please note by far the quickest way to get a new feature is to file a Merge Request.** + +## Description of the new feature + + View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b7efb3604ed3c0fd2fe95b02b53040390… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b7efb3604ed3c0fd2fe95b02b53040390… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: gtkgui_helpers: remove some unused code
by Yann Leboulanger 28 Aug '17

28 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: fbc58517 by André Apitzsch at 2017-08-27T22:43:47+02:00 gtkgui_helpers: remove some unused code - - - - - b7efb360 by Yann Leboulanger at 2017-08-28T15:38:55+02:00 Merge branch 'gtkgui_helpers' into 'master' gtkgui_helpers: remove some unused code See merge request !125 - - - - - 1 changed file: - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -202,99 +202,6 @@ def get_theme_font_for_option(theme, option): fd.merge(font_desc, True) return fd.to_string() -def get_default_font(): - """ - Get the desktop setting for application font first check for GNOME, then - Xfce and last KDE it returns None on failure or else a string 'Font Size' - """ - try: - gi.require_version('GConf', '2.0') - from gi.repository import GConf - client = GConf.Client.get_default() - value = client.get_string("/desktop/gnome/interface/font_name") - return value.decode("utf8") - except ValueError: - pass - - # try to get Xfce default font - # Xfce 4.2 and higher follow freedesktop.org's Base Directory Specification - # see http://www.xfce.org/~benny/xfce/file-locations.html - # and http://freedesktop.org/Standards/basedir-spec - xdg_config_home = os.environ.get('XDG_CONFIG_HOME', '') - if xdg_config_home == '': - xdg_config_home = os.path.expanduser('~/.config') # default - xfce_config_file = os.path.join(xdg_config_home, - 'xfce4/mcs_settings/Gtk.xml') - - kde_config_file = os.path.expanduser('~/.kde/share/config/kdeglobals') - - if os.path.exists(xfce_config_file): - try: - for line in open(xfce_config_file): - if line.find('name="Gtk/FontName"') != -1: - start = line.find('value="') + 7 - return line[start:line.find('"', start)] - except Exception: - #we talk about file - print(_('Error: cannot open %s for reading') % xfce_config_file, - file=sys.stderr) - - elif os.path.exists(kde_config_file): - try: - for line in open(kde_config_file): - if line.find('font=') == 0: # font=Verdana,9,other_numbers - start = 5 # 5 is len('font=') - line = line[start:] - values = line.split(',') - font_name = values[0] - font_size = values[1] - font_string = '%s %s' % (font_name, font_size) # Verdana 9 - return font_string - except Exception: - #we talk about file - print(_('Error: cannot open %s for reading') % kde_config_file, - file=sys.stderr) - - return None - -def get_running_processes(): - """ - Return running processes or None (if /proc does not exist) - """ - if os.path.isdir('/proc'): - # under Linux: checking if 'gnome-session' or - # 'startkde' programs were run before gajim, by - # checking /proc (if it exists) - # - # if something is unclear, read `man proc`; - # if /proc exists, directories that have only numbers - # in their names contain data about processes. - # /proc/[xxx]/exe is a symlink to executable started - # as process number [xxx]. - # filter out everything that we are not interested in: - files = os.listdir('/proc') - - # files that doesn't have only digits in names... - files = [f for f in files if f.isdigit()] - - # files that aren't directories... - files = [f for f in files if os.path.isdir('/proc/' + f)] - - # processes owned by somebody not running gajim... - # (we check if we have access to that file) - files = [f for f in files if os.access('/proc/' + f +'/exe', os.F_OK)] - - # be sure that /proc/[number]/exe is really a symlink - # to avoid TBs in incorrectly configured systems - files = [f for f in files if os.path.islink('/proc/' + f + '/exe')] - - # list of processes - processes = [os.path.basename(os.readlink('/proc/' + f +'/exe')) for f \ - in files] - - return processes - return [] - def move_window(window, x, y): """ Move the window, but also check if out of screen @@ -358,45 +265,6 @@ def scroll_to_end(widget): return False -class HashDigest: - def __init__(self, algo, digest): - self.algo = self.cleanID(algo) - self.digest = self.cleanID(digest) - - def cleanID(self, id_): - id_ = id_.strip().lower() - for strip in (' :.-_'): - id_ = id_.replace(strip, '') - return id_ - - def __eq__(self, other): - sa, sd = self.algo, self.digest - if isinstance(other, self.__class__): - oa, od = other.algo, other.digest - elif isinstance(other, str): - sa, oa, od = None, None, self.cleanID(other) - elif isinstance(other, tuple) and len(other) == 2: - oa, od = self.cleanID(other[0]), self.cleanID(other[1]) - else: - return False - - return sa == oa and sd == od - - def __ne__(self, other): - return not self == other - - def __hash__(self): - return self.algo ^ self.digest - - def __str__(self): - prettydigest = '' - for i in range(0, len(self.digest), 2): - prettydigest += self.digest[i:i + 2] + ':' - return prettydigest[:-1] - - def __repr__(self): - return "%s(%s, %s)" % (self.__class__, repr(self.algo), repr(str(self))) - class ServersXMLHandler(xml.sax.ContentHandler): def __init__(self): xml.sax.ContentHandler.__init__(self) @@ -433,49 +301,6 @@ def set_unset_urgency_hint(window, unread_messages_no): else: window.props.urgency_hint = False -def get_abspath_for_script(scriptname, want_type = False): - """ - Check if we are svn or normal user and return abspath to asked script if - want_type is True we return 'svn' or 'install' - """ - if os.path.isdir('.svn'): # we are svn user - type_ = 'svn' - cwd = os.getcwd() # it's always ending with src - - if scriptname == 'gajim-remote': - path_to_script = cwd + '/gajim-remote.py' - - elif scriptname == 'gajim': - script = '#!/bin/sh\n' # the script we may create - script += 'cd %s' % cwd - path_to_script = cwd + '/../scripts/gajim_sm_script' - - try: - if os.path.exists(path_to_script): - os.remove(path_to_script) - - f = open(path_to_script, 'w') - script += '\nexec python -OOt gajim.py $0 $@\n' - f.write(script) - f.close() - os.chmod(path_to_script, 0o700) - except OSError: # do not traceback (could be a permission problem) - #we talk about a file here - s = _('Could not write to %s. Session Management support will ' - 'not work') % path_to_script - print(s, file=sys.stderr) - - else: # normal user (not svn user) - type_ = 'install' - # always make it like '/usr/local/bin/gajim' - path_to_script = helpers.is_in_path(scriptname, True) - - - if want_type: - return path_to_script, type_ - else: - return path_to_script - # feeding the image directly into the pixbuf seems possible, but is error prone and causes image distortions and segfaults. # see http://stackoverflow.com/a/8892894/3528174 # and https://developer.gnome.org/gdk-pixbuf/unstable/gdk-pixbuf-Image-Data-in-Me… @@ -734,27 +559,6 @@ def make_pixbuf_grayscale(pixbuf): pixbuf.saturate_and_pixelate(pixbuf2, 0.0, False) return pixbuf2 -def escape_underscore(s): - """ - Escape underlines to prevent them from being interpreted as keyboard - accelerators - """ - return s.replace('_', '__') - -def get_state_image_from_file_path_show(file_path, show): - state_file = show.replace(' ', '_') - files = [] - files.append(os.path.join(file_path, state_file + '.png')) - files.append(os.path.join(file_path, state_file + '.gif')) - image = Gtk.Image() - image.set_from_pixbuf(None) - for file_ in files: - if os.path.exists(file_): - image.set_from_file(file_) - break - - return image - def get_possible_button_event(event): """ Mouse or keyboard caused the event? @@ -839,9 +643,6 @@ def on_avatar_save_as_menuitem_activate(widget, jid, default_name=''): dialog.connect('delete-event', lambda widget, event: on_cancel(widget)) -def on_bm_header_changed_state(widget, event): - widget.set_state(Gtk.StateType.NORMAL) #do not allow selected_state - def create_combobox(value_list, selected_value = None): """ Value_list is [(label1, value1)] View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ec1d75f15b6d3925b4fe77c12083cba10… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ec1d75f15b6d3925b4fe77c12083cba10… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix typo in link
by Philipp Hörist 27 Aug '17

27 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ec1d75f1 by Philipp Hörist at 2017-08-27T22:41:11+02:00 Fix typo in link - - - - - 1 changed file: - gajim/common/rst_xhtml_generator.py Changes: ===================================== gajim/common/rst_xhtml_generator.py ===================================== --- a/gajim/common/rst_xhtml_generator.py +++ b/gajim/common/rst_xhtml_generator.py @@ -94,7 +94,7 @@ else: 'XEP #', 'http://www.xmpp.org/extensions/', 'xep-%04d.html', pos_int_validator) generate_uri_role('gajim-ticket-reference', ('ticket', 'gtrack'), - 'Gajim Ticket #', 'https://dev.gajim.org/gajim/gajim/issues', '%d', + 'Gajim Ticket #', 'https://dev.gajim.org/gajim/gajim/issues/', '%d', pos_int_validator) class HTMLGenerator: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ec1d75f15b6d3925b4fe77c12083cba103… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ec1d75f15b6d3925b4fe77c12083cba103… You're receiving this email because of your account on dev.gajim.org.

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