Commits

commits@gajim.org

17632 discussions

gajim: fix some set_transient_for call
by Yann Leboulanger 01 Jan '13

01 Jan '13

changeset f25e1421b8b0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f25e1421b8b0 description: fix some set_transient_for call diffstat: src/config.py | 12 ++++++------ src/dialogs.py | 8 ++++---- src/gajim_themes_window.py | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diffs (108 lines): diff -r 9db6fcd83bdb -r f25e1421b8b0 src/config.py --- a/src/config.py Tue Jan 01 14:26:25 2013 +0400 +++ b/src/config.py Tue Jan 01 11:46:13 2013 +0100 @@ -1299,7 +1299,7 @@ def __init__(self): self.xml = gtkgui_helpers.get_gtk_builder('manage_proxies_window.ui') self.window = self.xml.get_object('manage_proxies_window') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) self.proxies_treeview = self.xml.get_object('proxies_treeview') self.proxyname_entry = self.xml.get_object('proxyname_entry') self.proxytype_combobox = self.xml.get_object('proxytype_combobox') @@ -2749,7 +2749,7 @@ self.is_form = is_form self.xml = gtkgui_helpers.get_gtk_builder('service_registration_window.ui') self.window = self.xml.get_object('service_registration_window') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) if self.is_form: dataform = dataforms.ExtendForm(node = infos) self.data_form_widget = dataforms_widget.DataFormWidget(dataform) @@ -2804,7 +2804,7 @@ self.xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui', 'data_form_window') self.window = self.xml.get_object('data_form_window') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) if self.form: config_vbox = self.xml.get_object('config_vbox') @@ -3023,7 +3023,7 @@ self.account = account xml = gtkgui_helpers.get_gtk_builder('remove_account_window.ui') self.window = xml.get_object('remove_account_window') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) self.remove_and_unregister_radiobutton = xml.get_object( 'remove_and_unregister_radiobutton') self.window.set_title(_('Removing %s account') % self.account) @@ -3130,7 +3130,7 @@ def __init__(self): self.xml = gtkgui_helpers.get_gtk_builder('manage_bookmarks_window.ui') self.window = self.xml.get_object('manage_bookmarks_window') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Passowrd, Nick, # Show_Status @@ -4025,7 +4025,7 @@ def __init__(self, account): self.xml = gtkgui_helpers.get_gtk_builder('manage_pep_services_window.ui') self.window = self.xml.get_object('manage_pep_services_window') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) self.xml.get_object('configure_button').set_sensitive(False) self.xml.get_object('delete_button').set_sensitive(False) self.xml.connect_signals(self) diff -r 9db6fcd83bdb -r f25e1421b8b0 src/dialogs.py --- a/src/dialogs.py Tue Jan 01 14:26:25 2013 +0400 +++ b/src/dialogs.py Tue Jan 01 11:46:13 2013 +0100 @@ -287,7 +287,7 @@ xml = gtkgui_helpers.get_gtk_builder('choose_gpg_key_dialog.ui') self.window = xml.get_object('choose_gpg_key_dialog') self.window.set_title(title_text) - self.set_transient_for(transient_for) + self.window.set_transient_for(transient_for) self.keys_treeview = xml.get_object('keys_treeview') prompt_label = xml.get_object('prompt_label') prompt_label.set_text(prompt_text) @@ -353,7 +353,7 @@ self.text = text self.xml = gtkgui_helpers.get_gtk_builder('change_activity_dialog.ui') self.window = self.xml.get_object('change_activity_dialog') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) self.checkbutton = self.xml.get_object('enable_checkbutton') self.notebook = self.xml.get_object('notebook') @@ -476,7 +476,7 @@ self.xml = gtkgui_helpers.get_gtk_builder('change_mood_dialog.ui') self.window = self.xml.get_object('change_mood_dialog') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) self.window.set_title(_('Set Mood')) table = self.xml.get_object('mood_icons_table') @@ -2359,7 +2359,7 @@ self._empty_required_widgets = [] self.window = self.xml.get_object('join_groupchat_window') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) self._room_jid_entry = self.xml.get_object('room_jid_entry') self._nickname_entry = self.xml.get_object('nickname_entry') self._password_entry = self.xml.get_object('password_entry') diff -r 9db6fcd83bdb -r f25e1421b8b0 src/gajim_themes_window.py --- a/src/gajim_themes_window.py Tue Jan 01 14:26:25 2013 +0400 +++ b/src/gajim_themes_window.py Tue Jan 01 11:46:13 2013 +0100 @@ -34,7 +34,7 @@ def __init__(self): self.xml = gtkgui_helpers.get_gtk_builder('gajim_themes_window.ui') self.window = self.xml.get_object('gajim_themes_window') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) self.options = ['account', 'group', 'contact', 'banner'] self.options_combobox = self.xml.get_object('options_combobox')

