Commits August 2007

commits@gajim.org

7 participants
239 discussions

[commit-gajim] r8545 - trunk/src
by roidelapluie＠gajim.org 22 Aug '07

22 Aug '07

Author: roidelapluie Date: 2007-08-22 13:51:58 +0200 (Wed, 22 Aug 2007) New Revision: 8545 Modified: trunk/src/dialogs.py Log: Sort Friends by name in "Invite Friends" window. See #2095. Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-22 11:48:51 UTC (rev 8544) +++ trunk/src/dialogs.py 2007-08-22 11:51:58 UTC (rev 8545) @@ -3244,6 +3244,7 @@ # set treeview # name, jid self.store = gtk.ListStore(gtk.gdk.Pixbuf, str, str) + self.store.set_sort_column_id(1, gtk.SORT_ASCENDING) self.guests_treeview.set_model(self.store) renderer1 = gtk.CellRendererText()

1 0

[commit-gajim] r8544 - trunk/data/glade
by asterix＠gajim.org 22 Aug '07

22 Aug '07

Author: asterix Date: 2007-08-22 13:48:51 +0200 (Wed, 22 Aug 2007) New Revision: 8544 Modified: trunk/data/glade/chat_to_muc_window.glade Log: add spaces in chat_to_muc vbox. looks nicer Modified: trunk/data/glade/chat_to_muc_window.glade =================================================================== --- trunk/data/glade/chat_to_muc_window.glade 2007-08-22 11:46:35 UTC (rev 8543) +++ trunk/data/glade/chat_to_muc_window.glade 2007-08-22 11:48:51 UTC (rev 8544) @@ -10,6 +10,7 @@ <child> <widget class="GtkVBox" id="general_vbox"> <property name="visible">True</property> + <property name="spacing">6</property> <child> <widget class="GtkLabel" id="label3"> <property name="visible">True</property>

1 0

[commit-gajim] r8543 - trunk/src
by asterix＠gajim.org 22 Aug '07

22 Aug '07

Author: asterix Date: 2007-08-22 13:46:35 +0200 (Wed, 22 Aug 2007) New Revision: 8543 Modified: trunk/src/gajim.py Log: allow participants to invite contacts in continued groupchats. see #2095 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-08-22 11:39:42 UTC (rev 8542) +++ trunk/src/gajim.py 2007-08-22 11:46:35 UTC (rev 8543) @@ -208,6 +208,7 @@ from common import gajim from common import helpers from common import optparser +from common import dataforms if verbose: gajim.verbose = True del verbose @@ -1207,8 +1208,16 @@ #('GC_CONFIG', account, (jid, form)) config is a dict room_jid = array[0].split('/')[0] if room_jid in gajim.automatic_rooms[account]: - # use default configuration - gajim.connections[account].send_gc_config(room_jid, array[1]) + if gajim.automatic_rooms[account][room_jid].has_key('continue_tag'): + # We're converting chat to muc. allow participants to invite + form = dataforms.ExtendForm(node = array[1]) + for f in form.iter_fields(): + if f.var == 'muc#roomconfig_allowinvites': + f.value = True + gajim.connections[account].send_gc_config(room_jid, form) + else: + # use default configuration + gajim.connections[account].send_gc_config(room_jid, array[1]) # invite contacts # check if it is necessary to add <continue /> continue_tag = False

1 0

[commit-gajim] r8542 - trunk/src
by roidelapluie＠gajim.org 22 Aug '07

22 Aug '07

Author: roidelapluie Date: 2007-08-22 13:39:42 +0200 (Wed, 22 Aug 2007) New Revision: 8542 Modified: trunk/src/dialogs.py Log: Fix a stupid bug in [8541]. Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-22 11:35:00 UTC (rev 8541) +++ trunk/src/dialogs.py 2007-08-22 11:39:42 UTC (rev 8542) @@ -3291,7 +3291,7 @@ def unique_room_id_supported(self, server, room_id): guest_list = [] guests = self.guests_treeview.get_selection().get_selected_rows() - for guest in guests[2]: + for guest in guests[1]: iter = self.store.get_iter(guest) guest_list.append(self.store[iter][2].decode('utf-8')) for guest in self.auto_jids:

1 0

[commit-gajim] r8541 - trunk/src
by roidelapluie＠gajim.org 22 Aug '07

22 Aug '07

