Commits

commits@gajim.org

17632 discussions

gajim: don't crash when Farstream is not installed
by Gajim 26 Mar '14

26 Mar '14

changeset 816e8c24c6db in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=816e8c24c6db description: don't crash when Farstream is not installed diffstat: src/common/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r cf533a346cb8 -r 816e8c24c6db src/common/gajim.py --- a/src/common/gajim.py Tue Mar 25 21:26:57 2014 +0100 +++ b/src/common/gajim.py Wed Mar 26 18:23:58 2014 +0100 @@ -199,7 +199,7 @@ except GLib.GError: HAVE_FARSTREAM = False -except ImportError: +except (ImportError, ValueError): HAVE_FARSTREAM = False HAVE_UPNP_IGD = True

1 0

gajim: start havine audio / video. Doesn't work correctly yet
by Gajim 25 Mar '14

25 Mar '14

changeset cf533a346cb8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cf533a346cb8 description: start havine audio / video. Doesn't work correctly yet diffstat: data/gui/chat_control.ui | 93 ++++++++++++++++++++++++- data/gui/preferences_window.ui | 19 ++++- src/chat_control.py | 2 +- src/common/gajim.py | 17 ++- src/common/jingle.py | 2 +- src/common/jingle_rtp.py | 139 ++++++++++++++++++++------------------ src/common/jingle_transport.py | 85 ++++++++++++----------- src/common/multimedia_helpers.py | 43 +++++------ src/config.py | 1 - src/features_window.py | 2 +- src/gui_interface.py | 2 +- 11 files changed, 252 insertions(+), 153 deletions(-) diffs (truncated from 856 to 300 lines): diff -r 3511d26b1676 -r cf533a346cb8 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Tue Mar 25 14:50:12 2014 +0100 +++ b/data/gui/chat_control.ui Tue Mar 25 21:26:57 2014 +0100 @@ -17,10 +17,9 @@ <property name="can_focus">True</property> <property name="spacing">1</property> <child> - <object class="GtkVBox" id="chat_control_vbox"> + <object class="GtkPaned" id="paned1"> + <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">3</property> - <property name="spacing">1</property> <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> @@ -329,6 +328,7 @@ <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Show a list of emoticons (Alt+M)</property> <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> @@ -391,6 +391,7 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Add this contact to roster (Ctrl+D)</property> <property name="tooltip_text" translatable="yes">Add this contact to roster (Ctrl+D)</property> <property name="relief">none</property> <child> @@ -481,6 +482,7 @@ <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property> <property name="tooltip_text" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> @@ -507,6 +509,7 @@ <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Show the contact&apos;s profile (Ctrl+I)</property> <property name="tooltip_text" translatable="yes">Show the contact's profile (Ctrl+I)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> @@ -533,6 +536,7 @@ <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Browse the chat history (Ctrl+H)</property> <property name="tooltip_text" translatable="yes">Browse the chat history (Ctrl+H)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> @@ -540,7 +544,6 @@ <object class="GtkImage" id="history_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-justify-fill</property> <property name="icon-size">1</property> </object> @@ -571,6 +574,7 @@ <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Show advanced functions (Alt+D)</property> <property name="tooltip_text" translatable="yes">Show advanced functions (Alt+D)</property> <property name="relief">none</property> <property name="focus_on_click">False</property> @@ -610,6 +614,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="has_tooltip">True</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <property name="orientation">vertical</property> @@ -631,6 +636,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="has_tooltip">True</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <property name="yalign">0.4699999988079071</property> @@ -701,6 +707,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Send message</property> <property name="tooltip_text" translatable="yes">Send message</property> <property name="image">image4</property> <property name="use_underline">True</property> @@ -720,9 +728,80 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="resize">False</property> + <property name="shrink">True</property> + </packing> + </child> + <child> + <object class="GtkBox" id="video_hbox"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkFixed" id="outgoing_fixed"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <child> + <object class="GtkViewport" id="viewport1"> + <property name="width_request">160</property> + <property name="height_request">120</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkDrawingArea" id="outgoing_drawingarea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="double_buffered">False</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="vbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkViewport" id="viewport2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkDrawingArea" id="incoming_drawingarea"> + <property name="width_request">320</property> + <property name="height_request">240</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="double_buffered">False</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> </packing> </child> </object> diff -r 3511d26b1676 -r cf533a346cb8 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Tue Mar 25 14:50:12 2014 +0100 +++ b/data/gui/preferences_window.ui Tue Mar 25 21:26:57 2014 +0100 @@ -2363,7 +2363,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -2386,7 +2386,7 @@ <object class="GtkTable" id="table8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">4</property> + <property name="n_rows">5</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -2494,6 +2494,21 @@ <property name="y_options"/> </packing> </child> + <child> + <object class="GtkCheckButton" id="video_see_self_checkbutton"> + <property name="label" translatable="yes">View own video source</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> </object> </child> </object> diff -r 3511d26b1676 -r cf533a346cb8 src/chat_control.py --- a/src/chat_control.py Tue Mar 25 14:50:12 2014 +0100 +++ b/src/chat_control.py Tue Mar 25 21:26:57 2014 +0100 @@ -1798,7 +1798,7 @@ # Video buttons self._video_button.set_sensitive(self.video_available) - # change tooltip text for audio and video buttons if python-farstream is + # change tooltip text for audio and video buttons if farstream is # not installed audio_tooltip_text = _('Toggle audio session') + '\n' video_tooltip_text = _('Toggle video session') + '\n' diff -r 3511d26b1676 -r cf533a346cb8 src/common/gajim.py --- a/src/common/gajim.py Tue Mar 25 14:50:12 2014 +0100 +++ b/src/common/gajim.py Tue Mar 25 21:26:57 2014 +0100 @@ -184,16 +184,19 @@ HAVE_FARSTREAM = True try: - raise ImportError - farstream = __import__('farstream') - import gst - import glib + import gi + gi.require_version('Farstream', '0.2') + from gi.repository import Farstream + gi.require_version('Gst', '1.0') + from gi.repository import Gst + from gi.repository import GLib try: - conference = gst.element_factory_make('fsrtpconference') - session = conference.new_session(farstream.MEDIA_TYPE_AUDIO) + Gst.init(None) + conference = Gst.ElementFactory.make('fsrtpconference', None) + session = conference.new_session(Farstream.MediaType.AUDIO) del session del conference - except: + except GLib.GError: HAVE_FARSTREAM = False except ImportError: diff -r 3511d26b1676 -r cf533a346cb8 src/common/jingle.py --- a/src/common/jingle.py Tue Mar 25 14:50:12 2014 +0100 +++ b/src/common/jingle.py Tue Mar 25 21:26:57 2014 +0100 @@ -61,7 +61,7 @@ """ if sid in self._sessions: #FIXME: Move this elsewhere? - for content in self._sessions[sid].contents.values(): + for content in list(self._sessions[sid].contents.values()): content.destroy() self._sessions[sid].callbacks = [] del self._sessions[sid] diff -r 3511d26b1676 -r cf533a346cb8 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Tue Mar 25 14:50:12 2014 +0100 +++ b/src/common/jingle_rtp.py Tue Mar 25 21:26:57 2014 +0100 @@ -23,9 +23,11 @@ import socket import nbxmpp -import farstream -import gst -from glib import GError +from gi.repository import Farstream +import gi +gi.require_version('Gst', '1.0') +from gi.repository import Gst +from gi.repository import GLib from common import gajim @@ -45,8 +47,8 @@ JingleContent.__init__(self, session, transport) self.media = media self._dtmf_running = False