1 0

gajim: fix AcronymsExpanderPlugin
by Denis Fomin 01 Jan '13

01 Jan '13

changeset 9db6fcd83bdb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9db6fcd83bdb description: fix AcronymsExpanderPlugin diffstat: plugins/acronyms_expander/acronyms_expander.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (32 lines): diff -r efc6c6430d09 -r 9db6fcd83bdb plugins/acronyms_expander/acronyms_expander.py --- a/plugins/acronyms_expander/acronyms_expander.py Tue Jan 01 14:10:01 2013 +0400 +++ b/plugins/acronyms_expander/acronyms_expander.py Tue Jan 01 14:26:25 2013 +0400 @@ -26,8 +26,8 @@ import sys -import gtk -import gobject +from gi.repository import Gtk +from gi.repository import GObject from plugins import GajimPlugin from plugins.helpers import log, log_calls @@ -66,7 +66,7 @@ #assert isinstance(tb,gtk.TextBuffer) ACRONYMS = self.config['ACRONYMS'] INVOKER = self.config['INVOKER'] - t = tb.get_text(tb.get_start_iter(), tb.get_end_iter()) + t = tb.get_text(tb.get_start_iter(), tb.get_end_iter(), True) #log.debug('%s %d'%(t, len(t))) if t and t[-1] == INVOKER: #log.debug('changing msg text') @@ -77,7 +77,7 @@ #log.debug('head: %s'%(head)) t = ''.join((base, sep, head, INVOKER)) #log.debug("setting text: '%s'"%(t)) - gobject.idle_add(tb.set_text, t) + GObject.idle_add(tb.set_text, t) @log_calls('AcronymsExpanderPlugin') def connect_with_chat_control_base(self, chat_control):

1 0

gajim: fix gtk warnings in console
by Denis Fomin 01 Jan '13

01 Jan '13

changeset efc6c6430d09 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=efc6c6430d09 description: fix gtk warnings in console diffstat: src/roster_window.py | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diffs (84 lines): diff -r 0f616506b4c2 -r efc6c6430d09 src/roster_window.py --- a/src/roster_window.py Tue Jan 01 04:25:12 2013 +0400 +++ b/src/roster_window.py Tue Jan 01 14:10:01 2013 +0400 @@ -90,6 +90,9 @@ C_PADLOCK_PIXBUF, # use for account row only ) = range(11) +empty_pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, 1, 1) + + class RosterWindow: """ Class for main window of the GTK+ interface @@ -1035,7 +1038,7 @@ Gtk.STOCK_DIALOG_AUTHENTICATION, Gtk.IconSize.MENU) self.model[child_iter][C_PADLOCK_PIXBUF] = tls_pixbuf else: - self.model[child_iter][C_PADLOCK_PIXBUF] = "" + self.model[child_iter][C_PADLOCK_PIXBUF] = empty_pixbuf if self.regroup: account_name = _('Merged accounts') @@ -1060,29 +1063,29 @@ pep_dict = gajim.connections[account].pep if gajim.config.get('show_mood_in_roster') and 'mood' in pep_dict: self.model[child_iter][C_MOOD_PIXBUF] = pep_dict['mood'].\ - asPixbufIcon() + asPixbufIcon() else: - self.model[child_iter][C_MOOD_PIXBUF] = "" + self.model[child_iter][C_MOOD_PIXBUF] = empty_pixbuf if gajim.config.get('show_activity_in_roster') and 'activity' in \ pep_dict: self.model[child_iter][C_ACTIVITY_PIXBUF] = pep_dict['activity'].\ asPixbufIcon() else: - self.model[child_iter][C_ACTIVITY_PIXBUF] = "" + self.model[child_iter][C_ACTIVITY_PIXBUF] = empty_pixbuf if gajim.config.get('show_tunes_in_roster') and 'tune' in pep_dict: self.model[child_iter][C_TUNE_PIXBUF] = pep_dict['tune'].\ asPixbufIcon() else: - self.model[child_iter][C_TUNE_PIXBUF] = "" + self.model[child_iter][C_TUNE_PIXBUF] = empty_pixbuf if gajim.config.get('show_location_in_roster') and 'location' in \ pep_dict: self.model[child_iter][C_LOCATION_PIXBUF] = pep_dict['location'].\ asPixbufIcon() else: - self.model[child_iter][C_LOCATION_PIXBUF] = "" + self.model[child_iter][C_LOCATION_PIXBUF] = empty_pixbuf def _really_draw_accounts(self): for acct in self.accounts_to_draw: @@ -1339,7 +1342,7 @@ if pep_type in contact.pep: pixbuf = contact.pep[pep_type].asPixbufIcon() else: - pixbuf = "" + pixbuf = empty_pixbuf for child_iter in iters: self.model[child_iter][model_column] = pixbuf @@ -1350,7 +1353,7 @@ jid = self.model[iters[0]][C_JID].decode('utf-8') pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid) if pixbuf in (None, 'ask'): - scaled_pixbuf = "" + scaled_pixbuf = empty_pixbuf else: scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster') for child_iter in iters: @@ -2279,7 +2282,7 @@ else: # No need to redraw contacts if we're quitting if child_iterA: - self.model[child_iterA][C_AVATAR_PIXBUF] = '' + self.model[child_iterA][C_AVATAR_PIXBUF] = empty_pixbuf if account in gajim.con_types: gajim.con_types[account] = None for jid in gajim.contacts.get_jid_list(account):

