Commits

commits@gajim.org

17632 discussions

gajim: disco entry is focusable
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 9d12844a3e1f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9d12844a3e1f description: disco entry is focusable diffstat: data/gui/service_discovery_window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7c1788ff05a9 -r 9d12844a3e1f data/gui/service_discovery_window.ui --- a/data/gui/service_discovery_window.ui Sat Jan 05 20:08:07 2013 +0400 +++ b/data/gui/service_discovery_window.ui Sat Jan 05 17:16:07 2013 +0100 @@ -160,7 +160,7 @@ <signal name="changed" handler="on_address_comboboxtext_changed" swapped="no"/> <child internal-child="entry"> <object class="GtkEntry" id="address_entry"> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="activates_default">True</property> </object> </child>

1 0

gajim: fix exec commands and avatar in popups
by Denis Fomin 05 Jan '13

05 Jan '13

changeset 7c1788ff05a9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7c1788ff05a9 description: fix exec commands and avatar in popups diffstat: src/common/helpers.py | 2 +- src/notify.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diffs (27 lines): diff -r 034bc771bb38 -r 7c1788ff05a9 src/common/helpers.py --- a/src/common/helpers.py Sat Jan 05 15:55:30 2013 +0100 +++ b/src/common/helpers.py Sat Jan 05 20:08:07 2013 +0400 @@ -398,7 +398,7 @@ if use_shell: subprocess.Popen('%s &' % command, shell=True).wait() else: - args = shlex.split(command.encode('utf-8')) + args = shlex.split(command) p = subprocess.Popen(args) gajim.thread_interface(p.wait) diff -r 034bc771bb38 -r 7c1788ff05a9 src/notify.py --- a/src/notify.py Sat Jan 05 15:55:30 2013 +0100 +++ b/src/notify.py Sat Jan 05 20:08:07 2013 +0400 @@ -157,8 +157,10 @@ def _nec_notification(self, obj): if obj.do_popup: if isinstance(obj.popup_image, str): - obj.popup_image = gtkgui_helpers.get_icon_path(obj.popup_image, + icon_path = gtkgui_helpers.get_icon_path(obj.popup_image, 48) + if icon_path: + obj.popup_image = icon_path popup(obj.popup_event_type, obj.jid, obj.conn.name, obj.popup_msg_type, path_to_image=obj.popup_image, title=obj.popup_title, text=obj.popup_text,

1 0

gajim: fix style / color things
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 7b912c602f80 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7b912c602f80 description: fix style / color things diffstat: src/chat_control.py | 41 +++++++++++++++++++++++------------------ src/config.py | 9 ++++++--- src/disco.py | 10 ++++++---- src/groupchat_control.py | 22 ++++++++++++++-------- src/gtkgui_helpers.py | 18 +++++++++--------- src/gui_interface.py | 32 -------------------------------- src/message_window.py | 4 ++-- src/roster_window.py | 18 ++++++++++-------- 8 files changed, 70 insertions(+), 84 deletions(-) diffs (truncated from 333 to 300 lines): diff -r 351cd2fa0e4e -r 7b912c602f80 src/chat_control.py --- a/src/chat_control.py Sat Jan 05 18:52:26 2013 +0400 +++ b/src/chat_control.py Sat Jan 05 15:53:14 2013 +0100 @@ -672,7 +672,7 @@ def connect_style_event(self, widget, set_fg=False, set_bg=False): self.disconnect_style_event(widget) id_ = widget.connect('style-set', self._on_style_set_event, set_fg, - set_bg) + set_bg) self.handlers[id_] = widget def _on_style_set_event(self, widget, style, *opts): @@ -683,12 +683,13 @@ """ banner_eventbox = self.xml.get_object('banner_eventbox') self.disconnect_style_event(widget) + context = widget.get_style_context() if opts[1]: - bg_color = widget.get_style().bg[Gtk.StateType.SELECTED] - banner_eventbox.modify_bg(Gtk.StateType.NORMAL, bg_color) + bg_color = context.get_background_color(Gtk.StateFlags.SELECTED) + banner_eventbox.override_background_color(Gtk.StateType.NORMAL, bg_color) if opts[0]: - fg_color = widget.get_style().fg[Gtk.StateType.SELECTED] - widget.modify_fg(Gtk.StateType.NORMAL, fg_color) + fg_color = context.get_color(Gtk.StateFlags.SELECTED) + widget.override_color(Gtk.StateType.NORMAL, fg_color) self.connect_style_event(widget, opts[0], opts[1]) def _conv_textview_key_press_event(self, widget, event): @@ -2510,34 +2511,38 @@ # Draw tab label using chatstate theme = gajim.config.get('roster_theme') - color = None + color_s = None if not chatstate: chatstate = self.contact.chatstate if chatstate is not None: if chatstate == 'composing': - color = gajim.config.get_per('themes', theme, - 'state_composing_color') + color_s = gajim.config.get_per('themes', theme, + 'state_composing_color') elif chatstate == 'inactive': - color = gajim.config.get_per('themes', theme, - 'state_inactive_color') + color_s = gajim.config.get_per('themes', theme, + 'state_inactive_color') elif chatstate == 'gone': - color = gajim.config.get_per('themes', theme, - 'state_gone_color') + color_s = gajim.config.get_per('themes', theme, + 'state_gone_color') elif chatstate == 'paused': - color = gajim.config.get_per('themes', theme, - 'state_paused_color') - if color: + color_s = gajim.config.get_per('themes', theme, + 'state_paused_color') + + context = self.parent_win.notebook.get_style_context() + if color_s: # We set the color for when it's the current tab or not - ok, color = Gdk.Color.parse(color) + color = Gdk.RGBA() + ok = Gdk.RGBA.parse(color, color_s) if not ok: - color = self.parent_win.notebook.get_style().fg[Gtk.StateType.ACTIVE] + del color + color = context.get_color(Gtk.StateFlags.ACTIVE) # In inactive tab color to be lighter against the darker inactive # background if chatstate in ('inactive', 'gone') and\ self.parent_win.get_active_control() != self: color = self.lighten_color(color) else: # active or not chatstate, get color from gtk - color = self.parent_win.notebook.get_style().fg[Gtk.StateType.ACTIVE] + color = context.get_color(Gtk.StateFlags.ACTIVE) name = self.contact.get_shown_name() if self.resource: diff -r 351cd2fa0e4e -r 7b912c602f80 src/config.py --- a/src/config.py Sat Jan 05 18:52:26 2013 +0400 +++ b/src/config.py Sat Jan 05 15:53:14 2013 +0100 @@ -397,8 +397,11 @@ # Default Status messages self.default_msg_tree = self.xml.get_object('default_msg_treeview') - col2 = self.default_msg_tree.get_style().bg[Gtk.StateType.ACTIVE].\ - to_string() + + #FIXME: That doesn't seem to work: + context = self.default_msg_tree.get_style_context() + col2 = context.get_background_color(Gtk.StateFlags.ACTIVE) + # (status, translated_status, message, enabled) model = Gtk.ListStore(str, str, str, bool) self.default_msg_tree.set_model(model) @@ -416,7 +419,7 @@ col.add_attribute(renderer, 'text', 2) renderer.connect('edited', self.on_default_msg_cell_edited) renderer.set_property('editable', True) - renderer.set_property('cell-background', col2) + renderer.set_property('cell-background-rgba', col2) col = Gtk.TreeViewColumn(_('Enabled')) col.set_resizable(True) self.default_msg_tree.append_column(col) diff -r 351cd2fa0e4e -r 7b912c602f80 src/disco.py --- a/src/disco.py Sat Jan 05 18:52:26 2013 +0400 +++ b/src/disco.py Sat Jan 05 15:53:14 2013 +0100 @@ -679,12 +679,14 @@ opts[1] == True -> set bg color """ self.disconnect_style_event() + context = widget.get_style_context() if opts[1]: - bg_color = widget.get_style().bg[Gtk.StateType.SELECTED] - self.banner_eventbox.modify_bg(Gtk.StateType.NORMAL, bg_color) + bg_color = context.get_background_color(Gtk.StateFlags.SELECTED) + self.banner_eventbox.override_background_color(Gtk.StateType.NORMAL, + bg_color) if opts[0]: - fg_color = widget.get_style().fg[Gtk.StateType.SELECTED] - self.banner.modify_fg(Gtk.StateType.NORMAL, fg_color) + fg_color = context.get_color(Gtk.StateFlags.SELECTED) + self.banner.override_color(Gtk.StateType.NORMAL, fg_color) self.banner.ensure_style() self.connect_style_event(opts[0], opts[1]) diff -r 351cd2fa0e4e -r 7b912c602f80 src/groupchat_control.py --- a/src/groupchat_control.py Sat Jan 05 18:52:26 2013 +0400 +++ b/src/groupchat_control.py Sat Jan 05 15:53:14 2013 +0100 @@ -73,12 +73,13 @@ """ Set style for group row, using PRELIGHT system color """ + context = treeview.get_style_context() if set_background: - bgcolor = treeview.get_style().bg[Gtk.StateType.PRELIGHT] - renderer.set_property('cell-background-gdk', bgcolor) + bgcolor = context.get_background_color(Gtk.StateFlags.PRELIGHT) + renderer.set_property('cell-background-rgba', bgcolor) else: - fgcolor = treeview.get_style().fg[Gtk.StateType.PRELIGHT] - renderer.set_property('foreground-gdk', fgcolor) + fgcolor = context.get_color(Gtk.StateFlags.PRELIGHT) + renderer.set_property('foreground-rgba', fgcolor) def tree_cell_data_func(column, renderer, model, iter_, tv=None): # cell data func is global, because we don't want it to keep @@ -661,21 +662,26 @@ color_name = None color = None theme = gajim.config.get('roster_theme') + context = self.parent_win.notebook.get_style_context() if chatstate == 'attention' and (not has_focus or not current_tab): self.attention_flag = True color_name = gajim.config.get_per('themes', theme, - 'state_muc_directed_msg_color') + 'state_muc_directed_msg_color') elif chatstate: if chatstate == 'active' or (current_tab and has_focus): self.attention_flag = False # get active color from gtk - color = self.parent_win.notebook.get_style().fg[Gtk.StateType.ACTIVE] + color = context.get_color(Gtk.StateFlags.ACTIVE) elif chatstate == 'newmsg' and (not has_focus or not current_tab) \ and not self.attention_flag: color_name = gajim.config.get_per('themes', theme, - 'state_muc_msg_color') + 'state_muc_msg_color') if color_name: - color = Gdk.colormap_get_system().alloc_color(color_name) + color = Gdk.RGBA() + ok = Gdk.RGBA.parse(color, color_name) + if not ok: + del color + color = context.get_color(Gtk.StateFlags.ACTIVE) if self.is_continued: # if this is a continued conversation diff -r 351cd2fa0e4e -r 7b912c602f80 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sat Jan 05 18:52:26 2013 +0400 +++ b/src/gtkgui_helpers.py Sat Jan 05 15:53:14 2013 +0100 @@ -523,25 +523,25 @@ def get_fade_color(treeview, selected, focused): """ - Get a gdk color that is between foreground and background in 0.3 + Get a gdk RGBA color that is between foreground and background in 0.3 0.7 respectively colors of the cell for the given treeview """ + context = treeview.get_style_context() style = treeview.get_style() if selected: if focused: # is the window focused? - state = Gtk.StateType.SELECTED + state = Gtk.StateFlags.SELECTED else: # is it not? NOTE: many gtk themes change bg on this - state = Gtk.StateType.ACTIVE + state = Gtk.StateFlags.ACTIVE else: - state = Gtk.StateType.NORMAL - bg = style.base[state] - fg = style.text[state] + state = Gtk.StateFlags.NORMAL + bg = context.get_background_color(state) + fg = context.get_color(state) p = 0.3 # background q = 0.7 # foreground # p + q should do 1.0 - return Gdk.Color(int(bg.red*p + fg.red*q), - int(bg.green*p + fg.green*q), - int(bg.blue*p + fg.blue*q)) + return Gdk.RGBA(bg.red*p + fg.red*q, bg.green*p + fg.green*q, + bg.blue*p + fg.blue*q) def get_scaled_pixbuf(pixbuf, kind): """ diff -r 351cd2fa0e4e -r 7b912c602f80 src/gui_interface.py --- a/src/gui_interface.py Sat Jan 05 18:52:26 2013 +0400 +++ b/src/gui_interface.py Sat Jan 05 15:53:14 2013 +0100 @@ -2299,38 +2299,6 @@ gajim.connections[acct].send_tune(artist, title, source) gajim.connections[acct].music_track_info = music_track_info - def get_bg_fg_colors(self): - def gdkcolor_to_rgb (gdkcolor): - return [c / 65535. for c in (gdkcolor.red, gdkcolor.green, - gdkcolor.blue)] - - def format_rgb (r, g, b): - return ' '.join([str(c) for c in ('rgb', r, g, b)]) - - def format_gdkcolor (gdkcolor): - return format_rgb (*gdkcolor_to_rgb (gdkcolor)) - - # get style colors and create string for dvipng - dummy = Gtk.Invisible() - dummy.ensure_style() - style = dummy.get_style() - bg_str = format_gdkcolor(style.base[Gtk.StateType.NORMAL]) - fg_str = format_gdkcolor(style.text[Gtk.StateType.NORMAL]) - return (bg_str, fg_str) - - def get_fg_color(self, fmt='hex'): - def format_gdkcolor (c): - if fmt == 'tex': - return ' '.join([str(s) for s in - ('rgb', c.red_float, c.green_float, c.blue_float)]) - elif fmt == 'hex': - return str(c) - - # get foreground style color and create string - dummy = Gtk.Invisible() - dummy.ensure_style() - return format_gdkcolor(dummy.get_style().text[Gtk.StateType.NORMAL]) - def read_sleepy(self): """ Check idle status and change that status if needed diff -r 351cd2fa0e4e -r 7b912c602f80 src/message_window.py --- a/src/message_window.py Sat Jan 05 18:52:26 2013 +0400 +++ b/src/message_window.py Sat Jan 05 15:53:14 2013 +0100 @@ -639,8 +639,8 @@ (tab_label_str, tab_label_color) = ctrl.get_tab_label(chatstate) nick_label.set_markup(tab_label_str) if tab_label_color: - nick_label.modify_fg(Gtk.StateType.NORMAL, tab_label_color) - nick_label.modify_fg(Gtk.StateType.ACTIVE, tab_label_color) + nick_label.override_color(Gtk.StateFlags.NORMAL, tab_label_color) + nick_label.override_color(Gtk.StateFlags.ACTIVE, tab_label_color) tab_img = ctrl.get_tab_image() if tab_img: diff -r 351cd2fa0e4e -r 7b912c602f80 src/roster_window.py --- a/src/roster_window.py Sat Jan 05 18:52:26 2013 +0400 +++ b/src/roster_window.py Sat Jan 05 15:53:14 2013 +0100 @@ -5064,11 +5064,13 @@ Set style for treeview cell, using PRELIGHT system color """ if set_background: - bgcolor = self.tree.get_style().bg[style] - renderer.set_property('cell-background-gdk', bgcolor) + context = self.tree.get_style_context() + bgcolor = context.get_background_color(style) + renderer.set_property('cell-background-rgba', bgcolor) else: - fgcolor = self.tree.get_style().fg[style] - renderer.set_property('foreground-gdk', fgcolor) + context = self.tree.get_style_context() + fgcolor = context.get_color(style) + renderer.set_property('foreground-rgba', fgcolor) def _iconCellDataFunc(self, column, renderer, model, titer, data=None): """ @@ -5117,7 +5119,7 @@ if color: renderer.set_property('foreground', color)

1 0

gajim: remove useless line
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 034bc771bb38 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=034bc771bb38 description: remove useless line diffstat: src/gtkgui_helpers.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 7b912c602f80 -r 034bc771bb38 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sat Jan 05 15:53:14 2013 +0100 +++ b/src/gtkgui_helpers.py Sat Jan 05 15:55:30 2013 +0100 @@ -527,7 +527,6 @@ 0.7 respectively colors of the cell for the given treeview """ context = treeview.get_style_context() - style = treeview.get_style() if selected: if focused: # is the window focused? state = Gtk.StateFlags.SELECTED

1 0

gajim: fix missing import
by Denis Fomin 05 Jan '13

05 Jan '13

changeset 351cd2fa0e4e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=351cd2fa0e4e description: fix missing import diffstat: src/disco.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r ad10e812d61f -r 351cd2fa0e4e src/disco.py --- a/src/disco.py Sat Jan 05 15:32:53 2013 +0100 +++ b/src/disco.py Sat Jan 05 18:52:26 2013 +0400 @@ -49,6 +49,7 @@ import weakref from gi.repository import GObject from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import Pango

1 0

gajim: fix disco window (+ remove cmp() + some GTK3 changements)
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset ad10e812d61f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ad10e812d61f description: fix disco window (+ remove cmp() + some GTK3 changements) diffstat: data/gui/service_discovery_window.ui | 90 +++++++++++++++++------- src/command_system/framework.py | 6 +- src/dialogs.py | 4 +- src/disco.py | 127 +++++++++++++++++----------------- src/groupchat_control.py | 2 +- src/htmltextview.py | 21 ++++- 6 files changed, 154 insertions(+), 96 deletions(-) diffs (truncated from 717 to 300 lines): diff -r 2da8f7234eb0 -r ad10e812d61f data/gui/service_discovery_window.ui --- a/data/gui/service_discovery_window.ui Sat Jan 05 18:29:55 2013 +0400 +++ b/data/gui/service_discovery_window.ui Sat Jan 05 15:32:53 2013 +0100 @@ -1,7 +1,6 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  <object class="GtkListStore" id="liststore1"> <columns>  @@ -9,27 +8,31 @@ </columns> </object> <object class="GtkWindow" id="service_discovery_window"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="role">Service Discovery</property> <property name="default_width">550</property> <property name="default_height">420</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_service_discovery_window_destroy"/> + <signal name="destroy" handler="on_service_discovery_window_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox11"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkEventBox" id="banner_agent_eventbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkHBox" id="banner_agent_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="banner_agent_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0.05000000074505806</property> <property name="ypad">6</property> <property name="label"><span weight="heavy" size="large">Agent name</span> @@ -37,18 +40,22 @@ <property name="use_markup">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkImage" id="banner_agent_icon"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xpad">6</property> <property name="ypad">6</property> <property name="stock">gtk-missing-image</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -64,44 +71,38 @@ <child> <object class="GtkTable" id="address_table"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <property name="column_spacing">6</property> <child> - <object class="GtkComboBoxEntry" id="address_comboboxentry"> - <property name="visible">True</property> - <property name="model">liststore1</property> - <property name="text_column">0</property> - <signal name="changed" handler="on_address_comboboxentry_changed"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options">GTK_FILL</property> - </packing> + <placeholder/> </child> <child> <object class="GtkButton" id="browse_button"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <signal name="clicked" handler="on_go_button_clicked"/> + <property name="use_action_appearance">False</property> + <signal name="clicked" handler="on_go_button_clicked" swapped="no"/> <child> <object class="GtkAlignment" id="alignment93"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> <object class="GtkHBox" id="hbox2995"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">2</property> <child> <object class="GtkImage" id="image1148"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-jump-to</property> </object> <packing> @@ -113,6 +114,7 @@ <child> <object class="GtkLabel" id="label362"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">G_o</property> <property name="use_underline">True</property> </object> @@ -132,24 +134,44 @@ <property name="right_attach">3</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> <object class="GtkLabel" id="label224"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Address:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">address_comboboxentry</property> </object> <packing> <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> - <placeholder/> + <object class="GtkComboBoxText" id="address_comboboxtext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <signal name="changed" handler="on_address_comboboxtext_changed" swapped="no"/> + <child internal-child="entry"> + <object class="GtkEntry" id="address_entry"> + <property name="can_focus">False</property> + <property name="activates_default">True</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options">GTK_FILL</property> + </packing> </child> <child> <placeholder/> @@ -157,6 +179,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -164,29 +187,34 @@ <object class="GtkScrolledWindow" id="services_scrollwin"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">etched-in</property> <child> <object class="GtkTreeView" id="services_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - <signal name="row_activated" handler="on_services_treeview_row_activated"/> + <signal name="row-activated" handler="on_services_treeview_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2994"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkProgressBar" id="services_progressbar"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="pulse_step">0.10000000149</property> </object> @@ -199,25 +227,31 @@ <child> <object class="GtkLabel" id="label363"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="action_buttonbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkButton" id="close_button"> <property name="label">gtk-close</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked"/> + <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -229,12 +263,14 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">2</property> <property name="position">3</property> </packing> diff -r 2da8f7234eb0 -r ad10e812d61f src/command_system/framework.py --- a/src/command_system/framework.py Sat Jan 05 18:29:55 2013 +0400 +++ b/src/command_system/framework.py Sat Jan 05 15:32:53 2013 +0100 @@ -181,7 +181,11 @@ return "<Command %s>" % ', '.join(self.names) def __cmp__(self, other): - return cmp(self.first_name, other.first_name) + if self.first_name > other.first_name: + return 1 + if self.first_name < other.first_name: + return -1 + return 0 @property def first_name(self): diff -r 2da8f7234eb0 -r ad10e812d61f src/dialogs.py --- a/src/dialogs.py Sat Jan 05 18:29:55 2013 +0400 +++ b/src/dialogs.py Sat Jan 05 15:32:53 2013 +0100 @@ -311,7 +311,7 @@ self.window.set_position(Gtk.WindowPosition.CENTER_ON_PARENT) self.window.show_all() - def sort_keys(self, model, iter1, iter2): + def sort_keys(self, model, iter1, iter2, data=None): value1 = model[iter1][1]

1 0

gajim: fix traceback in xml console
by Denis Fomin 05 Jan '13

05 Jan '13

changeset 2da8f7234eb0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2da8f7234eb0 description: fix traceback in xml console diffstat: src/dialogs.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r bbc44ddb319b -r 2da8f7234eb0 src/dialogs.py --- a/src/dialogs.py Sat Jan 05 10:58:51 2013 +0100 +++ b/src/dialogs.py Sat Jan 05 18:29:55 2013 +0400 @@ -3370,8 +3370,7 @@ self.account) return begin_iter, end_iter = self.input_tv_buffer.get_bounds() - stanza = self.input_tv_buffer.get_text(begin_iter, end_iter, True).decode( - 'utf-8') + stanza = self.input_tv_buffer.get_text(begin_iter, end_iter, True) if stanza: gajim.connections[self.account].send_stanza(stanza) self.input_tv_buffer.set_text('') # we sent ok, clear the textview

1 0

gajim: fix gnomekeyring import
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset bbc44ddb319b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bbc44ddb319b description: fix gnomekeyring import diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3f14aecac351 -r bbc44ddb319b src/common/passwords.py --- a/src/common/passwords.py Sat Jan 05 13:29:23 2013 +0400 +++ b/src/common/passwords.py Sat Jan 05 10:58:51 2013 +0100 @@ -200,7 +200,7 @@ global GnomeKeyring try: gir = __import__('gi.repository', globals(), locals(), - ['GnomeKeyring'], 0) + ['GnomeKeyring'], 1) GnomeKeyring = gir.GnomeKeyring except ImportError: pass

1 0

gajim: prevent tb in tooltips and gtk warning in roster
by Denis Fomin 05 Jan '13

05 Jan '13

changeset 3f14aecac351 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3f14aecac351 description: prevent tb in tooltips and gtk warning in roster diffstat: src/roster_window.py | 14 +++++++------- src/tooltips.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diffs (77 lines): diff -r 489337d34567 -r 3f14aecac351 src/roster_window.py --- a/src/roster_window.py Sat Jan 05 10:38:39 2013 +0100 +++ b/src/roster_window.py Sat Jan 05 13:29:23 2013 +0400 @@ -1498,7 +1498,7 @@ self.tree.set_cursor(path) def _readjust_expand_collapse_state(self): - def func(model, path, iter_): + def func(model, path, iter_, param): type_ = model[iter_][C_TYPE] acct = model[iter_][C_ACCOUNT] jid = model[iter_][C_JID] @@ -2288,7 +2288,7 @@ 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): + for jid in list(gajim.contacts.get_jid_list(account)): lcontact = gajim.contacts.get_contacts(account, jid) ctrl = gajim.interface.msg_win_mgr.get_gc_control(jid, account) @@ -3520,7 +3520,7 @@ Gdk.ModifierType.MOD1_MASK)) and Gdk.keyval_to_unicode(event.keyval): # if we got unicode symbol without ctrl / alt num = Gdk.keyval_to_unicode(event.keyval) - self.enable_rfilter(unichr(num)) + self.enable_rfilter(chr(num)) elif event.get_state() & Gdk.ModifierType.CONTROL_MASK and event.get_state() & Gdk.ModifierType.SHIFT_MASK and event.keyval == Gdk.KEY_U: self.enable_rfilter('') @@ -4232,7 +4232,7 @@ path = model.get_path(titer) self.tree.expand_row(path, False) elif type_ == 'account': - account = accounts[0] # There is only one cause we don't use merge + account = list(accounts)[0] # There is only one cause we don't use merge if account in self.collapsed_rows: self.collapsed_rows.remove(account) self.draw_account(account) @@ -4435,11 +4435,11 @@ self.refilter_shown_roster_items() # select first row self.tree.get_selection().unselect_all() - def _func(model, path, iter_): + def _func(model, path, iter_, param): if model[iter_][C_TYPE] == 'contact' and self.rfilter_string in \ model[iter_][C_NAME].lower(): col = self.tree.get_column(0) - self.tree.set_cursor_on_cell(path, col) + self.tree.set_cursor_on_cell(path, col, None, False) return True self.modelfilter.foreach(_func, None) @@ -5519,7 +5519,7 @@ if len(gajim.connections) == 0: # user has no accounts advanced_menuitem.set_sensitive(False) elif len(gajim.connections) == 1: # we have one acccount - account = gajim.connections.keys()[0] + account = list(gajim.connections.keys())[0] advanced_menuitem_menu = \ self.get_and_connect_advanced_menuitem_menu(account) self.advanced_menus.append(advanced_menuitem_menu) diff -r 489337d34567 -r 3f14aecac351 src/tooltips.py --- a/src/tooltips.py Sat Jan 05 10:38:39 2013 +0100 +++ b/src/tooltips.py Sat Jan 05 13:29:23 2013 +0400 @@ -504,9 +504,9 @@ if contact.resource: num_resources += 1 if contact.priority in contacts_dict: - contacts_dict[contact.priority].append(contact) + contacts_dict[int(contact.priority)].append(contact) else: - contacts_dict[contact.priority] = [contact] + contacts_dict[int(contact.priority)] = [contact] if num_resources > 1: properties.append((_('Status: '), ' '))

1 0

gajim: fix traceback with Gtk3.6
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 489337d34567 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=489337d34567 description: fix traceback with Gtk3.6 diffstat: src/gui_interface.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 4dbcf5ad36ef -r 489337d34567 src/gui_interface.py --- a/src/gui_interface.py Sat Jan 05 10:09:15 2013 +0100 +++ b/src/gui_interface.py Sat Jan 05 10:38:39 2013 +0100 @@ -1932,7 +1932,8 @@ # Calculate the side lenght of the popup to make it a square size = int(round(math.sqrt(len(self.emoticons_images)))) for image in self.emoticons_images: - item = Gtk.MenuItem() + # In Gtk 3.6, Gtk.MenuItem() doesn't contain a label child + item = Gtk.MenuItem('q') img = Gtk.Image() if isinstance(image[1], GdkPixbuf.PixbufAnimation): img.set_from_animation(image[1])

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