1 0

gajim: rename goojim iconset images
by Gajim 25 Mar '14

25 Mar '14

changeset ca9f2d4ffdc5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ca9f2d4ffdc5 description: rename goojim iconset images diffstat: data/iconsets/goojim/16x16/not_in_roster.png | Bin data/iconsets/goojim/16x16/not_in_the_roster.png | Bin data/iconsets/goojim/32x32/not_in_roster.png | Bin data/iconsets/goojim/32x32/not_in_the_roster.png | Bin 4 files changed, 0 insertions(+), 0 deletions(-) diffs (8 lines): diff -r f4acdfbbe30b -r ca9f2d4ffdc5 data/iconsets/goojim/16x16/not_in_roster.png Binary file data/iconsets/goojim/16x16/not_in_roster.png has changed diff -r f4acdfbbe30b -r ca9f2d4ffdc5 data/iconsets/goojim/16x16/not_in_the_roster.png Binary file data/iconsets/goojim/16x16/not_in_the_roster.png has changed diff -r f4acdfbbe30b -r ca9f2d4ffdc5 data/iconsets/goojim/32x32/not_in_roster.png Binary file data/iconsets/goojim/32x32/not_in_roster.png has changed diff -r f4acdfbbe30b -r ca9f2d4ffdc5 data/iconsets/goojim/32x32/not_in_the_roster.png Binary file data/iconsets/goojim/32x32/not_in_the_roster.png has changed