1 0

gajim: fix preferences_window.ui
by Denis Fomin 01 Jan '13

01 Jan '13

changeset 0f616506b4c2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0f616506b4c2 description: fix preferences_window.ui diffstat: data/gui/preferences_window.ui | 62 +++++++++++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 9 deletions(-) diffs (truncated from 323 to 300 lines): diff -r ce5f737fb212 -r 0f616506b4c2 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Mon Dec 31 21:14:21 2012 +0400 +++ b/data/gui/preferences_window.ui Tue Jan 01 04:25:12 2013 +0400 @@ -616,6 +616,7 @@ </child> </object> <packing> + <property name="expand">False</property> <property name="position">0</property> </packing> </child> @@ -631,6 +632,8 @@ <signal name="toggled" handler="on_notify_on_signin_checkbutton_toggled"/> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -840,6 +843,7 @@ </child> </object> <packing> + <property name="expand">False</property> <property name="position">0</property> </packing> </child> @@ -854,6 +858,7 @@ <signal name="toggled" handler="on_sound_dnd_checkbutton_toggled"/> </object> <packing> + <property name="expand">False</property> <property name="position">1</property> </packing> </child> @@ -902,12 +907,16 @@ <property name="visible">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="label_xalign">0</property> + <property name="label_yalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment19"> <property name="visible">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="border_width">6</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="yscale">0</property> <property name="left_padding">12</property> <child> <object class="GtkTable" id="table7"> @@ -934,6 +943,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="y_options"/> </packing> </child> <child> @@ -987,6 +997,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="y_options"/> </packing> </child> </object> @@ -1007,9 +1018,13 @@ <property name="position">0</property> </packing> </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">2</property> + <property name="tab_fill">False</property> </packing> </child> <child type="tab"> @@ -1577,6 +1592,7 @@ <property name="right_attach">3</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="y_options"/> </packing> </child> <child> @@ -1616,6 +1632,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="y_options"/> </packing> </child> <child> @@ -1631,8 +1648,7 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="y_options"/> </packing> </child> <child> @@ -1858,6 +1874,8 @@ <signal name="toggled" handler="on_incoming_msg_checkbutton_toggled"/> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -1872,6 +1890,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">False</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> @@ -1882,7 +1901,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"/> + <property name="x_options">GTK_FILL</property> <property name="y_options"/> </packing> </child> @@ -1898,6 +1917,8 @@ <signal name="toggled" handler="on_outgoing_msg_checkbutton_toggled"/> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -1912,6 +1933,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">False</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> @@ -1922,7 +1944,7 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"/> + <property name="x_options">GTK_FILL</property> <property name="y_options"/> </packing> </child> @@ -1959,9 +1981,6 @@ <object class="GtkHBox" id="hbox11"> <property name="visible">True</property> <child> - <placeholder/> - </child> - <child> <object class="GtkColorButton" id="status_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1973,7 +1992,7 @@ <packing> <property name="expand">False</property> <property name="pack_type">end</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> @@ -2089,10 +2108,14 @@ <object class="GtkFrame" id="audio_frame"> <property name="visible">True</property> <property name="label_xalign">0</property> + <property name="label_yalign">1</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment6"> <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="yscale">0</property> <property name="left_padding">12</property> <child> <object class="GtkTable" id="table6"> @@ -2109,6 +2132,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="y_options"/> </packing> </child> <child> @@ -2121,6 +2145,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="y_options"/> </packing> </child> <child> @@ -2166,10 +2191,14 @@ <object class="GtkFrame" id="frame6"> <property name="visible">True</property> <property name="label_xalign">0</property> + <property name="label_yalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment7"> <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="yscale">0</property> <property name="left_padding">12</property> <child> <object class="GtkTable" id="table8"> @@ -2208,6 +2237,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="y_options"/> </packing> </child> <child> @@ -2220,6 +2250,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="y_options"/> </packing> </child> <child> @@ -2256,6 +2287,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="y_options"/> </packing> </child> <child> @@ -2268,6 +2300,7 @@ <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> + <property name="y_options"/> </packing> </child> </object> @@ -2284,6 +2317,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -2291,10 +2325,14 @@ <object class="GtkFrame" id="frame7"> <property name="visible">True</property> <property name="label_xalign">0</property> + <property name="label_yalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment9"> <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="yscale">0</property> <property name="left_padding">12</property> <child> <object class="GtkTable" id="table9"> @@ -2310,6 +2348,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> + <property name="y_options"/> </packing> </child> <child> @@ -2336,6 +2375,7 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> + <property name="y_options"/> </packing> </child> <child> @@ -2350,6 +2390,7 @@ <property name="left_attach">1</property> <property name="right_attach">2</property>

