Commits June 2007

commits@gajim.org

7 participants
163 discussions

[commit-gajim] r8258 - trunk/data/glade
by roidelapluie＠gajim.org 10 Jun '07

10 Jun '07

Author: roidelapluie Date: 2007-06-10 09:13:28 +0200 (Sun, 10 Jun 2007) New Revision: 8258 Modified: trunk/data/glade/vcard_information_window.glade Log: use wrap words in vcard annotations (like in about). Modified: trunk/data/glade/vcard_information_window.glade =================================================================== --- trunk/data/glade/vcard_information_window.glade 2007-06-10 06:44:52 UTC (rev 8257) +++ trunk/data/glade/vcard_information_window.glade 2007-06-10 07:13:28 UTC (rev 8258) @@ -2660,7 +2660,7 @@ <property name="overwrite">False</property> <property name="accepts_tab">True</property> <property name="justification">GTK_JUSTIFY_LEFT</property> - <property name="wrap_mode">GTK_WRAP_NONE</property> + <property name="wrap_mode">GTK_WRAP_WORD</property> <property name="cursor_visible">True</property> <property name="pixels_above_lines">0</property> <property name="pixels_below_lines">0</property>

1 0

[commit-gajim] r8257 - trunk/src
by roidelapluie＠gajim.org 10 Jun '07

10 Jun '07

Author: roidelapluie Date: 2007-06-10 08:44:52 +0200 (Sun, 10 Jun 2007) New Revision: 8257 Modified: trunk/src/roster_window.py Log: Print Offline icon instead Gtk-Stop in blocked items roster context 'send custom status' menu entry. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-06-10 04:23:51 UTC (rev 8256) +++ trunk/src/roster_window.py 2007-06-10 06:44:52 UTC (rev 8257) @@ -2021,8 +2021,7 @@ blocked = True break if blocked: - icon = gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) - send_custom_status_menuitem.set_image(icon) + send_custom_status_menuitem.set_image(self.load_icon('offline')) send_custom_status_menuitem.set_sensitive(False) elif gajim.interface.status_sent_to_users.has_key(account) and \ jid in gajim.interface.status_sent_to_users[account]: @@ -2560,8 +2559,7 @@ send_custom_status_menuitem = gtk.ImageMenuItem(_('Send Cus_tom Status')) # add a special img for this menuitem if group in gajim.connections[account].blocked_groups: - icon = gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) - send_custom_status_menuitem.set_image(icon) + send_custom_status_menuitem.set_image(self.load_icon('offline')) send_custom_status_menuitem.set_sensitive(False) elif gajim.interface.status_sent_to_groups.has_key(account) and \ group in gajim.interface.status_sent_to_groups[account]:

1 0

[commit-gajim] r8256 - trunk/src
by roidelapluie＠gajim.org 10 Jun '07

10 Jun '07

Author: roidelapluie Date: 2007-06-10 06:23:51 +0200 (Sun, 10 Jun 2007) New Revision: 8256 Modified: trunk/src/roster_window.py Log: Make 'send custom status' in blocked groups context menu insensitive. See [8255] and fix #3226. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-06-10 04:17:56 UTC (rev 8255) +++ trunk/src/roster_window.py 2007-06-10 04:23:51 UTC (rev 8256) @@ -2559,7 +2559,11 @@ # Send Custom Status send_custom_status_menuitem = gtk.ImageMenuItem(_('Send Cus_tom Status')) # add a special img for this menuitem - if gajim.interface.status_sent_to_groups.has_key(account) and \ + if group in gajim.connections[account].blocked_groups: + icon = gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) + send_custom_status_menuitem.set_image(icon) + send_custom_status_menuitem.set_sensitive(False) + elif gajim.interface.status_sent_to_groups.has_key(account) and \ group in gajim.interface.status_sent_to_groups[account]: send_custom_status_menuitem.set_image(self.load_icon( gajim.interface.status_sent_to_groups[account][group]))

1 0

[commit-gajim] r8255 - trunk/src
by roidelapluie＠gajim.org 10 Jun '07

10 Jun '07

Author: roidelapluie Date: 2007-06-10 06:17:56 +0200 (Sun, 10 Jun 2007) New Revision: 8255 Modified: trunk/src/roster_window.py Log: Make 'send custom status' in contacts content menu insensitive. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-06-09 13:52:06 UTC (rev 8254) +++ trunk/src/roster_window.py 2007-06-10 04:17:56 UTC (rev 8255) @@ -2007,7 +2007,24 @@ add_special_notification_menuitem.set_no_show_all(True) # send custom status icon - if gajim.interface.status_sent_to_users.has_key(account) and \ + blocked = False + if jid in gajim.connections[account].blocked_contacts: + blocked = True + else: + groups = contact.groups + if contact.is_observer(): + groups = [_('Observers')] + elif not groups: + groups = [_('General')] + for group in groups: + if group in gajim.connections[account].blocked_groups: + blocked = True + break + if blocked: + icon = gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) + send_custom_status_menuitem.set_image(icon) + send_custom_status_menuitem.set_sensitive(False) + elif gajim.interface.status_sent_to_users.has_key(account) and \ jid in gajim.interface.status_sent_to_users[account]: send_custom_status_menuitem.set_image( self.load_icon(gajim.interface.status_sent_to_users[account][jid]))