1 0

gajim: fix logic
by Gajim 25 Mar '14

25 Mar '14

changeset 3511d26b1676 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3511d26b1676 description: fix logic diffstat: src/gtkgui_helpers.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 3c85815fade8 -r 3511d26b1676 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Tue Mar 25 14:46:47 2014 +0100 +++ b/src/gtkgui_helpers.py Tue Mar 25 14:50:12 2014 +0100 @@ -1100,6 +1100,8 @@ if pix_16_type == Gtk.ImageType.ANIMATION: animation = pix.get_animation() pixbuf = animation.get_static_image() + else: + pixbuf = pix.get_pixbuf() else: pixbuf = pix.get_pixbuf() scaled_pix = pixbuf.scale_simple(24, 24, GdkPixbuf.InterpType.BILINEAR)

1 0

gajim: rename goojim iconset files
by Gajim 25 Mar '14

25 Mar '14

changeset 3c85815fade8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3c85815fade8 description: rename goojim iconset files diffstat: data/iconsets/goojim/16x16/not_in_roster.png | Bin data/iconsets/goojim/16x16/not_in_the_roster.png | Bin data/iconsets/goojim/32x32/not_in_roster.png | Bin data/iconsets/goojim/32x32/not_in_the_roster.png | Bin 4 files changed, 0 insertions(+), 0 deletions(-) diffs (8 lines): diff -r b6b6bd8047ed -r 3c85815fade8 data/iconsets/goojim/16x16/not_in_roster.png Binary file data/iconsets/goojim/16x16/not_in_roster.png has changed diff -r b6b6bd8047ed -r 3c85815fade8 data/iconsets/goojim/16x16/not_in_the_roster.png Binary file data/iconsets/goojim/16x16/not_in_the_roster.png has changed diff -r b6b6bd8047ed -r 3c85815fade8 data/iconsets/goojim/32x32/not_in_roster.png Binary file data/iconsets/goojim/32x32/not_in_roster.png has changed diff -r b6b6bd8047ed -r 3c85815fade8 data/iconsets/goojim/32x32/not_in_the_roster.png Binary file data/iconsets/goojim/32x32/not_in_the_roster.png has changed

1 0

gajim: make buttons in dialog work
by Gajim 23 Mar '14

23 Mar '14