1 0

gajim: fix profile window
by Denis Fomin 31 Dec '12

31 Dec '12

changeset ce5f737fb212 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ce5f737fb212 description: fix profile window diffstat: src/dialogs.py | 9 +++++---- src/profile_window.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diffs (73 lines): diff -r 38add2b37075 -r ce5f737fb212 src/dialogs.py --- a/src/dialogs.py Mon Dec 31 20:13:35 2012 +0400 +++ b/src/dialogs.py Mon Dec 31 21:14:21 2012 +0400 @@ -1458,9 +1458,9 @@ select_multiple=False, current_folder=None, on_response_ok=None, on_response_cancel=None): - GObject.GObject.__init__(self, title=title_text, action=action, - buttons=buttons) - + GObject.GObject.__init__(self, title=title_text, action=action) + self.add_button(buttons[0],buttons[1]) + self.add_button(buttons[2],buttons[3]) self.set_default_response(default_response) self.set_select_multiple(select_multiple) if current_folder and os.path.isdir(current_folder): @@ -4702,7 +4702,8 @@ if path_to_file is None or os.path.isdir(path_to_file): # nothing to preview or directory # make sure you clean image do show nothing - widget.get_preview_widget().set_from_file(None) + preview = widget.get_preview_widget() + preview.clear() return try: pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(path_to_file, 100, 100) diff -r 38add2b37075 -r ce5f737fb212 src/profile_window.py --- a/src/profile_window.py Mon Dec 31 20:13:35 2012 +0400 +++ b/src/profile_window.py Mon Dec 31 21:14:21 2012 +0400 @@ -23,6 +23,7 @@ # THIS FILE IS FOR **OUR** PROFILE (when we edit our INFO) from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject import base64 @@ -46,7 +47,7 @@ def __init__(self, account, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('profile_window.ui') self.window = self.xml.get_object('profile_window') - self.set_transient_for(transient_for) + self.window.set_transient_for(transient_for) self.progressbar = self.xml.get_object('progressbar') self.statusbar = self.xml.get_object('statusbar') self.context_id = self.statusbar.get_context_id('profile') @@ -84,7 +85,7 @@ return True # loop forever def remove_statusbar(self, message_id): - self.statusbar.remove_message(self.context_id, message_id) + self.statusbar.remove(self.context_id, message_id) self.remove_statusbar_timeout_id = None def on_profile_window_destroy(self, widget): @@ -288,7 +289,7 @@ self.set_value(i + '_entry', vcard_[i]) if self.update_progressbar_timeout_id is not None: if self.message_id: - self.statusbar.remove_message(self.context_id, self.message_id) + self.statusbar.remove(self.context_id, self.message_id) self.message_id = self.statusbar.push(self.context_id, _('Information received')) self.remove_statusbar_timeout_id = GObject.timeout_add_seconds(3, @@ -398,7 +399,7 @@ if obj.conn.name != self.account: return if self.message_id: - self.statusbar.remove_message(self.context_id, self.message_id) + self.statusbar.remove(self.context_id, self.message_id) self.message_id = self.statusbar.push(self.context_id, _('Information NOT published')) self.remove_statusbar_timeout_id = GObject.timeout_add_seconds(3,