Author: roidelapluie Date: 2007-08-22 13:35:00 +0200 (Wed, 22 Aug 2007) New Revision: 8541 Modified: trunk/src/dialogs.py Log: Add Status Icon to contacts in "Invite Friends" window. Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-22 11:33:37 UTC (rev 8540) +++ trunk/src/dialogs.py 2007-08-22 11:35:00 UTC (rev 8541) @@ -3243,12 +3243,15 @@ # set treeview # name, jid - self.store = gtk.ListStore(str, str) + self.store = gtk.ListStore(gtk.gdk.Pixbuf, str, str) self.guests_treeview.set_model(self.store) renderer1 = gtk.CellRendererText() - column = gtk.TreeViewColumn('Name', renderer1, text=0) + renderer2 = gtk.CellRendererPixbuf() + column = gtk.TreeViewColumn('Status', renderer2, pixbuf=0) self.guests_treeview.append_column(column) + column = gtk.TreeViewColumn('Name', renderer1, text=1) + self.guests_treeview.append_column(column) self.guests_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE) @@ -3262,10 +3265,12 @@ not contact_transport and \ contact.jid not in gajim.interface.minimized_controls[account]: if contact.show not in ('offline', 'error'): + img = gajim.interface.roster.jabber_state_images['16'][ + contact.show] name = contact.name if name == '': name = jid.split('@')[0] - self.store.append([name, jid]) + self.store.append([img.get_pixbuf(), name, jid]) # show all self.window.show_all() @@ -3286,9 +3291,9 @@ def unique_room_id_supported(self, server, room_id): guest_list = [] guests = self.guests_treeview.get_selection().get_selected_rows() - for guest in guests[1]: + for guest in guests[2]: iter = self.store.get_iter(guest) - guest_list.append(self.store[iter][1].decode('utf-8')) + guest_list.append(self.store[iter][2].decode('utf-8')) for guest in self.auto_jids: guest_list.append(guest) room_jid = room_id + '@' + server

1 0

[commit-gajim] r8540 - trunk/src/common/zeroconf
by asterix＠gajim.org 22 Aug '07

22 Aug '07

Author: asterix Date: 2007-08-22 13:33:37 +0200 (Wed, 22 Aug 2007) New Revision: 8540 Modified: trunk/src/common/zeroconf/connection_zeroconf.py Log: zeroconf don't support private storage Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-08-22 11:10:54 UTC (rev 8539) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-08-22 11:33:37 UTC (rev 8540) @@ -91,6 +91,7 @@ self.muc_jid = {} # jid of muc server for each transport type self.vcard_supported = False + self.private_storage_supported = False def get_config_values_or_default(self): ''' get name, host, port from config, or

1 0

[commit-gajim] r8539 - in trunk: data/glade src
by asterix＠gajim.org 22 Aug '07

22 Aug '07

