Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/gajim-remote.desktop.in.in11
-rw-r--r--data/gui/preferences_window.ui16
-rw-r--r--po/be.po2
-rw-r--r--po/be@latin.po2
-rw-r--r--po/bg.po2
-rw-r--r--po/br.po2
-rw-r--r--po/cs.po2
-rw-r--r--po/da.po2
-rw-r--r--po/de.po2
-rw-r--r--po/el.po2
-rw-r--r--po/en_GB.po4
-rw-r--r--po/eo.po2
-rw-r--r--po/es.po2
-rw-r--r--po/eu.po2
-rw-r--r--po/fr.po2
-rw-r--r--po/gl.po2
-rw-r--r--po/he.po2
-rw-r--r--po/hr.po2
-rw-r--r--po/hu.po2
-rw-r--r--po/it.po2
-rw-r--r--po/ja.po2
-rw-r--r--po/kk.po2
-rw-r--r--po/lt.po4
-rw-r--r--po/nb.po2
-rw-r--r--po/nl.po2
-rw-r--r--po/no.po2
-rw-r--r--po/pl.po2
-rw-r--r--po/pt.po2
-rw-r--r--po/pt_BR.po2
-rw-r--r--po/ru.po2
-rw-r--r--po/sk.po2
-rw-r--r--po/sr.po2
-rw-r--r--po/sr@Latn.po2
-rw-r--r--po/sv.po2
-rw-r--r--po/tr.po2
-rw-r--r--po/uk.po2
-rw-r--r--po/zh_CN.po2
-rw-r--r--po/zh_TW.po2
-rw-r--r--src/common/config.py1
-rw-r--r--src/common/gnupg.py1
-rw-r--r--src/config.py7
-rw-r--r--src/gtkgui_helpers.py87
-rw-r--r--src/gui_interface.py6
43 files changed, 52 insertions, 153 deletions
diff --git a/data/gajim-remote.desktop.in.in b/data/gajim-remote.desktop.in.in
new file mode 100644
index 000000000..a2c56a27b
--- /dev/null
+++ b/data/gajim-remote.desktop.in.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly;
+_Name=Gajim Remote
+_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip
+Version=1.0
+Exec=gajim-remote handle_uri %u
+TryExec=gajim-remote
+StartupNotify=false
+Terminal=false
+Type=Application
+MimeType=x-scheme-handler/xmpp
diff --git a/data/gui/preferences_window.ui b/data/gui/preferences_window.ui
index 74e726bf6..56927b443 100644
--- a/data/gui/preferences_window.ui
+++ b/data/gui/preferences_window.ui
@@ -2753,22 +2753,6 @@ to discover one from server.</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="check_default_client_checkbutton">
- <property name="label" translatable="yes">Check on startup if Gajim is the _default Jabber client</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_check_default_client_checkbutton_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
</child>
</object>
diff --git a/po/be.po b/po/be.po
index e909290dc..5a0aa0888 100644
--- a/po/be.po
+++ b/po/be.po
@@ -9451,7 +9451,7 @@ msgstr ""
"адпраўлены на ўсе рахункі"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Апрацоўваць спасылкі xmpp:/"
#: ../src/gajim-remote.py:280
diff --git a/po/be@latin.po b/po/be@latin.po
index c670698ad..1a8a914d4 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -9483,7 +9483,7 @@ msgstr ""
"dasłany na ŭsie konty"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Absłuhoŭvaj spasyłki xmpp:/"
#: ../src/gajim-remote.py:280
diff --git a/po/bg.po b/po/bg.po
index fc5dff678..904733b7e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9403,7 +9403,7 @@ msgstr ""
"акаунти"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Обработка на адрес тип xmpp://"
#: ../src/gajim-remote.py:280
diff --git a/po/br.po b/po/br.po
index 8614ff461..bc4580281 100644
--- a/po/br.po
+++ b/po/br.po
@@ -9450,7 +9450,7 @@ msgid ""
msgstr ""
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr ""
#: ../src/gajim-remote.py:280
diff --git a/po/cs.po b/po/cs.po
index 2b9cff660..594fc9b4a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9316,7 +9316,7 @@ msgstr ""
"ze všech účtů"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Obsluhovat xmpp:/ uri"
#: ../src/gajim-remote.py:280
diff --git a/po/da.po b/po/da.po
index a37655621..a90fef251 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9347,7 +9347,7 @@ msgstr ""
"blive sendt til alle kontoer"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Håndter en xmpp:/ uri"
#: ../src/gajim-remote.py:280
diff --git a/po/de.po b/po/de.po
index 688847a1d..e9ce6425f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9448,7 +9448,7 @@ msgstr ""
"Avatar allen Konten zugewiesen"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Verarbeite einen xmpp:/-URI"
#: ../src/gajim-remote.py:280
diff --git a/po/el.po b/po/el.po
index f4eec5a80..cd9bad371 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9546,7 +9546,7 @@ msgstr ""
#: ../src/gajim-remote.py:278
#, fuzzy
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Το URI \"%s\" δεν είναι έγκυρο."
#: ../src/gajim-remote.py:280
diff --git a/po/en_GB.po b/po/en_GB.po
index d6845dd5a..9d1a5cbe5 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9283,8 +9283,8 @@ msgstr ""
"all accounts"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
-msgstr "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
+msgstr "Handle a xmpp: uri"
#: ../src/gajim-remote.py:280
msgid "?CLI:uri"
diff --git a/po/eo.po b/po/eo.po
index e4e486239..91a3d2811 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9447,7 +9447,7 @@ msgstr ""
"kontoj"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Prilabori xmpp:/ uri"
#: ../src/gajim-remote.py:280
diff --git a/po/es.po b/po/es.po
index 7e4a75b8d..d384cf2a2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9249,7 +9249,7 @@ msgstr ""
"el avatar en todas las cuentas"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Manejar una uri xmpp:/"
#: ../src/gajim-remote.py:280
diff --git a/po/eu.po b/po/eu.po
index e13b258ef..90eaafde8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9469,7 +9469,7 @@ msgstr ""
"Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr ""
#: ../src/gajim-remote.py:280
diff --git a/po/fr.po b/po/fr.po
index e0b596403..c218ec4a8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9332,7 +9332,7 @@ msgstr ""
"envoyé à tous les comptes"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Gère une URI du type xmpp:"
#: ../src/gajim-remote.py:280
diff --git a/po/gl.po b/po/gl.po
index 5558b9a49..cc3e73351 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9506,7 +9506,7 @@ msgstr ""
"a todas as contas"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr ""
#: ../src/gajim-remote.py:280
diff --git a/po/he.po b/po/he.po
index e14855b71..528a365fa 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9525,7 +9525,7 @@ msgstr "cli"
#: ../src/gajim-remote.py:278
#, fuzzy
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "cli"
#: ../src/gajim-remote.py:280
diff --git a/po/hr.po b/po/hr.po
index eb48fb99e..736fadca8 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -9339,7 +9339,7 @@ msgstr ""
"na sve račune"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Rukuj xmpp:/ adresama"
#: ../src/gajim-remote.py:280
diff --git a/po/hu.po b/po/hu.po
index f1c95fdb3..ddaa6342b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9490,7 +9490,7 @@ msgstr ""
"be set for all accounts"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Egy xmpp:/ uri kezelése"
#: ../src/gajim-remote.py:280
diff --git a/po/it.po b/po/it.po
index 0fdc7e993..eeaceb05d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9329,7 +9329,7 @@ msgstr ""
"verrà impostato per tutti gli account"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Gestisci un uri xmpp:/"
#: ../src/gajim-remote.py:280
diff --git a/po/ja.po b/po/ja.po
index 90e6049d5..d048b6070 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9203,7 +9203,7 @@ msgstr ""
"に設定されます"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "xmpp:/ の URI を取り扱います"
#: ../src/gajim-remote.py:280
diff --git a/po/kk.po b/po/kk.po
index 03066c268..fdda7c903 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -9251,7 +9251,7 @@ msgstr ""
"орнатылады"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "\"xmpp:/\" түріндегі сілтемені өңдеу"
#: ../src/gajim-remote.py:280
diff --git a/po/lt.po b/po/lt.po
index e99ba10cd..cda265df5 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9071,8 +9071,8 @@ msgstr ""
"all accounts"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
-msgstr "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
+msgstr "Handle a xmpp: uri"
#: ../src/gajim-remote.py:280
msgid "?CLI:uri"
diff --git a/po/nb.po b/po/nb.po
index d9fe46754..713c81293 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9321,7 +9321,7 @@ msgstr ""
"til alle kontoer"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Håndtere en xmpp:/ uri"
#: ../src/gajim-remote.py:280
diff --git a/po/nl.po b/po/nl.po
index d250012a6..03db1d6db 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9190,7 +9190,7 @@ msgid ""
msgstr ""
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr ""
#: ../src/gajim-remote.py:280
diff --git a/po/no.po b/po/no.po
index ccd8a325b..a2f6709ac 100644
--- a/po/no.po
+++ b/po/no.po
@@ -9320,7 +9320,7 @@ msgstr ""
"til alle kontoer"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Håndtere en xmpp:/ uri"
#: ../src/gajim-remote.py:280
diff --git a/po/pl.po b/po/pl.po
index 1a865de36..8a49551ae 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8979,7 +8979,7 @@ msgid "Account in which the avatar will be set; if not specified, the avatar wil
msgstr "Konto, dla którego ma być ustawiony awatar; jeżeli nie jest określone, awatar zostanie ustawiony dla wszystkich kont"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Obsługuj URI xmpp:/"
#: ../src/gajim-remote.py:280
diff --git a/po/pt.po b/po/pt.po
index 98823805a..6b4e6e7eb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9484,7 +9484,7 @@ msgid ""
msgstr ""
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr ""
#: ../src/gajim-remote.py:280
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a7b4eb0de..43d13a2d3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9369,7 +9369,7 @@ msgstr ""
"para todas as contas"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Manipular uma URI xmpp:/"
#: ../src/gajim-remote.py:280
diff --git a/po/ru.po b/po/ru.po
index 8bcfd6a51..12e464fc3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9268,7 +9268,7 @@ msgstr ""
"будет назначен всем учетным записям."
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Обработать ссылку формата «xmpp:/»"
#: ../src/gajim-remote.py:280
diff --git a/po/sk.po b/po/sk.po
index f2da75ac8..c1a913c00 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9212,7 +9212,7 @@ msgstr ""
"všetkým účtom"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr ""
#: ../src/gajim-remote.py:280
diff --git a/po/sr.po b/po/sr.po
index 079c62a35..0bb959ac3 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9315,7 +9315,7 @@ msgstr ""
"све налоге"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Управља xmpp:/ uri-јем"
#: ../src/gajim-remote.py:280
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 10339a4c4..c8656cb79 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -9326,7 +9326,7 @@ msgstr ""
"sve naloge"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Upravlja xmpp:/ uri-jem"
#: ../src/gajim-remote.py:280
diff --git a/po/sv.po b/po/sv.po
index 4c6839ef6..c639f009a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9243,7 +9243,7 @@ msgstr ""
"skickas till alla konton"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Hantera en xmpp:/ URI"
#: ../src/gajim-remote.py:280
diff --git a/po/tr.po b/po/tr.po
index 345b172f7..a5c138b8f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9218,7 +9218,7 @@ msgstr ""
#: ../src/gajim-remote.py:278
#, fuzzy
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Adres verilmedi"
#: ../src/gajim-remote.py:280
diff --git a/po/uk.po b/po/uk.po
index 257ee0544..cfbb8a525 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9331,7 +9331,7 @@ msgstr ""
"аватар буде встановлено до всіх облікових записів"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "Обробка xmpp:/ uri"
#: ../src/gajim-remote.py:280
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5807fb642..26cd7341f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9036,7 +9036,7 @@ msgid ""
msgstr "要设置为这个头像的账户; 如果不指定, 所有账户都将被设置为这个头像。"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "处理一个 xmpp:/ uri"
#: ../src/gajim-remote.py:280
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 62af8fb10..9cf93550b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9044,7 +9044,7 @@ msgid ""
msgstr "要設定為這個頭像的帳號; 如果不指定，所有帳號都將被設定為這個頭像。"
#: ../src/gajim-remote.py:278
-msgid "Handle a xmpp:/ uri"
+msgid "Handle a xmpp: uri"
msgstr "處理一個 xmpp:/ uri"
#: ../src/gajim-remote.py:280
diff --git a/src/common/config.py b/src/common/config.py
index 087e112ed..2945668d5 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -245,7 +245,6 @@ class Config:
'notification_avatar_height': [opt_int, 48],
'muc_highlight_words': [opt_str, '', _('A semicolon-separated list of words that will be highlighted in group chats.')],
'quit_on_roster_x_button': [opt_bool, False, _('If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if notification icon is used.')],
- 'check_if_gajim_is_default': [opt_bool, True, _('If True, Gajim will check if it\'s the default jabber client on each startup.')],
'show_unread_tab_icon': [opt_bool, False, _('If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated.')],
'show_status_msgs_in_roster': [opt_bool, True, _('If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window.'), True],
'show_avatars_in_roster': [opt_bool, True, '', True],
diff --git a/src/common/gnupg.py b/src/common/gnupg.py
index d730ece01..4fb40e0a1 100644
--- a/src/common/gnupg.py
+++ b/src/common/gnupg.py
@@ -608,6 +608,7 @@ class Sign(TextHandler):
__bool__ = __nonzero__
def handle_status(self, key, value):
+ self.status = ''
if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE",
"GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "INV_SGNR",
"NO_SGNR", "MISSING_PASSPHRASE", "NEED_PASSPHRASE_PIN",
diff --git a/src/config.py b/src/config.py
index 2e2250712..e03725891 100644
--- a/src/config.py
+++ b/src/config.py
@@ -555,10 +555,6 @@ class PreferencesWindow:
self.update_proxy_list()
- # check if gajm is default
- st = gajim.config.get('check_if_gajim_is_default')
- self.xml.get_object('check_default_client_checkbutton').set_active(st)
-
# Ignore messages from unknown contacts
w = self.xml.get_object('ignore_events_from_unknown_contacts_checkbutton')
st = self.get_per_account_option('ignore_unknown_contacts')
@@ -1177,9 +1173,6 @@ class PreferencesWindow:
widget.set_inconsistent(False)
self.on_per_account_checkbutton_toggled(widget, 'send_idle_time')
- def on_check_default_client_checkbutton_toggled(self, widget):
- self.on_checkbutton_toggled(widget, 'check_if_gajim_is_default')
-
def on_notify_gmail_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'notify_on_new_gmail_email')
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 8789ff24d..ad684685b 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -688,93 +688,6 @@ def decode_filechooser_file_paths(file_paths):
return file_paths_list
-def possibly_set_gajim_as_xmpp_handler():
- """
- Register (by default only the first time) 'xmmp:' to Gajim
- """
- path_to_dot_kde = os.path.expanduser('~/.kde')
- if os.path.exists(path_to_dot_kde):
- path_to_kde_file = os.path.join(path_to_dot_kde,
- 'share/services/xmpp.protocol')
- else:
- path_to_kde_file = None
-
- def set_gajim_as_xmpp_handler(is_checked=None):
- if is_checked is not None:
- # come from confirmation dialog
- gajim.config.set('check_if_gajim_is_default', is_checked)
- path_to_gajim_script, typ = get_abspath_for_script('gajim-remote', True)
- if path_to_gajim_script:
- if typ == 'svn':
- command = path_to_gajim_script + ' handle_uri %s'
- else: # 'installed'
- command = 'gajim-remote handle_uri %s'
-
- # setting for GNOME/Gconf
- client.set_bool('/desktop/gnome/url-handlers/xmpp/enabled', True)
- client.set_string('/desktop/gnome/url-handlers/xmpp/command',
- command)
- client.set_bool('/desktop/gnome/url-handlers/xmpp/needs_terminal',
- False)
-
- # setting for KDE
- if path_to_kde_file is not None: # user has run kde at least once
- try:
- f = open(path_to_kde_file, 'a')
- f.write('''\
-[Protocol]
-exec=%s "%%u"
-protocol=xmpp
-input=none
-output=none
-helper=true
-listing=false
-reading=false
-writing=false
-makedir=false
-deleting=false
-icon=gajim
-Description=xmpp
-''' % command)
- f.close()
- except IOError:
- log.debug("I/O Error writing settings to %s",
- repr(path_to_kde_file), exc_info=True)
- else: # no gajim remote, stop ask user everytime
- gajim.config.set('check_if_gajim_is_default', False)
-
- try:
- __import__('gconf')
- # in try because daemon may not be there
- client = gconf.client_get_default()
- except Exception:
- return
-
- old_command = client.get_string('/desktop/gnome/url-handlers/xmpp/command')
- if not old_command or old_command.endswith(' open_chat %s'):
- # first time (GNOME/GCONF) or old Gajim version
- we_set = True
- elif path_to_kde_file is not None and not os.path.exists(path_to_kde_file):
- # only the first time (KDE)
- we_set = True
- else:
- we_set = False
-
- if we_set:
- set_gajim_as_xmpp_handler()
- elif old_command and not old_command.endswith(' handle_uri %s'):
- # xmpp: is currently handled by another program, so ask the user
- pritext = _('Gajim is not the default Jabber client')
- sectext = _('Would you like to make Gajim the default Jabber client?')
- checktext = _('Always check to see if Gajim is the default Jabber '
- 'client on startup')
- def on_cancel(checked):
- gajim.config.set('check_if_gajim_is_default', checked)
- dlg = dialogs.ConfirmationDialogCheck(pritext, sectext, checktext,
- set_gajim_as_xmpp_handler, on_cancel)
- if gajim.config.get('check_if_gajim_is_default'):
- dlg.checkbutton.set_active(True)
-
def escape_underscore(s):
"""
Escape underlines to prevent them from being interpreted as keyboard
diff --git a/src/gui_interface.py b/src/gui_interface.py
index 2cbf7b3e1..fad5fad45 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -1212,6 +1212,8 @@ class Interface:
file_props = None
# get the file_props of our session
file_props = FilesProp.getFileProp(obj.conn.name, obj.sid)
+ if not file_props:
+ return
ft.set_status(file_props, 'stop')
file_props.error = -4 # is it the right error code?
ft.show_stopped(obj.jid, file_props, 'Peer cancelled ' +
@@ -2792,10 +2794,6 @@ class Interface:
if gajim.config.get('verbose'):
logging_helpers.set_verbose()
- # Is Gajim default app?
- if os.name != 'nt' and gajim.config.get('check_if_gajim_is_default'):
- gtkgui_helpers.possibly_set_gajim_as_xmpp_handler()
-
for account in gajim.config.get_per('accounts'):
if gajim.config.get_per('accounts', account, 'is_zeroconf'):
gajim.ZEROCONF_ACC_NAME = account
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 11:01:37 +0300