1 0

gajim: fix plugin window
by Denis Fomin 31 Dec '12

31 Dec '12

changeset 38add2b37075 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=38add2b37075 description: fix plugin window diffstat: data/gui/plugins_window.ui | 4 +++- src/plugins/gui.py | 14 ++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diffs (61 lines): diff -r 3811c43b31b8 -r 38add2b37075 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Mon Dec 31 19:38:32 2012 +0400 +++ b/data/gui/plugins_window.ui Mon Dec 31 20:13:35 2012 +0400 @@ -115,8 +115,10 @@ <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">&lt;empty&gt;</property> - <property name="use_markup">True</property> <property name="selectable">True</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> diff -r 3811c43b31b8 -r 38add2b37075 src/plugins/gui.py --- a/src/plugins/gui.py Mon Dec 31 19:38:32 2012 +0400 +++ b/src/plugins/gui.py Mon Dec 31 20:13:35 2012 +0400 @@ -56,7 +56,7 @@ '''Initialize Plugins window''' self.xml = gtkgui_helpers.get_gtk_builder('plugins_window.ui') self.window = self.xml.get_object('plugins_window') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) widgets_to_extract = ('plugins_notebook', 'plugin_name_label', 'plugin_version_label', 'plugin_authors_label', @@ -67,10 +67,6 @@ for widget_name in widgets_to_extract: setattr(self, widget_name, self.xml.get_object(widget_name)) - attr_list = Pango.AttrList() - attr_list.insert(Pango.AttrWeight(Pango.Weight.BOLD, 0, -1)) - self.plugin_name_label.set_attributes(attr_list) - self.installed_plugins_model = Gtk.ListStore(GObject.TYPE_PYOBJECT, GObject.TYPE_STRING, GObject.TYPE_BOOLEAN, GObject.TYPE_BOOLEAN, GdkPixbuf.Pixbuf) @@ -80,9 +76,9 @@ renderer = Gtk.CellRendererText() col = Gtk.TreeViewColumn(_('Plugin'))#, renderer, text=NAME) cell = Gtk.CellRendererPixbuf() - col.pack_start(cell, False, True, 0) + col.pack_start(cell, False) col.add_attribute(cell, 'pixbuf', ICON) - col.pack_start(renderer, True, True, 0) + col.pack_start(renderer, True) col.add_attribute(renderer, 'text', NAME) self.installed_plugins_treeview.append_column(col) @@ -105,7 +101,9 @@ self._clear_installed_plugin_info() self.fill_installed_plugins_model() - selection.select_iter(self.installed_plugins_model.get_iter_first()) + root_iter = self.installed_plugins_model.get_iter_first() + if root_iter: + selection.select_iter(root_iter ) self.xml.connect_signals(self)

1 0

gajim: fix pixbuf saves and missing import
by Denis Fomin 31 Dec '12

31 Dec '12