Author: asterix Date: 2007-08-22 13:10:54 +0200 (Wed, 22 Aug 2007) New Revision: 8539 Modified: trunk/data/glade/chat_to_muc_window.glade trunk/src/dialogs.py Log: nicer chat2muc window. see #2095 Modified: trunk/data/glade/chat_to_muc_window.glade =================================================================== --- trunk/data/glade/chat_to_muc_window.glade 2007-08-22 10:57:16 UTC (rev 8538) +++ trunk/data/glade/chat_to_muc_window.glade 2007-08-22 11:10:54 UTC (rev 8539) @@ -1,275 +1,182 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> + <glade-interface> - -<widget class="GtkWindow" id="chat_to_muc_window"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="title" translatable="yes">Invite Friends !</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - - <child> - <widget class="GtkVBox" id="general_vbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="server_select_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">You are going to begin a Multi-User Chat. -First please select a MUC server.</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">4</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkComboBoxEntry" id="server_list_comboboxentry"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="has_frame">True</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHSeparator" id="server_and_guests_hseparator"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">4</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="info_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">Select the friends you want to invite.</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">4</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkScrolledWindow" id="guests_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="guests_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - <signal name="drag_data_received" handler="on_guests_treeview_drag_data_received" last_modification_time="Mon, 16 Jul 2007 13:49:16 GMT"/> - <signal name="drag_end" handler="on_guests_treeview_drag_end" last_modification_time="Mon, 16 Jul 2007 14:02:56 GMT"/> - <signal name="drag_data_get" handler="on_guests_treeview_drag_data_get" last_modification_time="Mon, 16 Jul 2007 14:04:27 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">4</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="invite_cancel_hbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="empty_label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Sun, 15 Jul 2007 08:42:47 GMT"/> - </widget> - <packing> - <property name="padding">3</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="invite_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_invite_button_clicked" last_modification_time="Sun, 15 Jul 2007 08:42:41 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">In_vite</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">3</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">4</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - + <widget class="GtkWindow" id="chat_to_muc_window"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="title" translatable="yes">Invite Friends !</property> + <signal name="key_press_event" handler="on_chat_to_muc_window_key_press_event"/> + <child> + <widget class="GtkVBox" id="general_vbox"> + <property name="visible">True</property> + <child> + <widget class="GtkLabel" id="label3"> + <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" translatable="yes">You are going to begin a Multi-User Chat. +Select the contacts you want to invite</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">4</property> + </packing> + </child> + <child> + <widget class="GtkScrolledWindow" id="guests_scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <child> + <widget class="GtkTreeView" id="guests_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <signal name="drag_data_get" handler="on_guests_treeview_drag_data_get"/> + <signal name="drag_data_received" handler="on_guests_treeview_drag_data_received"/> + <signal name="drag_end" handler="on_guests_treeview_drag_end"/> + </widget> + </child> + </widget> + <packing> + <property name="padding">4</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkExpander" id="expander1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkVBox" id="vbox1"> + <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> + <child> + <widget class="GtkLabel" id="server_select_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">Please select a MUC server.</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">4</property> + </packing> + </child> + <child> + <widget class="GtkComboBoxEntry" id="server_list_comboboxentry"> + <property name="visible">True</property> + <child internal-child="entry"> + <widget class="GtkEntry" id="comboboxentry-entry1"> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label2"> + <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" translatable="yes">MUC server</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkHButtonBox" id="hbuttonbox1"> + <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="spacing">6</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + <child> + <widget class="GtkButton" id="cancel_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_cancel_button_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">3</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="invite_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_invite_button_clicked"/> + <child> + <widget class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes">In_vite</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">3</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + </widget> + </child> + </widget> </glade-interface> Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-22 10:57:16 UTC (rev 8538) +++ trunk/src/dialogs.py 2007-08-22 11:10:54 UTC (rev 8539) @@ -3208,13 +3208,11 @@ self.xml = gtkgui_helpers.get_glade('chat_to_muc_window.glade') self.window = self.xml.get_widget('chat_to_muc_window') - self.window.connect('key_press_event', self._on_keypress_event) for widget_to_add in ('invite_button', 'cancel_button', 'server_list_comboboxentry', 'guests_treeview', 'server_and_guests_hseparator', 'server_select_label'): self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add) - self.window.connect('key_press_event', self._on_keypress_event) # set comboboxentry renderer_servers = gtk.CellRendererText() @@ -3269,33 +3267,15 @@ name = jid.split('@')[0] self.store.append([name, jid]) - # show all but... + # show all self.window.show_all() - # ...hide this - self.server_selection_visible = True - self.toggle_server_selection_visible() - self.xml.signal_autoconnect(self) - def toggle_server_selection_visible(self): - if self.server_selection_visible: - self.server_selection_visible = False - self.server_and_guests_hseparator.hide() - self.server_list_comboboxentry.hide() - self.server_select_label.hide() - else: - self.server_selection_visible = True - self.server_and_guests_hseparator.show() - self.server_list_comboboxentry.show() - self.server_select_label.show() + def on_chat_to_muc_window_key_press_event(self, widget, event): + if event.keyval == gtk.keysyms.Escape: # ESCAPE + self.window.destroy() - def _on_keypress_event(self, widget, event): - if (event.state & gtk.gdk.MOD1_MASK) and (event.keyval == gtk.keysyms.c \ - or event.keyval == gtk.keysyms.C): - self.toggle_server_selection_visible() - return True - def on_invite_button_clicked(self, widget): server = self.server_list_comboboxentry.get_active_text() if server == '':

1 0

[commit-gajim] r8538 - trunk/src
by asterix＠gajim.org 22 Aug '07

22 Aug '07

