copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

autodetect for links now should work

This commit is contained in:
Nikos Kouremenos 2005-08-04 23:11:55 +00:00
parent 6e61913e37
commit 6ff5643ce2
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/config.py
View File

@ -118,7 +118,8 @@ class Config:
'always_english_wikipedia': [opt_bool, False], 'always_english_wikipedia': [opt_bool, False],
'use_dbus': [opt_bool, True], # allow control via dbus service 'use_dbus': [opt_bool, True], # allow control via dbus service
'send_receive_chat_state_notifications': [opt_bool, True], 'send_receive_chat_state_notifications': [opt_bool, True],
'print_ichat_every_foo_minutes': [opt_int, 5], # default is every 5 minutes 'autodetect_browser_mailer': [opt_bool, True],
'print_ichat_every_foo_minutes': [opt_int, 5],
'confirm_close_muc': [opt_bool, True], # confirm closing MUC window 'confirm_close_muc': [opt_bool, True], # confirm closing MUC window
'notify_on_file_complete': [opt_bool, True], # notif. on file complete 'notify_on_file_complete': [opt_bool, True], # notif. on file complete
'file_transfers_port': [opt_int, 28011], # port, used for file transfers 'file_transfers_port': [opt_int, 28011], # port, used for file transfers

2
src/config.py
View File

@ -365,7 +365,7 @@ class PreferencesWindow:
self.links_open_with_combobox = self.xml.get_widget('links_open_with_combobox') self.links_open_with_combobox = self.xml.get_widget('links_open_with_combobox')
if gajim.config.get('autodetect_browser_mailer'): if gajim.config.get('autodetect_browser_mailer'):
self.links_open_with_combobox.set_active(0) self.links_open_with_combobox.set_active(0)
gtkgui_helpers.plugin.autodetect_browser_mailer() gtkgui_helpers.autodetect_browser_mailer()
# autodetect_browser_mailer is now False. # autodetect_browser_mailer is now False.
# so user has 'Always Use GNOME/KDE' or Custom # so user has 'Always Use GNOME/KDE' or Custom
elif gajim.config.get('openwith') == 'gnome-open': elif gajim.config.get('openwith') == 'gnome-open':

2
src/gajim.py
View File

@ -1016,7 +1016,7 @@ class Interface:
if gajim.config.get('autodetect_browser_mailer'): if gajim.config.get('autodetect_browser_mailer'):
gtkgui_helpers.plugin.autodetect_browser_mailer() gtkgui_helpers.autodetect_browser_mailer()
if gajim.verbose: if gajim.verbose:
gajim.log.setLevel(gajim.logging.DEBUG) gajim.log.setLevel(gajim.logging.DEBUG)

3
src/gtkgui.glade
View File

@ -10138,7 +10138,8 @@ Status message</property>
<child> <child>
<widget class="GtkEventBox" id="gpg_eventbox"> <widget class="GtkEventBox" id="gpg_eventbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="visible_window">False</property> <property name="tooltip" translatable="yes">GPG Encryption</property>
<property name="visible_window">True</property>
<property name="above_child">False</property> <property name="above_child">False</property>
<child> <child>

9
src/gtkgui_helpers.py
View File

@ -22,9 +22,14 @@
import xml.sax.saxutils import xml.sax.saxutils
import gtk import gtk
import os
from common import i18n from common import i18n
i18n.init()
_ = i18n._ _ = i18n._
from common import gajim
def convert_bytes(string): def convert_bytes(string):
suffix = '' suffix = ''
@ -60,7 +65,7 @@ def escape_for_pango_markup(string):
return escaped_str return escaped_str
def autodetect_browser_mailer(self): def autodetect_browser_mailer():
#recognize the environment for appropriate browser/mailer #recognize the environment for appropriate browser/mailer
if os.path.isdir('/proc'): if os.path.isdir('/proc'):
# under Linux: checking if 'gnome-session' or # under Linux: checking if 'gnome-session' or