1 0

[commit-gajim] r8254 - trunk/src/common
by liori＠gajim.org 09 Jun '07

09 Jun '07

Author: liori Date: 2007-06-09 15:52:06 +0200 (Sat, 09 Jun 2007) New Revision: 8254 Modified: trunk/src/common/dataforms.py Log: Dataforms: fix a fix Modified: trunk/src/common/dataforms.py =================================================================== --- trunk/src/common/dataforms.py 2007-06-09 12:26:30 UTC (rev 8253) +++ trunk/src/common/dataforms.py 2007-06-09 13:52:06 UTC (rev 8254) @@ -13,7 +13,7 @@ class ExtendedNode(xmpp.Node, object): @classmethod def __new__(cls, *a, **b): - if 'extend' not in b.keys() or not b[keys]: + if 'extend' not in b.keys() or not b['extend']: return object.__new__(cls) extend = b['extend']

1 0

[commit-gajim] r8253 - trunk/src/common
by asterix＠gajim.org 09 Jun '07

09 Jun '07

Author: asterix Date: 2007-06-09 14:26:30 +0200 (Sat, 09 Jun 2007) New Revision: 8253 Modified: trunk/src/common/connection_handlers.py Log: discover our server at startup even if we don't use filetransfert proxies. fixes #3224 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-06-09 12:21:35 UTC (rev 8252) +++ trunk/src/common/connection_handlers.py 2007-06-09 12:26:30 UTC (rev 8253) @@ -1855,6 +1855,10 @@ if not self.connection: return self.connection.getRoster(self._on_roster_set) + self.discoverItems(gajim.config.get_per('accounts', self.name, + 'hostname'), id_prefix='p') + self.discoverInfo(gajim.config.get_per('accounts', self.name, + 'hostname'), id_prefix='p') if gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): self.discover_ft_proxies() @@ -1865,10 +1869,6 @@ proxies = map(lambda e:e.strip(), cfg_proxies.split(',')) for proxy in proxies: gajim.proxy65_manager.resolve(proxy, self.connection) - self.discoverItems(gajim.config.get_per('accounts', self.name, - 'hostname'), id_prefix='p') - self.discoverInfo(gajim.config.get_per('accounts', self.name, - 'hostname'), id_prefix='p') def _on_roster_set(self, roster): raw_roster = roster.getRaw()

1 0

[commit-gajim] r8252 - trunk/src/common
by liori＠gajim.org 09 Jun '07

09 Jun '07

Author: liori Date: 2007-06-09 14:21:35 +0200 (Sat, 09 Jun 2007) New Revision: 8252 Modified: trunk/src/common/dataforms.py Log: Dataforms: DataRecord(extend=None) != DataRecord() Modified: trunk/src/common/dataforms.py =================================================================== --- trunk/src/common/dataforms.py 2007-06-09 11:57:25 UTC (rev 8251) +++ trunk/src/common/dataforms.py 2007-06-09 12:21:35 UTC (rev 8252) @@ -13,7 +13,7 @@ class ExtendedNode(xmpp.Node, object): @classmethod def __new__(cls, *a, **b): - if 'extend' not in b.keys(): + if 'extend' not in b.keys() or not b[keys]: return object.__new__(cls) extend = b['extend']

1 0

[commit-gajim] r8251 - trunk/src
by steve-e＠gajim.org 09 Jun '07

09 Jun '07

Author: steve-e Date: 2007-06-09 13:57:25 +0200 (Sat, 09 Jun 2007) New Revision: 8251 Modified: trunk/src/roster_window.py Log: Remove my debug print Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-06-09 11:29:14 UTC (rev 8250) +++ trunk/src/roster_window.py 2007-06-09 11:57:25 UTC (rev 8251) @@ -2048,7 +2048,6 @@ icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) invite_to_new_room_menuitem.set_image(icon) contact_transport = gajim.get_transport_name_from_jid(contact.jid) - print gajim.connections[account].muc_jid t = contact_transport or 'jabber' # transform None in 'jabber' if not gajim.connections[account].muc_jid.has_key(t): invite_to_new_room_menuitem.set_sensitive(False)

1 0

[commit-gajim] r8250 - trunk/data/glade
by steve-e＠gajim.org 09 Jun '07

09 Jun '07