Author: asterix Date: 2007-08-22 12:57:16 +0200 (Wed, 22 Aug 2007) New Revision: 8538 Modified: trunk/src/dialogs.py Log: use XEP-45 unique room creation if server supports it. see #2095 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-22 00:50:48 UTC (rev 8537) +++ trunk/src/dialogs.py 2007-08-22 10:57:16 UTC (rev 8538) @@ -3216,9 +3216,6 @@ self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add) self.window.connect('key_press_event', self._on_keypress_event) - # set a list of servers which support it - self.servers_support = {} - # set comboboxentry renderer_servers = gtk.CellRendererText() @@ -3304,14 +3301,9 @@ if server == '': return room_id = gajim.nicks[self.account] + str(randrange(9999999)) -# if self.servers_support.has_key(server): -# self.unique_room_id_supported(server, self.servers_support[server]) -# return -# gajim.connections[self.account].check_unique_room_id_support(server, self) + gajim.connections[self.account].check_unique_room_id_support(server, self) -# def unique_room_id_supported(self, server, room_id): -# if not self.servers_support.has_key(server): -# self.servers_support[server] = room_id + def unique_room_id_supported(self, server, room_id): guest_list = [] guests = self.guests_treeview.get_selection().get_selected_rows() for guest in guests[1]:

1 0

[commit-gajim] r8537 - trunk/src
by steve-e＠gajim.org 22 Aug '07

22 Aug '07

Author: steve-e Date: 2007-08-22 02:50:48 +0200 (Wed, 22 Aug 2007) New Revision: 8537 Modified: trunk/src/chat_control.py trunk/src/dialogs.py Log: chat2muc: See #2095 Remove ancient menuitem. Do not allow to invite transports and groupchats. Include contacts from all accounts. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-08-21 23:39:51 UTC (rev 8536) +++ trunk/src/chat_control.py 2007-08-22 00:50:48 UTC (rev 8537) @@ -1562,9 +1562,6 @@ else: send_file_menuitem.set_sensitive(False) - # compact_view_menuitem - compact_view_menuitem.set_active(self.hide_chat_buttons_current) - # check if it's possible to convert to groupchat if gajim.get_transport_name_from_jid(jid): convert_to_gc_menuitem.set_sensitive(False) Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-21 23:39:51 UTC (rev 8536) +++ trunk/src/dialogs.py 2007-08-22 00:50:48 UTC (rev 8537) @@ -3258,15 +3258,19 @@ self.guests_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE) # set jabber id and pseudos - for jid in gajim.contacts.get_jid_list(self.account): - contact = \ - gajim.contacts.get_contact_with_highest_priority(self.account, jid) - if contact.jid not in self.auto_jids: - if contact.show not in ('offline', 'error'): - name = contact.name - if name == '': - name = jid.split('@')[0] - self.store.append([name, jid]) + for account in gajim.contacts.get_accounts(): + for jid in gajim.contacts.get_jid_list(account): + contact = \ + gajim.contacts.get_contact_with_highest_priority(account, jid) + contact_transport = gajim.get_transport_name_from_jid(jid) + if contact.jid not in self.auto_jids and \ + not contact_transport and \ + contact.jid not in gajim.interface.minimized_controls[account]: + if contact.show not in ('offline', 'error'): + name = contact.name + if name == '': + name = jid.split('@')[0] + self.store.append([name, jid]) # show all but... self.window.show_all()

1 0

[commit-gajim] r8536 - in trunk: data/glade src
by steve-e＠gajim.org 21 Aug '07

21 Aug '07