changeset 3811c43b31b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3811c43b31b8 description: fix pixbuf saves and missing import diffstat: src/gtkgui_helpers.py | 6 +++--- src/gui_interface.py | 6 +++--- src/profile_window.py | 2 +- src/vcard.py | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diffs (82 lines): diff -r 12e91e17fdd9 -r 3811c43b31b8 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/gtkgui_helpers.py Mon Dec 31 19:38:32 2012 +0400 @@ -421,7 +421,7 @@ return None if want_type: - typ = pixbufloader.get_format()['name'] + typ = pixbufloader.get_format().get_name() return pixbuf, typ else: return pixbuf @@ -828,14 +828,14 @@ # Save image try: - pixbuf.save(file_path, image_format) + pixbuf.savev(file_path, image_format, [], []) except Exception, e: log.debug('Error saving avatar: %s' % str(e)) if os.path.exists(file_path): os.remove(file_path) new_file_path = '.'.join(file_path.split('.')[:-1]) + '.jpeg' def on_ok(file_path, pixbuf): - pixbuf.save(file_path, 'jpeg') + pixbuf.savev(file_path, 'jpeg', [], []) dialogs.ConfirmationDialog(_('Extension not supported'), _('Image cannot be saved in %(type)s format. Save as ' '%(new_filename)s?') % {'type': image_format, diff -r 12e91e17fdd9 -r 3811c43b31b8 src/gui_interface.py --- a/src/gui_interface.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/gui_interface.py Mon Dec 31 19:38:32 2012 +0400 @@ -2489,7 +2489,7 @@ extension = '.png' path_to_original_file = path_to_file + extension try: - pixbuf.save(path_to_original_file, typ) + pixbuf.savev(path_to_original_file, typ, [], []) except Exception, e: log.error('Error writing avatar file %s: %s' % ( path_to_original_file, str(e))) @@ -2499,7 +2499,7 @@ path_to_normal_file = path_to_file + '_notif_size_colored' + \ extension try: - pixbuf.save(path_to_normal_file, 'png') + pixbuf.savev(path_to_normal_file, 'png', [], []) except Exception, e: log.error('Error writing avatar file %s: %s' % \ (path_to_original_file, str(e))) @@ -2509,7 +2509,7 @@ if bwbuf: path_to_bw_file = path_to_file + '_notif_size_bw' + extension try: - bwbuf.save(path_to_bw_file, 'png') + bwbuf.savev(path_to_bw_file, 'png', [], []) except Exception, e: log.error('Error writing avatar file %s: %s' % \ (path_to_original_file, str(e))) diff -r 12e91e17fdd9 -r 3811c43b31b8 src/profile_window.py --- a/src/profile_window.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/profile_window.py Mon Dec 31 19:38:32 2012 +0400 @@ -150,7 +150,7 @@ if scaled_pixbuf: path_to_file = os.path.join(gajim.TMP, 'avatar_scaled.png') - scaled_pixbuf.save(path_to_file, 'png') + scaled_pixbuf.savev(path_to_file, 'png', [], []) must_delete = True fd = open(path_to_file, 'rb') diff -r 12e91e17fdd9 -r 3811c43b31b8 src/vcard.py --- a/src/vcard.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/vcard.py Mon Dec 31 19:38:32 2012 +0400 @@ -33,6 +33,7 @@ from gi.repository import Gtk from gi.repository import GObject +from gi.repository import Gdk import base64 import time import locale

1 0

gajim: fix time in tooltips
by Denis Fomin 31 Dec '12

31 Dec '12