Author: steve-e Date: 2007-06-09 13:29:14 +0200 (Sat, 09 Jun 2007) New Revision: 8250 Modified: trunk/data/glade/gc_control_popup_menu.glade trunk/data/glade/gc_occupants_menu.glade Log: Seperate groupchat bookmark/add menu entry Modified: trunk/data/glade/gc_control_popup_menu.glade =================================================================== --- trunk/data/glade/gc_control_popup_menu.glade 2007-06-09 11:24:46 UTC (rev 8249) +++ trunk/data/glade/gc_control_popup_menu.glade 2007-06-09 11:29:14 UTC (rev 8250) @@ -109,27 +109,32 @@ </widget> </child> <child> - <widget class="GtkImageMenuItem" id="history_menuitem"> - <property name="tooltip" translatable="yes">Click to see past conversation in this room</property> - <property name="label" translatable="yes">_History</property> + <widget class="GtkImageMenuItem" id="bookmark_room_menuitem"> + <property name="label" translatable="yes">_Bookmark</property> <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1405"> + <widget class="GtkImage" id="image1410"> <property name="visible">True</property> - <property name="stock">gtk-justify-fill</property> + <property name="stock">gtk-add</property> <property name="icon_size">1</property> </widget> </child> </widget> </child> <child> - <widget class="GtkImageMenuItem" id="bookmark_room_menuitem"> - <property name="label" translatable="yes">_Bookmark</property> + <widget class="GtkSeparatorMenuItem" id="seperator"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="history_menuitem"> + <property name="tooltip" translatable="yes">Click to see past conversation in this room</property> + <property name="label" translatable="yes">_History</property> <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1410"> + <widget class="GtkImage" id="image1405"> <property name="visible">True</property> - <property name="stock">gtk-add</property> + <property name="stock">gtk-justify-fill</property> <property name="icon_size">1</property> </widget> </child> Modified: trunk/data/glade/gc_occupants_menu.glade =================================================================== --- trunk/data/glade/gc_occupants_menu.glade 2007-06-09 11:24:46 UTC (rev 8249) +++ trunk/data/glade/gc_occupants_menu.glade 2007-06-09 11:29:14 UTC (rev 8250) @@ -93,6 +93,25 @@ </widget> </child> <child> + <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Add to Roster</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1052"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="separator6"> + <property name="visible">True</property> + </widget> + </child> + <child> <widget class="GtkImageMenuItem" id="information_menuitem"> <property name="visible">True</property> <property name="label">gtk-info</property> @@ -114,19 +133,5 @@ </child> </widget> </child> - <child> - <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Add to Roster</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1052"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> </widget> </glade-interface>

1 0

[commit-gajim] r8249 - trunk/src
by steve-e＠gajim.org 09 Jun '07

09 Jun '07

Author: steve-e Date: 2007-06-09 13:24:46 +0200 (Sat, 09 Jun 2007) New Revision: 8249 Modified: trunk/src/roster_window.py Log: Adapt transport_menu to the style of the other menus Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-06-09 07:07:05 UTC (rev 8248) +++ trunk/src/roster_window.py 2007-06-09 11:24:46 UTC (rev 8249) @@ -2048,6 +2048,7 @@ icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) invite_to_new_room_menuitem.set_image(icon) contact_transport = gajim.get_transport_name_from_jid(contact.jid) + print gajim.connections[account].muc_jid t = contact_transport or 'jabber' # transform None in 'jabber' if not gajim.connections[account].muc_jid.has_key(t): invite_to_new_room_menuitem.set_sensitive(False) @@ -2628,6 +2629,7 @@ contact = gajim.contacts.get_contact_with_highest_priority(account, jid) menu = gtk.Menu() + # Log on item = gtk.ImageMenuItem(_('_Log on')) icon = gtk.image_new_from_stock(gtk.STOCK_YES, gtk.ICON_SIZE_MENU) item.set_image(icon) @@ -2638,6 +2640,7 @@ item.set_sensitive(False) item.connect('activate', self.on_agent_logging, jid, None, account) + # Log off item = gtk.ImageMenuItem(_('Log _off')) icon = gtk.image_new_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_MENU) item.set_image(icon) @@ -2651,23 +2654,26 @@ item = gtk.SeparatorMenuItem() # separator menu.append(item) - item = gtk.ImageMenuItem(_('_Edit')) - icon = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU) + # Execute Command + item = gtk.ImageMenuItem(_('Execute Command...')) + icon = gtk.image_new_from_stock(gtk.STOCK_EXECUTE, gtk.ICON_SIZE_MENU) item.set_image(icon) menu.append(item) - item.connect('activate', self.on_edit_agent, contact, account) + item.connect('activate', self.on_execute_command, contact, account, + contact.resource) if gajim.account_is_disconnected(account): item.set_sensitive(False) - item = gtk.ImageMenuItem(_('Execute Command...')) - icon = gtk.image_new_from_stock(gtk.STOCK_EXECUTE, gtk.ICON_SIZE_MENU) + # Edit + item = gtk.ImageMenuItem(_('_Edit')) + icon = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU) item.set_image(icon) menu.append(item) - item.connect('activate', self.on_execute_command, contact, account, - contact.resource) + item.connect('activate', self.on_edit_agent, contact, account) if gajim.account_is_disconnected(account): item.set_sensitive(False) + # Rename item = gtk.ImageMenuItem(_('_Rename')) # add a special img for rename menuitem path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps', @@ -2679,7 +2685,11 @@ item.connect('activate', self.on_rename, iter, path) if gajim.account_is_disconnected(account): item.set_sensitive(False) + + item = gtk.SeparatorMenuItem() # sepator + menu.append(item) + # Remove item = gtk.ImageMenuItem(_('_Remove from Roster')) icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU) item.set_image(icon)

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
17
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 June 2007