Commits May 2006

commits@gajim.org

6 participants
155 discussions

[commit-gajim] r6410 - branches/gajim_0.10/data/glade
by dkirov＠gajim.org 31 May '06

31 May '06

Author: dkirov Date: 2006-05-31 23:16:47 +0200 (Wed, 31 May 2006) New Revision: 6410 Modified: branches/gajim_0.10/data/glade/account_creation_wizard_window.glade Log: merged r6340 Modified: branches/gajim_0.10/data/glade/account_creation_wizard_window.glade =================================================================== --- branches/gajim_0.10/data/glade/account_creation_wizard_window.glade 2006-05-31 21:12:03 UTC (rev 6409) +++ branches/gajim_0.10/data/glade/account_creation_wizard_window.glade 2006-05-31 21:16:47 UTC (rev 6410) @@ -682,7 +682,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">True</property> - <property name="visibility">True</property> + <property name="visibility">False</property> <property name="max_length">0</property> <property name="text" translatable="yes"></property> <property name="has_frame">True</property>

1 0

[commit-gajim] r6409 - trunk/src/common
by dkirov＠gajim.org 31 May '06

31 May '06

Author: dkirov Date: 2006-05-31 23:12:03 +0200 (Wed, 31 May 2006) New Revision: 6409 Modified: trunk/src/common/connection.py Log: send our real show, when we connect to a transport Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-05-31 19:49:24 UTC (rev 6408) +++ trunk/src/common/connection.py 2006-05-31 21:12:03 UTC (rev 6409) @@ -872,7 +872,8 @@ def send_agent_status(self, agent, ptype): if not self.connection: return - p = common.xmpp.Presence(to = agent, typ = ptype) + show = helpers.get_xmpp_show(STATUS_LIST[self.connected]) + p = common.xmpp.Presence(to = agent, typ = ptype, show = show) p = self.add_sha(p, ptype != 'unavailable') self.connection.send(p)

1 0

[commit-gajim] r6406 - branches/gajim_0.10/src/common
by dkirov＠gajim.org 31 May '06

31 May '06

Author: dkirov Date: 2006-05-31 21:17:46 +0200 (Wed, 31 May 2006) New Revision: 6406 Modified: branches/gajim_0.10/src/common/proxy65_manager.py Log: merge r6273 Modified: branches/gajim_0.10/src/common/proxy65_manager.py =================================================================== --- branches/gajim_0.10/src/common/proxy65_manager.py 2006-05-31 19:16:46 UTC (rev 6405) +++ branches/gajim_0.10/src/common/proxy65_manager.py 2006-05-31 19:17:46 UTC (rev 6406) @@ -132,11 +132,11 @@ self.connections.remove(connection) except ValueError: pass - if self.state != S_FINISHED and connection == \ - self.active_connection: + if connection == self.active_connection: self.active_connection = None - self.state = S_INITIAL - self.try_next_connection() + if self.state != S_FINISHED: + self.state = S_INITIAL + self.try_next_connection() def try_next_connection(self): ''' try to resolve proxy with the next possible connection '''

1 0

[commit-gajim] r6405 - branches/gajim_0.10/src
by dkirov＠gajim.org 31 May '06

31 May '06

