diff options
Diffstat (limited to 'pkgs/aszlig/psi/config.patch')
| -rw-r--r-- | pkgs/aszlig/psi/config.patch | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/pkgs/aszlig/psi/config.patch b/pkgs/aszlig/psi/config.patch index a9462102..a37276fd 100644 --- a/pkgs/aszlig/psi/config.patch +++ b/pkgs/aszlig/psi/config.patch @@ -1,5 +1,5 @@ diff --git a/options/default.xml b/options/default.xml -index 90f019b3..ef33997b 100644 +index 63fd2667..de3332ed 100644 --- a/options/default.xml +++ b/options/default.xml @@ -19,7 +19,7 @@ @@ -11,7 +11,7 @@ index 90f019b3..ef33997b 100644 </auto-update> <enable-multicast comment="Enable multicasting messages to multiple recipients" type="bool">false</enable-multicast> <html comment="Hypertext markup options"> -@@ -86,7 +86,7 @@ +@@ -89,7 +89,7 @@ <security comment="Options related to the seciruty UI"> <show comment="Show the security UI" type="bool">true</show> </security> @@ -20,7 +20,7 @@ index 90f019b3..ef33997b 100644 </account> <message comment="Message options"> <enabled comment="Enable message (i.e. non-chat) functionality" type="bool">true</enabled> -@@ -128,7 +128,7 @@ +@@ -135,7 +135,7 @@ QWidget#bottomFrame>QWidget>QTextEdit[correction="true"] { <default-jid-mode comment="Default jid mode: barejid | auto" type="QString">auto</default-jid-mode> <default-jid-mode-ignorelist comment="Default autojid mode ignore list: jid1,jid2,..." type="QString"></default-jid-mode-ignorelist> <history comment="Message history options"> @@ -29,7 +29,7 @@ index 90f019b3..ef33997b 100644 </history> </chat> <save> -@@ -146,8 +146,8 @@ +@@ -153,8 +153,8 @@ QWidget#bottomFrame>QWidget>QTextEdit[correction="true"] { <auto-delete-unlisted comment="Automatically remove an unlisted contact from the contact list if it does not have any pending messages anymore" type="bool">false</auto-delete-unlisted> <opacity comment="Opacity percentage of the contact list" type="int">100</opacity> <status-messages comment="Status messages for contacts"> @@ -40,7 +40,7 @@ index 90f019b3..ef33997b 100644 </status-messages> <tooltip comment="Display options for the contact list tooltips"> <css type="QString"></css> -@@ -208,7 +208,7 @@ QLineEdit#le_status_text { +@@ -215,7 +215,7 @@ QLineEdit#le_status_text { <always-on-top type="bool">false</always-on-top> <automatically-resize-roster type="bool">false</automatically-resize-roster> <grow-roster-upwards type="bool">true</grow-roster-upwards> @@ -49,7 +49,7 @@ index 90f019b3..ef33997b 100644 <contact-sort-style type="QString">status</contact-sort-style> <disable-service-discovery type="bool">false</disable-service-discovery> <enable-groups type="bool">true</enable-groups> -@@ -223,7 +223,7 @@ QLineEdit#le_status_text { +@@ -230,7 +230,7 @@ QLineEdit#le_status_text { <agent-contacts type="bool">true</agent-contacts> <away-contacts type="bool">true</away-contacts> <hidden-contacts-group type="bool">true</hidden-contacts-group> @@ -58,7 +58,7 @@ index 90f019b3..ef33997b 100644 <self-contact type="bool">true</self-contact> </show> <show-group-counts type="bool">true</show-group-counts> -@@ -248,7 +248,7 @@ QLineEdit#le_status_text { +@@ -255,7 +255,7 @@ QLineEdit#le_status_text { <use-left-click type="bool">false</use-left-click> <use-single-click type="bool">false</use-single-click> <use-status-change-animation type="bool">true</use-status-change-animation> @@ -67,7 +67,7 @@ index 90f019b3..ef33997b 100644 <use-transport-icons type="bool">true</use-transport-icons> <saved-window-geometry type="QRect" > <x>64</x> -@@ -285,7 +285,7 @@ QLineEdit#le_status_text { +@@ -292,7 +292,7 @@ QLineEdit#le_status_text { <custom-pgp-key comment="Show the 'assign pgp key' menu" type="bool">true</custom-pgp-key> </contact> <main comment="Options for the main menu"> @@ -76,7 +76,7 @@ index 90f019b3..ef33997b 100644 </main> <status comment="Options for the status menu"> <chat comment="Enable free for chat" type="bool">true</chat> -@@ -335,7 +335,7 @@ QLineEdit#le_status_text { +@@ -343,7 +343,7 @@ QLineEdit#le_status_text { <disable-send-button type="bool">true</disable-send-button> <systemtray comment="Options related to the system tray"> <use-old comment="Use the old system tray code (deprecated)" type="bool">false</use-old> @@ -85,7 +85,7 @@ index 90f019b3..ef33997b 100644 <use-double-click type="bool">false</use-double-click> </systemtray> <flash-windows comment="Allow windows to flash upon activity" type="bool">true</flash-windows> -@@ -353,8 +353,8 @@ QLineEdit#le_status_text { +@@ -361,8 +361,8 @@ QLineEdit#le_status_text { <contactlist> <background type="QColor"/> <grouping> @@ -96,7 +96,7 @@ index 90f019b3..ef33997b 100644 </grouping> <profile> <header-background type="QColor">#969696</header-background> -@@ -364,16 +364,16 @@ QLineEdit#le_status_text { +@@ -372,16 +372,16 @@ QLineEdit#le_status_text { <away type="QColor">#004bb4</away> <do-not-disturb type="QColor">#7e0000</do-not-disturb> <offline type="QColor">#646464</offline> @@ -116,7 +116,7 @@ index 90f019b3..ef33997b 100644 </tooltip> <muc> <nick-colors type="QStringList" > -@@ -384,21 +384,21 @@ QLineEdit#le_status_text { +@@ -392,21 +392,21 @@ QLineEdit#le_status_text { <item>Red</item> </nick-colors> <role-moderator type="QColor">#910000</role-moderator> @@ -143,7 +143,7 @@ index 90f019b3..ef33997b 100644 <unread-message-color type="QColor">red</unread-message-color> <inactive-color type="QColor">grey</inactive-color> </chat> -@@ -411,10 +411,10 @@ QLineEdit#le_status_text { +@@ -419,10 +419,10 @@ QLineEdit#le_status_text { <use-slim-group-headings type="bool">false</use-slim-group-headings> </contactlist> <font> @@ -158,7 +158,7 @@ index 90f019b3..ef33997b 100644 </font> <css type="QString" /> </look> -@@ -462,20 +462,20 @@ QLineEdit#le_status_text { +@@ -470,20 +470,20 @@ QLineEdit#le_status_text { <suppress-while-away type="bool">false</suppress-while-away> </popup-dialogs> <sounds> @@ -191,8 +191,8 @@ index 90f019b3..ef33997b 100644 + <system-message type="QString"/> <unix-sound-player type="QString"/> </sounds> - <successful-subscription type="bool">false</successful-subscription> -@@ -494,7 +494,7 @@ QLineEdit#le_status_text { + <successful-subscription type="bool">true</successful-subscription> +@@ -502,7 +502,7 @@ QLineEdit#le_status_text { <mouse-middle-button type="QString">close</mouse-middle-button> <!-- hide|close|detach --> <mouse-doubleclick-action type="QString">detach</mouse-doubleclick-action> <size type="QString"></size> <!-- will be invalid when converted to QSize so we can detect first load --> @@ -201,7 +201,7 @@ index 90f019b3..ef33997b 100644 <group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/> <tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/> <use-tab-shortcuts type="bool">true</use-tab-shortcuts> -@@ -627,7 +627,7 @@ QLineEdit#le_status_text { +@@ -715,7 +715,7 @@ QLineEdit#le_status_text { <last-activity type="bool">true</last-activity> </service-discovery> <status> @@ -210,7 +210,7 @@ index 90f019b3..ef33997b 100644 <ask-for-message-on-online type="bool">false</ask-for-message-on-online> <ask-for-message-on-chat type="bool">true</ask-for-message-on-chat> <ask-for-message-on-away type="bool">true</ask-for-message-on-away> -@@ -650,7 +650,20 @@ QLineEdit#le_status_text { +@@ -738,7 +738,20 @@ QLineEdit#le_status_text { <by-template type="bool">true</by-template> <by-status type="bool">false</by-status> </last-overwrite> @@ -232,7 +232,7 @@ index 90f019b3..ef33997b 100644 <presets-in-status-menus type="QString" comment="'yes', 'no' or 'submenu'">submenu</presets-in-status-menus> <show-only-online-offline type="bool">false</show-only-online-offline> <show-choose type="bool">true</show-choose> -@@ -690,5 +703,9 @@ QLineEdit#le_status_text { +@@ -778,5 +791,9 @@ QLineEdit#le_status_text { </keychain> </options> <accounts comment="Account definitions and options"/> @@ -244,30 +244,30 @@ index 90f019b3..ef33997b 100644 + </plugins> </psi> diff --git a/src/psi_profiles.cpp b/src/psi_profiles.cpp -index 77fbd169..4b4bca11 100644 +index 894c8ac9..a6798e76 100644 --- a/src/psi_profiles.cpp +++ b/src/psi_profiles.cpp -@@ -79,8 +79,8 @@ void UserAccount::reset() - req_mutual_auth = false; - legacy_ssl_probe = false; - security_level = QCA::SL_None; -- ssl = SSL_Auto; -- jid = ""; -+ ssl = SSL_Yes; -+ jid = "@jid@"; - pass = ""; - scramSaltedHashPassword = ""; - opt_pass = false; -@@ -90,7 +90,7 @@ void UserAccount::reset() - opt_automatic_resource = true; - priority_dep_on_status = true; - ignore_global_actions = false; -- resource = ApplicationInfo::name(); -+ resource = "@resource@"; - priority = 55; - ibbOnly = false; - opt_keepAlive = true; -@@ -133,7 +133,7 @@ void UserAccount::reset() +@@ -75,8 +75,8 @@ void UserAccount::reset() + req_mutual_auth = false; + legacy_ssl_probe = false; + security_level = QCA::SL_None; +- ssl = SSL_Auto; +- jid = ""; ++ ssl = SSL_Yes; ++ jid = "@jid@"; + pass = ""; + scramSaltedHashPassword = ""; + opt_pass = false; +@@ -86,7 +86,7 @@ void UserAccount::reset() + opt_automatic_resource = true; + priority_dep_on_status = true; + ignore_global_actions = false; +- resource = ApplicationInfo::name(); ++ resource = "@resource@"; + priority = 55; + ibbOnly = false; + opt_keepAlive = true; +@@ -129,7 +129,7 @@ void UserAccount::reset() << "stun.voipbuster.com" << "stun.voxgratia.org"; |