Commits October 2006

commits@gajim.org

5 participants
297 discussions

[commit-gajim] r7296 - trunk/src
by nk＠gajim.org 20 Oct '06

20 Oct '06

Author: nk Date: 2006-10-20 11:37:24 +0200 (Fri, 20 Oct 2006) New Revision: 7296 Modified: trunk/src/gajim-remote.py trunk/src/gajim.py trunk/src/remote_control.py Log: some events are not readable. thus unread event does not make sense. Pending Events is what we wanna say Modified: trunk/src/gajim-remote.py =================================================================== --- trunk/src/gajim-remote.py 2006-10-20 09:34:21 UTC (rev 7295) +++ trunk/src/gajim-remote.py 2006-10-20 09:37:24 UTC (rev 7296) @@ -74,8 +74,8 @@ _('Shows or hides the roster window'), [] ], - 'show_next_unread': [ - _('Popups a window with the next unread event'), + 'show_next_pending_event': [ + _('Popups a window with the next pending event'), [] ], 'list_contacts': [ Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-10-20 09:34:21 UTC (rev 7295) +++ trunk/src/gajim.py 2006-10-20 09:37:24 UTC (rev 7296) @@ -205,7 +205,7 @@ Start listening for events from fd ''' res = gobject.io_add_watch(fd, flags, self.process_events, - priority=gobject.PRIORITY_LOW) + priority=gobject.PRIORITY_LOW) # store the id of the watch, so that we can remove it on unplug self.events[fd] = res Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2006-10-20 09:34:21 UTC (rev 7295) +++ trunk/src/remote_control.py 2006-10-20 09:37:24 UTC (rev 7296) @@ -292,8 +292,8 @@ return None @dbus.service.method(INTERFACE) - def show_next_unread(self, *args): - '''Show the window(s) with next waiting messages in tabbed/group chats. ''' + def show_next_pending_event(self, *args): + '''Show the window(s) with next pending event in tabbed/group chats.''' if gajim.events.get_nb_events(): gajim.interface.systray.handle_first_event()

1 0

[commit-gajim] r7295 - trunk/data/glade
by nk＠gajim.org 20 Oct '06

20 Oct '06

Author: nk Date: 2006-10-20 11:34:21 +0200 (Fri, 20 Oct 2006) New Revision: 7295 Modified: trunk/data/glade/preferences_window.glade Log: unjargon xhtml tags by having a better string and a nice tooltip. Good reopen Jim! Fix #2522 Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2006-10-20 09:25:14 UTC (rev 7294) +++ trunk/data/glade/preferences_window.glade 2006-10-20 09:34:21 UTC (rev 7295) @@ -496,8 +496,9 @@ <child> <widget class="GtkCheckButton" id="xhtml_checkbutton"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Ignore incoming _XHTML tags</property> + <property name="label" translatable="yes">Ignore rich content in incoming messages</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property>

1 0

[commit-gajim] r7294 - trunk/src/common
by nk＠gajim.org 20 Oct '06

20 Oct '06

Author: nk Date: 2006-10-20 11:25:14 +0200 (Fri, 20 Oct 2006) New Revision: 7294 Modified: trunk/src/common/helpers.py Log: common/helpers also does exo-open Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2006-10-20 09:22:17 UTC (rev 7293) +++ trunk/src/common/helpers.py 2006-10-20 09:25:14 UTC (rev 7294) @@ -404,6 +404,8 @@ command = 'gnome-open' elif gajim.config.get('openwith') == 'kfmclient exec': command = 'kfmclient exec' + elif gajim.config.get('openwith') == 'exo-open': + command = 'exo-open' elif gajim.config.get('openwith') == 'custom': if kind == 'url': command = gajim.config.get('custombrowser') @@ -429,6 +431,8 @@ command = 'gnome-open' elif gajim.config.get('openwith') == 'kfmclient exec': command = 'kfmclient exec' + elif gajim.config.get('openwith') == 'exo-open': + command = 'exo-open' elif gajim.config.get('openwith') == 'custom': command = gajim.config.get('custom_file_manager') if command == '': # if no app is configured

1 0

[commit-gajim] r7293 - in trunk: data/glade src
by nk＠gajim.org 20 Oct '06

20 Oct '06

Author: nk Date: 2006-10-20 11:22:17 +0200 (Fri, 20 Oct 2006) New Revision: 7293 Modified: trunk/data/glade/preferences_window.glade trunk/src/config.py trunk/src/gtkgui_helpers.py Log: if user is xfce4 user [startxfce4 or xfce4-session in running procs] then use exo-open (needs libexo) to open urls using the xfce defined default apps Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2006-10-20 09:06:36 UTC (rev 7292) +++ trunk/data/glade/preferences_window.glade 2006-10-20 09:22:17 UTC (rev 7293) @@ -3001,6 +3001,7 @@ <property name="items" translatable="yes">Autodetect on every Gajim startup Always use GNOME default applications Always use KDE default applications +Always use XFCE4 default applications Custom</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-10-20 09:06:36 UTC (rev 7292) +++ trunk/src/config.py 2006-10-20 09:22:17 UTC (rev 7293) @@ -929,7 +929,7 @@ def on_applications_combobox_changed(self, widget): gajim.config.set('autodetect_browser_mailer', False) - if widget.get_active() == 3: + if widget.get_active() == 4: self.xml.get_widget('custom_apps_frame').show() gajim.config.set('openwith', 'custom') else: @@ -939,6 +939,8 @@ gajim.config.set('openwith', 'gnome-open') elif widget.get_active() == 2: gajim.config.set('openwith', 'kfmclient exec') + elif widget.get_active() == 3: + gajim.config.set('openwith', 'exo-open') self.xml.get_widget('custom_apps_frame').hide() gajim.interface.save_config() Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2006-10-20 09:06:36 UTC (rev 7292) +++ trunk/src/gtkgui_helpers.py 2006-10-20 09:22:17 UTC (rev 7293) @@ -188,6 +188,8 @@ gajim.config.set('openwith', 'gnome-open') elif user_runs_kde(): gajim.config.set('openwith', 'kfmclient exec') + elif user_runs_xfce(): + gajim.config.set('openwith', 'exo-open') else: gajim.config.set('openwith', 'custom') @@ -197,6 +199,12 @@ def user_runs_kde(): return 'startkde' in get_running_processes() +der user_runs_xfce(): + procs = get_running_processes() + if 'startxfce4' in procs or 'xfce4-session' in procs: + return True + return False + def get_running_processes(): '''returns running processes or None (if not /proc exists)''' if os.path.isdir('/proc'):

1 0

[commit-gajim] r7292 - trunk/src
by nk＠gajim.org 20 Oct '06

20 Oct '06

Author: nk Date: 2006-10-20 11:06:36 +0200 (Fri, 20 Oct 2006) New Revision: 7292 Modified: trunk/src/network_manager_listener.py trunk/src/roster_window.py Log: use single quotes. Manager with capital in net manager Modified: trunk/src/network_manager_listener.py =================================================================== --- trunk/src/network_manager_listener.py 2006-10-20 00:52:34 UTC (rev 7291) +++ trunk/src/network_manager_listener.py 2006-10-20 09:06:36 UTC (rev 7292) @@ -16,9 +16,9 @@ import dbus import dbus.glib -NM_OBJ_PATH = "/org/freedesktop/NetworkManager" -NM_INTERFACE = "org.freedesktop.NetworkManager" -NM_SERVICE = "org.freedesktop.NetworkManager" +NM_OBJ_PATH = '/org/freedesktop/NetworkManager' +NM_INTERFACE = 'org.freedesktop.NetworkManager' +NM_SERVICE = 'org.freedesktop.NetworkManager' class NetworkManagerListener: def __init__(self, nm_activated_CB, nm_deactivated_CB): @@ -28,5 +28,7 @@ self._devices = self._nm_iface.getDevices() - self._nm_iface.connect_to_signal('DeviceNowActive', nm_activated_CB) - self._nm_iface.connect_to_signal('DeviceNoLongerActive', nm_deactivated_CB) + self._nm_iface.connect_to_signal('DeviceNowActive', + nm_activated_CB) + self._nm_iface.connect_to_signal('DeviceNoLongerActive', + nm_deactivated_CB) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-10-20 00:52:34 UTC (rev 7291) +++ trunk/src/roster_window.py 2006-10-20 09:06:36 UTC (rev 7292) @@ -4178,7 +4178,7 @@ nm_listener = NetworkManagerListener(self.nm_activated_CB, self.nm_deactivated_CB) except: - print >> sys.stderr, _('Network manager support not available') + print >> sys.stderr, _('Network Manager support not available') def nm_activated_CB(self, dev, net): for acc in gajim.contacts.get_accounts():

1 0

[commit-gajim] r7291 - trunk/src
by jim++＠gajim.org 20 Oct '06

20 Oct '06

Author: jim++ Date: 2006-10-20 02:52:34 +0200 (Fri, 20 Oct 2006) New Revision: 7291 Modified: trunk/src/gajim-remote.py Log: Better description Modified: trunk/src/gajim-remote.py =================================================================== --- trunk/src/gajim-remote.py 2006-10-19 23:45:43 UTC (rev 7290) +++ trunk/src/gajim-remote.py 2006-10-20 00:52:34 UTC (rev 7291) @@ -75,7 +75,7 @@ [] ], 'show_next_unread': [ - _('Popups a window with the next unread message'), + _('Popups a window with the next unread event'), [] ], 'list_contacts': [

1 0

[commit-gajim] r7290 - trunk/src
by jim++＠gajim.org 19 Oct '06

19 Oct '06

Author: jim++ Date: 2006-10-20 01:45:43 +0200 (Fri, 20 Oct 2006) New Revision: 7290 Modified: trunk/src/dialogs.py Log: var name Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-10-18 21:15:54 UTC (rev 7289) +++ trunk/src/dialogs.py 2006-10-19 23:45:43 UTC (rev 7290) @@ -1154,7 +1154,7 @@ self.xml.get_widget('join_button').grab_focus() if not self._room_jid_entry.get_text(): - self._empty_required_widgets.append(self._room_entry) + self._empty_required_widgets.append(self._room_jid_entry) if not self._nickname_entry.get_text(): self._empty_required_widgets.append(self._nickname_entry) if len(self._empty_required_widgets):

1 0

[commit-gajim] r7289 - trunk/src/common/zeroconf
by sb＠gajim.org 18 Oct '06

18 Oct '06

Author: sb Date: 2006-10-18 23:15:54 +0200 (Wed, 18 Oct 2006) New Revision: 7289 Modified: trunk/src/common/zeroconf/zeroconf.py Log: fix tb when renaming offline local contacts (dkirov) Modified: trunk/src/common/zeroconf/zeroconf.py =================================================================== --- trunk/src/common/zeroconf/zeroconf.py 2006-10-18 08:38:33 UTC (rev 7288) +++ trunk/src/common/zeroconf/zeroconf.py 2006-10-18 21:15:54 UTC (rev 7289) @@ -402,6 +402,8 @@ return self.contacts def get_contact(self, jid): + if not jid in self.contacts: + return None return self.contacts[jid] def update_txt(self, show = None): @@ -417,20 +419,3 @@ # END Zeroconf - -''' -# how to use - - zeroconf = Zeroconf() - zeroconf.connect() - zeroconf.txt['1st'] = 'foo' - zeroconf.txt['last'] = 'bar' - zeroconf.txt['email'] = foo(a)bar.org - zeroconf.announce() - - # updating after announcing - txt = {} - txt['status'] = 'avail' - txt['msg'] = 'Here I am' - zeroconf.update_txt(txt) -'''

1 0

[commit-gajim] r7288 - trunk/data/glade
by asterix＠gajim.org 18 Oct '06

18 Oct '06

Author: asterix Date: 2006-10-18 10:38:33 +0200 (Wed, 18 Oct 2006) New Revision: 7288 Modified: trunk/data/glade/privacy_lists_window.glade Log: missing glade diff Modified: trunk/data/glade/privacy_lists_window.glade =================================================================== --- trunk/data/glade/privacy_lists_window.glade 2006-10-18 08:37:44 UTC (rev 7287) +++ trunk/data/glade/privacy_lists_window.glade 2006-10-18 08:38:33 UTC (rev 7288) @@ -116,8 +116,40 @@ <signal name="clicked" handler="on_open_privacy_list_button_clicked" last_modification_time="Sun, 02 Jul 2006 16:47:34 GMT"/> </widget> </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + <child> + <widget class="GtkEntry" id="new_privacy_list_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">False</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="new_privacy_list_button"> <property name="border_width">5</property> <property name="visible">True</property> @@ -128,6 +160,11 @@ <property name="focus_on_click">True</property> <signal name="clicked" handler="on_new_privacy_list_button_clicked" last_modification_time="Sun, 02 Jul 2006 16:47:16 GMT"/> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> </child> </widget> <packing> @@ -136,25 +173,6 @@ <property name="fill">False</property> </packing> </child> - - <child> - <widget class="GtkEntry" id="new_privacy_list_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">●</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> </widget> <packing> <property name="padding">0</property>

1 0

[commit-gajim] r7287 - in trunk: data/glade src
by asterix＠gajim.org 18 Oct '06

18 Oct '06

Author: asterix Date: 2006-10-18 10:37:44 +0200 (Wed, 18 Oct 2006) New Revision: 7287 Modified: trunk/data/glade/privacy_list_window.glade trunk/data/glade/privacy_lists_window.glade trunk/src/dialogs.py Log: [misc & asterix] improve privacy_list and privacy_lists window Modified: trunk/data/glade/privacy_list_window.glade =================================================================== --- trunk/data/glade/privacy_list_window.glade 2006-10-18 08:20:49 UTC (rev 7286) +++ trunk/data/glade/privacy_list_window.glade 2006-10-18 08:37:44 UTC (rev 7287) @@ -725,50 +725,28 @@ </child> <child> - <widget class="GtkHBox" id="last_buttons_hbox"> + <widget class="GtkHButtonBox" id="hbuttonbox1"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="homogeneous">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> <property name="spacing">0</property> <child> - <widget class="GtkButton" id="privacy_list_refresh_button"> - <property name="border_width">5</property> + <widget class="GtkButton" id="close_button"> <property name="visible">True</property> + <property name="can_default">True</property> <property name="can_focus">True</property> - <property name="label">gtk-refresh</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_privacy_list_refresh_button_clicked" last_modification_time="Sat, 01 Jul 2006 13:09:35 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="privacy_list_close_button"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="can_focus">True</property> <property name="label">gtk-close</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_privacy_list_close_button_clicked" last_modification_time="Sat, 01 Jul 2006 13:09:28 GMT"/> + <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Wed, 18 Oct 2006 08:31:02 GMT"/> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> </packing> </child> Modified: trunk/data/glade/privacy_lists_window.glade =================================================================== --- trunk/data/glade/privacy_lists_window.glade 2006-10-18 08:20:49 UTC (rev 7286) +++ trunk/data/glade/privacy_lists_window.glade 2006-10-18 08:37:44 UTC (rev 7287) @@ -166,23 +166,10 @@ <child> <widget class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> <property name="spacing">0</property> <child> - <widget class="GtkButton" id="privacy_lists_refresh_button"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-refresh</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_privacy_lists_refresh_button_clicked" last_modification_time="Sun, 02 Jul 2006 16:46:48 GMT"/> - </widget> - </child> - - <child> <widget class="GtkButton" id="close_privacy_lists_window_button"> <property name="border_width">5</property> <property name="visible">True</property> Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-10-18 08:20:49 UTC (rev 7286) +++ trunk/src/dialogs.py 2006-10-18 08:37:44 UTC (rev 7287) @@ -1807,7 +1807,6 @@ 'privacy_list_default_checkbutton']: self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add) - self.privacy_lists_title_label.set_label( _('Privacy List <b><i>%s</i></b>') % \ gtkgui_helpers.escape_for_pango_markup(self.privacy_list_name)) @@ -1821,6 +1820,7 @@ self.open_rule_button.set_sensitive(False) self.privacy_list_active_checkbutton.set_sensitive(False) self.privacy_list_default_checkbutton.set_sensitive(False) + self.list_of_rules_combobox.set_sensitive(False) if action == 'EDIT': self.refresh_rules() @@ -1837,7 +1837,7 @@ self.add_edit_vbox.set_no_show_all(True) self.window.show_all() self.add_edit_vbox.hide() - + self.xml.signal_autoconnect(self) def on_privacy_list_edit_window_destroy(self, widget): @@ -1954,13 +1954,13 @@ self.edit_queries_send_checkbutton.set_active(True) elif child == 'message': self.edit_send_messages_checkbutton.set_active(True) - + if rule_info['action'] == 'allow': self.edit_allow_radiobutton.set_active(True) else: self.edit_deny_radiobutton.set_active(True) self.add_edit_vbox.show() - + def on_privacy_list_active_checkbutton_toggled(self, widget): if widget.get_active(): gajim.connections[self.account].set_active_list( @@ -1978,7 +1978,7 @@ def on_new_rule_button_clicked(self, widget): self.reset_fields() self.add_edit_vbox.show() - + def reset_fields(self): self.edit_type_jabberid_entry.set_text('') self.edit_allow_radiobutton.set_active(True) @@ -2061,12 +2061,8 @@ if active_bool: self.allow_deny = radiobutton - def on_privacy_list_close_button_clicked(self, widget): + def on_close_button_clicked(self, widget): self.window.destroy() - - def on_privacy_list_refresh_button_clicked(self, widget): - self.refresh_rules() - self.add_edit_vbox.hide() class PrivacyListsWindow: '''Window that is the main window for Privacy Lists; @@ -2132,11 +2128,6 @@ self.list_of_privacy_lists_combobox.set_sensitive(False) self.open_privacy_list_button.set_sensitive(False) self.delete_privacy_list_button.set_sensitive(False) - elif len(self.privacy_lists_save) == 1: - self.list_of_privacy_lists_combobox.set_active(0) - self.list_of_privacy_lists_combobox.set_sensitive(False) - self.open_privacy_list_button.set_sensitive(True) - self.delete_privacy_list_button.set_sensitive(True) else: self.list_of_privacy_lists_combobox.set_sensitive(True) self.list_of_privacy_lists_combobox.set_active(0)

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