Author: steve-e Date: 2007-08-22 01:39:51 +0200 (Wed, 22 Aug 2007) New Revision: 8536 Modified: trunk/data/glade/advanced_menuitem_menu.glade trunk/src/dialogs.py trunk/src/roster_window.py Log: Remove BlockedContactsWindow. Fixes #3142 Modified: trunk/data/glade/advanced_menuitem_menu.glade =================================================================== --- trunk/data/glade/advanced_menuitem_menu.glade 2007-08-21 23:13:03 UTC (rev 8535) +++ trunk/data/glade/advanced_menuitem_menu.glade 2007-08-21 23:39:51 UTC (rev 8536) @@ -1,142 +1,93 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> + <glade-interface> - -<widget class="GtkMenu" id="advanced_menuitem_menu"> - - <child> - <widget class="GtkImageMenuItem" id="send_single_message_menuitem"> - <property name="label" translatable="yes">_Send Single Message</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image1466"> - <property name="visible">True</property> - <property name="stock">gtk-new</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="xml_console_menuitem"> - <property name="label" translatable="yes">Show _XML Console</property> - <property name="use_underline">True</property> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="blocked_contacts_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Blocked Contacts</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_blocked_contacts_menuitem_activate" last_modification_time="Thu, 19 Apr 2007 15:32:47 GMT"/> - - <child internal-child="image"> - <widget class="GtkImage" id="image1467"> - <property name="visible">True</property> - <property name="stock">gtk-stop</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="privacy_lists_menuitem"> - <property name="label" translatable="yes">_Privacy Lists</property> - <property name="use_underline">True</property> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator8"> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="administrator_menuitem"> - <property name="label" translatable="yes">_Administrator</property> - <property name="use_underline">True</property> - - <child> - <widget class="GtkMenu" id="administrator_menuitem_menu"> - - <child> - <widget class="GtkImageMenuItem" id="send_server_message_menuitem"> - <property name="tooltip" translatable="yes">Sends a message to users currently connected to this server</property> - <property name="label" translatable="yes">_Send Server Message</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image1468"> - <property name="visible">True</property> - <property name="stock">gtk-new</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator9"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="set_motd_menuitem"> - <property name="tooltip" translatable="yes">Sets Message of the Day</property> - <property name="label" translatable="yes">Set MOTD</property> - <property name="use_underline">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="update_motd_menuitem"> - <property name="tooltip" translatable="yes">Updates Message of the Day</property> - <property name="label" translatable="yes">Update MOTD</property> - <property name="use_underline">True</property> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="delete_motd_menuitem"> - <property name="tooltip" translatable="yes">Deletes Message of the Day</property> - <property name="label" translatable="yes">Delete MOTD</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image1469"> - <property name="visible">True</property> - <property name="stock">gtk-clear</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> -</widget> - + <widget class="GtkMenu" id="advanced_menuitem_menu"> + <child> + <widget class="GtkImageMenuItem" id="send_single_message_menuitem"> + <property name="label" translatable="yes">_Send Single Message</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1466"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="xml_console_menuitem"> + <property name="label" translatable="yes">Show _XML Console</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="privacy_lists_menuitem"> + <property name="label" translatable="yes">_Privacy Lists</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="separator8"> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="administrator_menuitem"> + <property name="label" translatable="yes">_Administrator</property> + <property name="use_underline">True</property> + <child> + <widget class="GtkMenu" id="administrator_menuitem_menu"> + <child> + <widget class="GtkImageMenuItem" id="send_server_message_menuitem"> + <property name="tooltip" translatable="yes">Sends a message to users currently connected to this server</property> + <property name="label" translatable="yes">_Send Server Message</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1468"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="separator9"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="set_motd_menuitem"> + <property name="tooltip" translatable="yes">Sets Message of the Day</property> + <property name="label" translatable="yes">Set MOTD</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="update_motd_menuitem"> + <property name="tooltip" translatable="yes">Updates Message of the Day</property> + <property name="label" translatable="yes">Update MOTD</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="delete_motd_menuitem"> + <property name="tooltip" translatable="yes">Deletes Message of the Day</property> + <property name="label" translatable="yes">Delete MOTD</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1469"> + <property name="visible">True</property> + <property name="stock">gtk-clear</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + </widget> + </child> + </widget> + </child> + </widget> </glade-interface> Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-21 23:13:03 UTC (rev 8535) +++ trunk/src/dialogs.py 2007-08-21 23:39:51 UTC (rev 8536) @@ -2361,101 +2361,6 @@ def on_close_button_clicked(self, widget): self.window.destroy() -class BlockedContactsWindow: - '''Window that is the main window for ContactWindows;''' - def __init__(self, account): - self.account = account - self.xml = gtkgui_helpers.get_glade('blocked_contacts_window.glade') - self.window = self.xml.get_widget('blocked_contacts_window') - self.remove_button = self.xml.get_widget('remove_button') - self.contacts_treeview = self.xml.get_widget('contacts_treeview') - renderer = gtk.CellRendererText() - - self.store = gtk.ListStore(str) - self.contacts_treeview.set_model(self.store) - - column = gtk.TreeViewColumn('Contact', renderer, text=0) - self.contacts_treeview.append_column(column) - - if len(gajim.connections) > 1: - title = _('Blocked Contacts for %s') % self.account - else: - title = _('Blocked Contacts') - self.window.set_title(title) - self.window.show_all() - self.xml.signal_autoconnect(self) - gajim.connections[self.account].get_privacy_list('block') - - def on_blocked_contacts_window_destroy(self, widget): - key_name = 'blocked_contacts' - if key_name in gajim.interface.instances[self.account]: - del gajim.interface.instances[self.account][key_name] - - def on_remove_button_clicked(self, widget): - if self.contacts_treeview.get_selection().get_selected()[1] == None: - return - tags = [] - rule_selected = self.store.get_path( - self.contacts_treeview.get_selection().get_selected()[1])[0] - for i in range(0, len(self.global_rules)): - if i != rule_selected: - tags.append(self.global_rules[i]) - else: - deleted_rule = self.global_rules[i] - for rule in self.global_rules_to_append: - tags.append(rule) - gajim.connections[self.account].set_privacy_list( - 'block', tags) - gajim.connections[self.account].get_privacy_list('block') - if len(tags) == 0: - self.privacy_list_received([]) - gajim.connections[self.account].blocked_contacts = [] - gajim.connections[self.account].blocked_groups = [] - gajim.connections[self.account].blocked_list = [] - gajim.connections[self.account].set_default_list('') - gajim.connections[self.account].set_active_list('') - gajim.connections[self.account].del_privacy_list('block') - status = gajim.connections[self.account].connected - msg = gajim.connections[self.account].status - show = gajim.SHOW_LIST[gajim.connections[self.account].connected] - if deleted_rule['type'] == 'jid': - jid = deleted_rule['value'] - gajim.connections[self.account].send_custom_status(show, msg, jid) - # needed for draw_contact: - if jid in gajim.connections[self.account].blocked_contacts: - gajim.connections[self.account].blocked_contacts.remove(jid) - gajim.interface.roster.draw_contact(jid, self.account) - else: - group = deleted_rule['value'] - # needed for draw_group: - if group in gajim.connections[self.account].blocked_groups: - gajim.connections[self.account].blocked_groups.remove(group) - gajim.interface.roster.draw_group(group, self.account) - for jid in gajim.contacts.get_jid_list(self.account): - contact = gajim.contacts.get_contact_with_highest_priority( - self.account, jid) - if group in contact.groups: - gajim.connections[self.account].send_custom_status(show, msg, - contact.jid) - gajim.interface.roster.draw_contact(contact.jid, self.account) - - def privacy_list_received(self, rules): - self.store.clear() - self.global_rules = [] - self.global_rules_to_append = [] - for rule in rules: - if rule['type'] == 'jid' and rule['action'] == 'deny': - #self.global_rules[text_item] = rule - self.store.append([rule['value']]) - self.global_rules.append(rule) - elif rule['type'] == 'group' and rule['action'] == 'deny': - text_item = _('Group %s') % rule['value'] - self.store.append([text_item]) - self.global_rules.append(rule) - else: - self.global_rules_to_append.append(rule) - - class PrivacyListsWindow: '''Window that is the main window for Privacy Lists; we can list there the privacy lists and ask to create a new one Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-21 23:13:03 UTC (rev 8535) +++ trunk/src/roster_window.py 2007-08-21 23:39:51 UTC (rev 8536) @@ -824,13 +824,6 @@ gajim.interface.instances[account]['privacy_lists'] = \ dialogs.PrivacyListsWindow(account) - def on_blocked_contacts_menuitem_activate(self, widget, account): - if gajim.interface.instances[account].has_key('blocked_contacts'): - gajim.interface.instances[account]['blocked_contacts'].window.present() - else: - gajim.interface.instances[account]['blocked_contacts'] = \ - dialogs.BlockedContactsWindow(account) - def on_set_motd_menuitem_activate(self, widget, account): server = gajim.config.get_per('accounts', account, 'hostname') server += '/announce/motd' @@ -863,7 +856,6 @@ send_single_message_menuitem = xml.get_widget( 'send_single_message_menuitem') xml_console_menuitem = xml.get_widget('xml_console_menuitem') - blocked_contacts_menuitem = xml.get_widget('blocked_contacts_menuitem') privacy_lists_menuitem = xml.get_widget('privacy_lists_menuitem') administrator_menuitem = xml.get_widget('administrator_menuitem') send_server_message_menuitem = xml.get_widget( @@ -877,12 +869,9 @@ if gajim.connections[account] and gajim.connections[account].\ privacy_rules_supported: - blocked_contacts_menuitem.connect('activate', - self.on_blocked_contacts_menuitem_activate, account) privacy_lists_menuitem.connect('activate', self.on_privacy_lists_menuitem_activate, account) else: - blocked_contacts_menuitem.set_sensitive(False) privacy_lists_menuitem.set_sensitive(False) if gajim.connections[account].is_zeroconf:

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
24
Older →

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 August 2007