changeset 12e91e17fdd9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=12e91e17fdd9 description: fix time in tooltips diffstat: src/tooltips.py | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diffs (51 lines): diff -r 5aba9c99b414 -r 12e91e17fdd9 src/tooltips.py --- a/src/tooltips.py Mon Dec 31 13:48:15 2012 +0100 +++ b/src/tooltips.py Mon Dec 31 19:05:59 2012 +0400 @@ -644,8 +644,10 @@ 'tooltip_idle_color') cs += '%s</span>' properties.append((str(), None)) - properties.append(((cs % _("Idle since %s")) % formatted, None)) - properties.append(((cs % _("Idle for %s")) % str(diff), None)) + idle_since = helpers.ensure_utf8_string(cs % _("Idle since %s")) + properties.append((idle_since % formatted, None)) + idle_for = helpers.ensure_utf8_string(cs % _("Idle for %s")) + properties.append((idle_for % str(diff), None)) while properties: property_ = properties.pop(0) @@ -658,14 +660,15 @@ if property_[1]: label.set_markup(property_[0]) vcard_table.attach(label, 1, 2, vcard_current_row, - vcard_current_row + 1, Gtk.AttachOptions.FILL, vertical_fill, 0, 0) + vcard_current_row + 1, Gtk.AttachOptions.FILL, + vertical_fill, 0, 0) label = Gtk.Label() label.set_alignment(0, 0) label.set_markup(property_[1]) label.set_line_wrap(True) vcard_table.attach(label, 2, 3, vcard_current_row, - vcard_current_row + 1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, - vertical_fill, 0, 0) + vcard_current_row + 1, Gtk.AttachOptions.EXPAND | \ + Gtk.AttachOptions.FILL, vertical_fill, 0, 0) else: if isinstance(property_[0], (unicode, str)): # FIXME: rm unicode? label.set_markup(property_[0]) @@ -673,11 +676,13 @@ else: label = property_[0] vcard_table.attach(label, 1, 3, vcard_current_row, - vcard_current_row + 1, Gtk.AttachOptions.FILL, vertical_fill, 0) + vcard_current_row + 1, Gtk.AttachOptions.FILL, + vertical_fill, 0) self.avatar_image.set_alignment(0, 0) if table_size == 4: vcard_table.attach(self.avatar_image, 3, 4, 2, - vcard_current_row + 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND, 3, 3) + vcard_current_row + 1, Gtk.AttachOptions.FILL, + Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND, 3, 3) gajim.plugin_manager.gui_extension_point('roster_tooltip_populate', self, contacts, vcard_table)

1 0

gajim: fix dubble click on a boolean value in ACE
by Yann Leboulanger 31 Dec '12

31 Dec '12

changeset 5aba9c99b414 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5aba9c99b414 description: fix dubble click on a boolean value in ACE diffstat: src/advanced_configuration_window.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (20 lines): diff -r 0104896629b8 -r 5aba9c99b414 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Mon Dec 31 13:38:08 2012 +0100 +++ b/src/advanced_configuration_window.py Mon Dec 31 13:48:15 2012 +0100 @@ -197,12 +197,12 @@ if modelrow[2] == self.types['boolean']: for key in self.right_true_dict.keys(): if self.right_true_dict[key] == modelrow[1]: - modelrow[1] = key + modelrow[1] = str(key) newval = {'False': True, 'True': False}[modelrow[1]] - if len(modelpath) > 1: - optnamerow = self.model[modelpath[0]] + if len(modelpath.get_indices()) > 1: + optnamerow = self.model[modelpath.get_indices()[0]] optname = optnamerow[0].decode('utf-8') - keyrow = self.model[modelpath[:2]] + keyrow = self.model[modelpath.get_indices()[:2]] key = keyrow[0].decode('utf-8') self.remember_option(option + '\n' + key + '\n' + optname, modelrow[1], newval)

1 0

gajim: fix about dialog
by Yann Leboulanger 31 Dec '12

31 Dec '12

changeset 0104896629b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0104896629b8 description: fix about dialog diffstat: src/dialogs.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diffs (34 lines): diff -r be0c8201a654 -r 0104896629b8 src/dialogs.py --- a/src/dialogs.py Mon Dec 31 15:43:53 2012 +0400 +++ b/src/dialogs.py Mon Dec 31 13:38:08 2012 +0100 @@ -1275,9 +1275,11 @@ text = open(copying_file_path).read() dlg.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) dlg.set_comments('%s\n%s %s\n%s %s' % (_('A GTK+ Jabber/XMPP client'), - _('GTK+ Version:'), self.tuple2str(Gtk.gtk_version), \ - _('PyGTK Version:'), self.tuple2str(Gtk.pygtk_version))) + _('GTK+ Version:'), gtk_ver, _('PyGobject Version:'), gobject_ver)) dlg.set_website('http://gajim.org/') authors_file_path = self.get_path('AUTHORS') @@ -1297,12 +1299,13 @@ if thanks_file_path: authors.append('\n' + _('THANKS:')) - text = open(thanks_file_path).read() + text = helpers.ensure_utf8_string(open(thanks_file_path).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.') + text += helpers.ensure_utf8_string('\n%s\n' % _('Last but not ' + 'least, we would like to thank all the package maintainers.' + )) authors.append(text) dlg.set_authors(authors)

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