Author: dkirov Date: 2006-05-31 21:16:46 +0200 (Wed, 31 May 2006) New Revision: 6405 Modified: branches/gajim_0.10/src/notify.py Log: merge 6275 Modified: branches/gajim_0.10/src/notify.py =================================================================== --- branches/gajim_0.10/src/notify.py 2006-05-31 19:02:40 UTC (rev 6404) +++ branches/gajim_0.10/src/notify.py 2006-05-31 19:16:46 UTC (rev 6405) @@ -40,6 +40,7 @@ the Desktop Notification Specification. If that fails, then we fall back to the older style PopupNotificationWindow method.''' text = gtkgui_helpers.escape_for_pango_markup(text) + title = gtkgui_helpers.escape_for_pango_markup(title) if gajim.config.get('use_notif_daemon') and dbus_support.supported: try: DesktopNotification(event_type, jid, account, msg_type, path_to_image,

1 0

[commit-gajim] r6404 - branches/gajim_0.10/src
by dkirov＠gajim.org 31 May '06

31 May '06

Author: dkirov Date: 2006-05-31 21:02:40 +0200 (Wed, 31 May 2006) New Revision: 6404 Modified: branches/gajim_0.10/src/filetransfers_window.py branches/gajim_0.10/src/groupchat_control.py branches/gajim_0.10/src/roster_window.py Log: merge r6362 Modified: branches/gajim_0.10/src/filetransfers_window.py =================================================================== --- branches/gajim_0.10/src/filetransfers_window.py 2006-05-31 19:00:59 UTC (rev 6403) +++ branches/gajim_0.10/src/filetransfers_window.py 2006-05-31 19:02:40 UTC (rev 6404) @@ -837,9 +837,9 @@ self.set_buttons_sensitive(path, True) event_button = gtkgui_helpers.get_possible_button_event(event) + self.file_transfers_menu.show_all() self.file_transfers_menu.popup(None, self.tree, None, event_button, event.time) - self.file_transfers_menu.show_all() def on_transfers_list_key_press_event(self, widget, event): '''when a key is pressed in the treeviews''' Modified: branches/gajim_0.10/src/groupchat_control.py =================================================================== --- branches/gajim_0.10/src/groupchat_control.py 2006-05-31 19:00:59 UTC (rev 6403) +++ branches/gajim_0.10/src/groupchat_control.py 2006-05-31 19:02:40 UTC (rev 6404) @@ -1494,8 +1494,8 @@ # show the popup now! menu = xml.get_widget('gc_occupants_menu') + menu.show_all() menu.popup(None, None, None, event.button, event.time) - menu.show_all() def _start_private_message(self, nick): gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) Modified: branches/gajim_0.10/src/roster_window.py =================================================================== --- branches/gajim_0.10/src/roster_window.py 2006-05-31 19:00:59 UTC (rev 6403) +++ branches/gajim_0.10/src/roster_window.py 2006-05-31 19:02:40 UTC (rev 6404) @@ -1386,9 +1386,9 @@ roster_contact_context_menu.attach_to_widget(self.tree, None) roster_contact_context_menu.connect('selection-done', gtkgui_helpers.destroy_widget) + roster_contact_context_menu.show_all() roster_contact_context_menu.popup(None, None, None, event_button, event.time) - roster_contact_context_menu.show_all() def make_group_menu(self, event, iter): '''Make group's popup menu''' @@ -1419,8 +1419,8 @@ menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) + menu.show_all() menu.popup(None, None, None, event_button, event.time) - menu.show_all() def make_transport_menu(self, event, iter): '''Make transport's popup menu''' @@ -1485,8 +1485,8 @@ menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) + menu.show_all() menu.popup(None, None, None, event_button, event.time) - menu.show_all() def on_edit_account(self, widget, account): if gajim.interface.instances[account].has_key('account_modification'): @@ -1599,8 +1599,8 @@ menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) + menu.show_all() menu.popup(None, self.tree, None, event_button, event.time) - menu.show_all() def on_add_to_roster(self, widget, contact, account): dialogs.AddNewContactWindow(account, contact.jid) @@ -3208,8 +3208,8 @@ menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) + menu.show_all() menu.popup(None, None, None, 1, etime) - menu.show_all() def show_title(self): change_title_allowed = gajim.config.get('change_roster_title')

1 0

[commit-gajim] r6403 - branches/gajim_0.10/po/de/LC_MESSAGES
by dkirov＠gajim.org 31 May '06

31 May '06

Author: dkirov Date: 2006-05-31 21:00:59 +0200 (Wed, 31 May 2006) New Revision: 6403 Modified: branches/gajim_0.10/po/de/LC_MESSAGES/gajim.po Log: merge r6360 Modified: branches/gajim_0.10/po/de/LC_MESSAGES/gajim.po =================================================================== --- branches/gajim_0.10/po/de/LC_MESSAGES/gajim.po 2006-05-31 18:57:49 UTC (rev 6402) +++ branches/gajim_0.10/po/de/LC_MESSAGES/gajim.po 2006-05-31 19:00:59 UTC (rev 6403) @@ -1454,7 +1454,7 @@ #: ../src/gajim.py:438 #, python-format msgid "%(nickname)s Signed In" -msgstr "%(nickname)s·angemeldet" +msgstr "%(nickname)s angemeldet" #: ../src/gajim.py:469 #, python-format

1 0

[commit-gajim] r6402 - branches/gajim_0.10/src
by dkirov＠gajim.org 31 May '06

31 May '06