changeset b6b6bd8047ed in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b6b6bd8047ed description: make buttons in dialog work diffstat: src/dialogs.py | 81 +++++++++++++++++++++++++++------------------------------ 1 files changed, 39 insertions(+), 42 deletions(-) diffs (118 lines): diff -r c394704d2ea3 -r b6b6bd8047ed src/dialogs.py --- a/src/dialogs.py Sun Mar 23 20:03:03 2014 +0100 +++ b/src/dialogs.py Sun Mar 23 20:54:54 2014 +0100 @@ -1381,35 +1381,31 @@ self.vbox.set_spacing(12) self.set_resizable(False) - possible_responses = {Gtk.STOCK_OK: self.on_response_ok, - Gtk.STOCK_CANCEL: self.on_response_cancel} for stock, response in buttons: b = self.add_button(stock, response) - for response in possible_responses: - if stock == response: - b.connect('clicked', possible_responses[response]) - break if default is not None: self.set_default_response(default) else: self.set_default_response(buttons[-1][1]) - def on_response_ok(self, widget): - if self.user_response_ok: - if isinstance(self.user_response_ok, tuple): - self.user_response_ok[0](*self.user_response_ok[1:]) - else: - self.user_response_ok() - self.destroy() - - def on_response_cancel(self, widget): - if self.user_response_cancel: - if isinstance(self.user_response_cancel, tuple): - self.user_response_cancel[0](*self.user_response_ok[1:]) - else: - self.user_response_cancel() - self.destroy() + self.connect('response', self.on_response) + + def on_response(self, widget, response_id): + if response_id == Gtk.ResponseType.OK: + if self.user_response_ok: + if isinstance(self.user_response_ok, tuple): + self.user_response_ok[0](*self.user_response_ok[1:]) + else: + self.user_response_ok() + self.destroy() + elif response_id == Gtk.ResponseType.CANCEL: + if self.user_response_cancel: + if isinstance(self.user_response_cancel, tuple): + self.user_response_cancel[0](*self.user_response_ok[1:]) + else: + self.user_response_cancel() + self.destroy() def just_destroy(self, widget): self.destroy() @@ -1431,29 +1427,33 @@ self.format_secondary_markup(sectext) buttons = self.action_area.get_children() - self.possible_responses = {Gtk.STOCK_OK: on_response_ok, - Gtk.STOCK_CANCEL: on_response_cancel, Gtk.STOCK_YES: on_response_yes, - Gtk.STOCK_NO: on_response_no} - for b in buttons: - for response in self.possible_responses: - if b.get_label() == response: - if not self.possible_responses[response]: - b.connect('clicked', self.just_destroy) - elif isinstance(self.possible_responses[response], tuple): - if len(self.possible_responses[response]) == 1: - b.connect('clicked', self.possible_responses[response][0]) - else: - b.connect('clicked', *self.possible_responses[response]) - else: - b.connect('clicked', self.possible_responses[response]) - break - + self.possible_responses = {Gtk.ResponseType.OK: on_response_ok, + Gtk.ResponseType.CANCEL: on_response_cancel, + Gtk.ResponseType.YES: on_response_yes, + Gtk.ResponseType.NO: on_response_no} + + self.connect('response', self.on_response) self.connect('destroy', self.on_dialog_destroy) + def on_response(self, dialog, response_id): + if not response_id in self.possible_responses: + return + if not self.possible_responses[response_id]: + self.destroy() + elif isinstance(self.possible_responses[response_id], tuple): + if len(self.possible_responses[response_id]) == 1: + self.possible_responses[response_id][0](dialog) + else: + self.possible_responses[response_id][0](dialog, + *self.possible_responses[response_id][1:]) + else: + self.possible_responses[response_id](dialog) + + def on_dialog_destroy(self, widget): if not self.call_cancel_on_destroy: return - cancel_handler = self.possible_responses[Gtk.STOCK_CANCEL] + cancel_handler = self.possible_responses[Gtk.ResponseType.CANCEL] if not cancel_handler: return False if isinstance(cancel_handler, tuple): @@ -1461,9 +1461,6 @@ else: cancel_handler(None) - def just_destroy(self, widget): - self.destroy() - def popup(self): """ Show dialog

1 0

gajim: merge GTK3 branch in default
by Gajim 23 Mar '14

23 Mar '14

changeset c394704d2ea3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c394704d2ea3 description: merge GTK3 branch in default diffstat: README.html | 7 +- build.bat | 3 + data/Makefile.am | 4 +- data/gui/account_context_menu.ui | 4 +- data/gui/account_creation_wizard_window.ui | 269 +- data/gui/accounts_window.ui | 124 +- data/gui/add_new_contact_window.ui | 103 +- data/gui/advanced_configuration_window.ui | 1 + data/gui/blocked_contacts_window.ui | 43 +- data/gui/change_status_message_dialog.ui | 164 +- data/gui/chat_control.ui | 1378 +- data/gui/chat_to_muc_window.ui | 45 +- data/gui/dubbleinput_dialog.ui | 114 +- data/gui/edit_groups_dialog.ui | 85 +- data/gui/esession_info_window.ui | 144 +- data/gui/filetransfers.ui | 96 +- data/gui/gajim_themes_window.ui | 54 +- data/gui/groupchat_control.ui | 103 +- data/gui/history_manager.ui | 44 +- data/gui/history_window.ui | 85 +- data/gui/input_dialog.ui | 115 +- data/gui/input_text_dialog.ui | 116 +- data/gui/join_groupchat_window.ui | 134 +- data/gui/manage_bookmarks_window.ui | 24 +- data/gui/manage_pep_services_window.ui | 34 +- data/gui/manage_proxies_window.ui | 33 +- data/gui/manage_sounds_window.ui | 1 + data/gui/message_window.ui | 51 +- data/gui/plugins_window.ui | 177 +- data/gui/preferences_window.ui | 663 +- data/gui/profile_window.ui | 2 +- data/gui/remove_account_window.ui | 43 +- data/gui/roster_window.ui | 286 +- data/gui/search_window.ui | 133 +- data/gui/service_discovery_window.ui | 153 +- data/gui/service_registration_window.ui | 86 +- data/gui/systray_context_menu.ui | 6 +- data/gui/vcard_information_window.ui | 2 + data/gui/xml_console_window.ui | 132 +- data/other/cacerts.pem | 6240 ++++++++----- data/other/dh4096.pem | 21 + gajim.nsi | 8 + icons/hicolor/16x16/status/gajim-muc_separator.png | Bin launch.sh | 2 +- plugins/acronyms_expander/__init__.py | 2 +- plugins/acronyms_expander/acronyms | 69 + plugins/acronyms_expander/acronyms.py | 69 - plugins/acronyms_expander/acronyms_expander.py | 10 +- plugins/dbus_plugin/plugin.py | 6 +- po/he.po | 8868 +++++++++++-------- po/ru.po | 6140 ++++++------- setup_win32.py | 4 +- src/adhoc_commands.py | 33 +- src/advanced_configuration_window.py | 93 +- src/atom_window.py | 28 +- src/cell_renderer_image.py | 93 +- src/chat_control.py | 623 +- src/command_system/dispatcher.py | 11 +- src/command_system/framework.py | 24 +- src/command_system/implementation/custom.py | 2 +- src/command_system/implementation/execute.py | 12 +- src/command_system/implementation/middleware.py | 11 +- src/command_system/implementation/standard.py | 10 +- src/command_system/mapping.py | 31 +- src/command_system/tools.py | 13 +- src/common/atom.py | 6 +- src/common/caps_cache.py | 11 +- src/common/check_X509.py | 2 +- src/common/check_paths.py | 100 +- src/common/commands.py | 28 +- src/common/config.py | 27 +- src/common/configpaths.py | 75 +- src/common/connection.py | 79 +- src/common/connection_handlers.py | 49 +- src/common/connection_handlers_events.py | 153 +- src/common/contacts.py | 19 +- src/common/crypto.py | 49 +- src/common/dataforms.py | 12 +- src/common/dbus_support.py | 18 +- src/common/defs.py | 4 +- src/common/exceptions.py | 12 + src/common/file_props.py | 2 +- src/common/gajim.py | 34 +- src/common/ged.py | 6 +- src/common/gnupg.py | 2 +- src/common/gpg.py | 35 +- src/common/helpers.py | 145 +- src/common/i18n.py | 16 +- src/common/idle.py | 6 +- src/common/jingle.py | 27 +- src/common/jingle_content.py | 27 +- src/common/jingle_ft.py | 52 +- src/common/jingle_ftstates.py | 4 +- src/common/jingle_rtp.py | 68 +- src/common/jingle_session.py | 17 +- src/common/jingle_transport.py | 87 +- src/common/jingle_xtls.py | 119 +- src/common/kwalletbinding.py | 4 +- src/common/logger.py | 77 +- src/common/logging_helpers.py | 12 +- src/common/message_archiving.py | 2 +- src/common/multimedia_helpers.py | 2 +- src/common/nec.py | 2 +- src/common/optparser.py | 32 +- src/common/passwords.py | 126 +- src/common/pep.py | 43 +- src/common/protocol/bytestream.py | 73 +- src/common/proxy65_manager.py | 18 +- src/common/pubsub.py | 14 +- src/common/resolver.py | 49 +- src/common/rst_xhtml_generator.py | 18 +- src/common/sleepy.py | 3 +- src/common/socks5.py | 169 +- src/common/stanza_session.py | 10 +- src/common/zeroconf/client_zeroconf.py | 49 +- src/common/zeroconf/connection_zeroconf.py | 13 +- src/common/zeroconf/roster_zeroconf.py | 12 - src/common/zeroconf/zeroconf_avahi.py | 23 +- src/common/zeroconf/zeroconf_bonjour.py | 10 +- src/config.py | 627 +- src/conversation_textview.py | 331 +- src/dataforms_widget.py | 125 +- src/dialogs.py | 816 +- src/disco.py | 443 +- src/features_window.py | 37 +- src/filetransfers_window.py | 219 +- src/gajim-remote.py | 33 +- src/gajim.py | 160 +- src/gajim_themes_window.py | 47 +- src/groupchat_control.py | 288 +- src/groups.py | 2 +- src/gtkexcepthook.py | 35 +- src/gtkgui_helpers.py | 289 +- src/gtkspell.py | 12 +- src/gui_interface.py | 241 +- src/gui_menu_builder.py | 248 +- src/history_manager.py | 127 +- src/history_window.py | 187 +- src/htmltextview.py | 298 +- src/ipython_view.py | 60 +- src/message_control.py | 4 +- src/message_textview.py | 176 +- src/message_window.py | 205 +- src/music_track_listener.py | 16 +- src/negotiation.py | 2 +- src/network_manager_listener.py | 8 +- src/notify.py | 44 +- src/plugins/__init__.py | 4 +- src/plugins/gui.py | 83 +- src/plugins/helpers.py | 2 +- src/plugins/plugin.py | 37 +- src/plugins/pluginmanager.py | 112 +- src/plugins/plugins_i18n.py | 2 +- src/profile_window.py | 71 +- src/remote_control.py | 52 +- src/roster_window.py | 1126 +- src/search_window.py | 36 +- src/session.py | 17 +- src/statusicon.py | 76 +- src/tooltips.py | 319 +- src/vcard.py | 89 +- test/integration/test_resolver.py | 2 +- test/integration/test_roster.py | 4 +- test/lib/data.py | 90 +- test/lib/mock.py | 2 +- test/runtests.py | 10 +- test/unit/test_jingle.py | 82 +- test/unit/test_socks5.py | 107 +- 168 files changed, 19765 insertions(+), 17174 deletions(-) diffs (truncated from 69047 to 300 lines): diff -r 77d4c5bf1993 -r c394704d2ea3 README.html --- a/README.html Wed Jan 29 16:22:17 2014 +0100 +++ b/README.html Sun Mar 23 20:03:03 2014 +0100 @@ -14,8 +14,9 @@ <h2>Runtime Requirements</h2> <ul> -<li>python2.5 or higher</li> -<li>pygtk2.22 or higher</li> +<li>python2.7 or higher</li> +<li>python-gi</li> +<li>gir1.2-gtk-3.0</li> <li>python-nbxmpp</li> </ul> @@ -28,7 +29,7 @@ <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>gnome-python-desktop (for GnomeKeyring support as password storage)</li> +<li>gir1.2-gnomekeyring-1.0 for GnomeKeyring support as password storage</li> <li>kwalletcli (for support of KDE Wallet as password storage)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> diff -r 77d4c5bf1993 -r c394704d2ea3 build.bat --- a/build.bat Wed Jan 29 16:22:17 2014 +0100 +++ b/build.bat Sun Mar 23 20:03:03 2014 +0100 @@ -22,6 +22,9 @@ copy ..\LIBEAY32.dll bin copy ..\SSLEAY32.dll bin +REM for snarl plugin +xcopy ..\win32com bin\win32com /e /i + mkdir bin\gtk cd ../src/gtk hg archive ..\..\gajim_built\bin\gtk diff -r 77d4c5bf1993 -r c394704d2ea3 data/Makefile.am --- a/data/Makefile.am Wed Jan 29 16:22:17 2014 +0100 +++ b/data/Makefile.am Sun Mar 23 20:03:03 2014 +0100 @@ -12,7 +12,9 @@ sounds_DATA = $(srcdir)/sounds/*.wav otherdir = $(pkgdatadir)/data/other -other_DATA = other/servers.xml other/cacerts.pem +other_DATA = other/servers.xml other/dh4096.pem +# other/cacert.pem is used only on Windows. On Unix platforms +# use CA certificates installed in /etc/ssl/certs man_MANS = gajim.1 gajim-remote.1 gajim-history-manager.1 diff -r 77d4c5bf1993 -r c394704d2ea3 data/gui/account_context_menu.ui --- a/data/gui/account_context_menu.ui Wed Jan 29 16:22:17 2014 +0100 +++ b/data/gui/account_context_menu.ui Sun Mar 23 20:03:03 2014 +0100 @@ -40,7 +40,7 @@ </child> <child> <object class="GtkImageMenuItem" id="join_group_chat_menuitem"> - <property name="label" translatable="yes">Join _Group Chat...</property> + <property name="label" translatable="yes">Join _Group Chat</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image4</property> @@ -93,7 +93,7 @@ </child> <child> <object class="GtkImageMenuItem" id="edit_account_menuitem"> - <property name="label" translatable="yes">_Modify Account</property> + <property name="label" translatable="yes">_Modify Account...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image8</property> diff -r 77d4c5bf1993 -r c394704d2ea3 data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Wed Jan 29 16:22:17 2014 +0100 +++ b/data/gui/account_creation_wizard_window.ui Sun Mar 23 20:03:03 2014 +0100 @@ -1,31 +1,54 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-preferences</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-apply</property> + </object> + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">None</col> + </row> + </data> + </object> <object class="GtkWindow" id="account_creation_wizard_window"> + <property name="can_focus">False</property> <property name="border_width">12</property> <property name="title" translatable="yes">Gajim: Account Creation Wizard</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_wizard_window_destroy"/> + <signal name="destroy" handler="on_wizard_window_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox77"> <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="notebook"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="show_tabs">False</property> <property name="show_border">False</property> <child> <object class="GtkVBox" id="vbox78"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label256"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">You need to have an account in order to connect to the Jabber network.</property> @@ -39,18 +62,20 @@ <child> <object class="GtkFrame" id="frame33"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment68"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">5</property> <property name="left_padding">12</property> <child> <object class="GtkVBox" id="vbox83"> <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="GtkRadioButton" id="use_existing_account_radiobutton"> @@ -59,6 +84,7 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -74,6 +100,7 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">use_existing_account_radiobutton</property> </object> @@ -90,6 +117,7 @@ <child type="label"> <object class="GtkLabel" id="label269"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes"><b>Please choose one of the options below:</b></property> <property name="use_markup">True</property> </object> @@ -106,6 +134,7 @@ <child type="tab"> <object class="GtkLabel" id="label259"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="tab_fill">False</property> @@ -114,12 +143,13 @@ <child> <object class="GtkVBox" id="register_vbox"> <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">12</property> <child> <object class="GtkLabel" id="label270"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Please fill in the data for your existing account</b></property> <property name="use_markup">True</property> @@ -133,25 +163,30 @@ <child> <object class="GtkTable" id="table27"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> + <placeholder/> + </child> + <child> <object class="GtkEntry" id="username_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="key_press_event" handler="on_username_entry_key_press_event"/> + <signal name="key-press-event" handler="on_username_entry_key_press_event" swapped="no"/> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label263"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> @@ -161,7 +196,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -173,9 +208,10 @@ <property name="tooltip_text" translatable="yes">If checked, Gajim will remember the password for this account</property> <property name="use_underline">True</property> <property name="focus_on_click">False</property> + <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_save_password_checkbutton_toggled"/> + <signal name="toggled" handler="on_save_password_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="left_attach">2</property> @@ -183,7 +219,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -198,12 +234,13 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label262"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Jabber ID:</property> <property name="use_underline">True</property> @@ -211,30 +248,20 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">@</property> </object> <packing> <property name="left_attach">2</property>

1 0

gajim: GLib.threads_init is no more needed
by Gajim 23 Mar '14

23 Mar '14

changeset c33bad2056b2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=c33bad2056b2 description: GLib.threads_init is no more needed diffstat: src/gajim.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 8bd765b36c4b -r c33bad2056b2 src/gajim.py --- a/src/gajim.py Sun Mar 23 16:54:00 2014 +0100 +++ b/src/gajim.py Sun Mar 23 16:55:45 2014 +0100 @@ -508,7 +508,6 @@ interface.run() try: - GLib.threads_init() Gtk.main() except KeyboardInterrupt: print('KeyboardInterrupt', file=sys.stderr)

1 0

gajim: fix banner color
by Gajim 23 Mar '14

23 Mar '14

changeset 8bd765b36c4b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8bd765b36c4b description: fix banner color diffstat: src/chat_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 5021a4d523dd -r 8bd765b36c4b src/chat_control.py --- a/src/chat_control.py Sun Mar 23 16:24:59 2014 +0100 +++ b/src/chat_control.py Sun Mar 23 16:54:00 2014 +0100 @@ -615,9 +615,9 @@ if textcolor: color = Gdk.RGBA() Gdk.RGBA.parse(color, textcolor) - banner_name_label.override_background_color(Gtk.StateType.NORMAL, + banner_name_label.override_color(Gtk.StateType.NORMAL, color) - self.banner_status_label.override_background_color( + self.banner_status_label.override_color( Gtk.StateType.NORMAL, color) default_fg = False else:

1 0

gajim: better way to handle close button in about dialog
by Gajim 23 Mar '14

23 Mar '14

changeset 5021a4d523dd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5021a4d523dd description: better way to handle close button in about dialog diffstat: src/dialogs.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diffs (22 lines): diff -r a84d677931e3 -r 5021a4d523dd src/dialogs.py --- a/src/dialogs.py Sun Mar 23 11:37:17 2014 +0100 +++ b/src/dialogs.py Sun Mar 23 16:24:59 2014 +0100 @@ -1344,12 +1344,14 @@ artists_text = a_file.read() artists = artists_text.split('\n') dlg.set_artists(artists) - # connect close button to destroy() function - for button in dlg.action_area.get_children(): - if button.get_property('label') == "_Close": - button.connect('clicked', lambda x:dlg.destroy()) + + dlg.connect('response', self.on_response) dlg.show_all() + def on_response(self, dialog, response_id): + if response_id == Gtk.ResponseType.CANCEL: + dialog.destroy() + def tuple2str(self, tuple_): str_ = '' for num in tuple_:

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