Author: dkirov Date: 2006-05-31 20:57:49 +0200 (Wed, 31 May 2006) New Revision: 6402 Modified: branches/gajim_0.10/src/history_manager.py Log: merge r6349 Modified: branches/gajim_0.10/src/history_manager.py =================================================================== --- branches/gajim_0.10/src/history_manager.py 2006-05-31 18:56:53 UTC (rev 6401) +++ branches/gajim_0.10/src/history_manager.py 2006-05-31 18:57:49 UTC (rev 6402) @@ -57,6 +57,10 @@ class HistoryManager: def __init__(self): + path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps/gajim.png') + pix = gtk.gdk.pixbuf_new_from_file(path_to_file) + gtk.window_set_default_icon(pix) # set the icon to all newly opened windows + if not os.path.exists(LOG_DB_PATH): dialogs.ErrorDialog(_('Cannot find history logs database'), '%s does not exist.' % LOG_DB_PATH)

1 0

[commit-gajim] r6401 - branches/gajim_0.10/src
by dkirov＠gajim.org 31 May '06

31 May '06

Author: dkirov Date: 2006-05-31 20:56:53 +0200 (Wed, 31 May 2006) New Revision: 6401 Modified: branches/gajim_0.10/src/gajim.py Log: merge r6348 Modified: branches/gajim_0.10/src/gajim.py =================================================================== --- branches/gajim_0.10/src/gajim.py 2006-05-31 18:54:39 UTC (rev 6400) +++ branches/gajim_0.10/src/gajim.py 2006-05-31 18:56:53 UTC (rev 6401) @@ -558,6 +558,10 @@ if not message: # empty message text return + if gajim.config.get('ignore_unknown_contacts') and \ + not gajim.contacts.get_contact(account, jid) and not pm: + return + first = False if not chat_control and not gajim.awaiting_events[account].has_key( jid_of_control): @@ -592,11 +596,6 @@ groupchat_control.on_private_message(nick, message, array[2]) return - # THIS HAS TO BE AFTER PM handling so we can get PMs - if gajim.config.get('ignore_unknown_contacts') and \ - not gajim.contacts.get_contact(account, jid): - return - if first: if gajim.config.get('notify_on_new_message') and \ helpers.allow_showing_notification(account):

1 0

[commit-gajim] r6400 - branches/gajim_0.10/src
by dkirov＠gajim.org 31 May '06

31 May '06

Author: dkirov Date: 2006-05-31 20:54:39 +0200 (Wed, 31 May 2006) New Revision: 6400 Modified: branches/gajim_0.10/src/conversation_textview.py Log: merge r6346 Modified: branches/gajim_0.10/src/conversation_textview.py =================================================================== --- branches/gajim_0.10/src/conversation_textview.py 2006-05-31 18:53:18 UTC (rev 6399) +++ branches/gajim_0.10/src/conversation_textview.py 2006-05-31 18:54:39 UTC (rev 6400) @@ -160,7 +160,10 @@ def scroll_to_end(self): parent = self.tv.get_parent() buffer = self.tv.get_buffer() - self.tv.scroll_to_mark(buffer.get_mark('end'), 0, True, 0, 1) + end_mark = buffer.get_mark('end') + if not end_mark: + return False + self.tv.scroll_to_mark(end_mark, 0, True, 0, 1) adjustment = parent.get_hadjustment() adjustment.set_value(0) return False # when called in an idle_add, just do it once

1 0

[commit-gajim] r6399 - branches/gajim_0.10/src
by dkirov＠gajim.org 31 May '06

31 May '06

Author: dkirov Date: 2006-05-31 20:53:18 +0200 (Wed, 31 May 2006) New Revision: 6399 Modified: branches/gajim_0.10/src/gajim.py Log: merge r6342 Modified: branches/gajim_0.10/src/gajim.py =================================================================== --- branches/gajim_0.10/src/gajim.py 2006-05-31 18:49:25 UTC (rev 6398) +++ branches/gajim_0.10/src/gajim.py 2006-05-31 18:53:18 UTC (rev 6399) @@ -1157,7 +1157,8 @@ if not gajim.config.get('showoffline'): contact = gajim.contacts.get_contact_with_highest_priority(account, jid) - self.roster.really_remove_contact(contact, account) + if contact: + self.roster.really_remove_contact(contact, account) self.redraw_roster_systray(account, jid, typ) def remove_event(self, account, jid, event): @@ -1171,7 +1172,8 @@ if not gajim.config.get('showoffline'): contact = gajim.contacts.get_contact_with_highest_priority(account, jid) - self.roster.really_remove_contact(contact, account) + if contact: + self.roster.really_remove_contact(contact, account) self.redraw_roster_systray(account, jid, event[0]) def handle_event_file_request_error(self, account, array):

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 May 2006