summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSusobhan Ghosh <susobhang70@gmail.com>2016-05-07 19:08:15 +0530
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2016-05-07 14:19:07 +0000
commit3f22f287b4ae80c5879f87071be93c3ea5d1001c (patch)
tree4096da8a762b75f19153daaa25a31358970c9f5f
parentd7859f40b0b51c88ea78967ace3f62f76d9786c1 (diff)
tdf#88502 Firefox Theme URL in custom theme search
Removed "suggested" from categories label. Fixed URL checking. Change-Id: Ifbea40cf724c91f6af72c485d9ae7eb599afff65 Reviewed-on: https://gerrit.libreoffice.org/24716 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--cui/source/options/personalization.cxx5
-rw-r--r--cui/uiconfig/ui/select_persona_dialog.ui2
2 files changed, 5 insertions, 2 deletions
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 1b668b6d9bc5..486529de6229 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -154,8 +154,11 @@ IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas, Button*, pButton, void )
// 15 results so that invalid and duplicate search results whose names can't be retreived can be skipped
OUString rSearchURL = "https://services.addons.allizom.org/en-US/firefox/api/1.5/search/" + searchTerm + "/9/15";
- if ( searchTerm.startsWith( "https://addons.mozilla.org/en-US/firefox/addon" ) )
+ if ( searchTerm.startsWith( "https://addons.mozilla.org/" ) )
+ {
+ searchTerm = "https://addons.mozilla.org/en-US/" + searchTerm.copy( searchTerm.indexOf( "firefox" ) );
m_rSearchThread = new SearchAndParseThread( this, searchTerm, true );
+ }
else
m_rSearchThread = new SearchAndParseThread( this, rSearchURL, false );
diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui
index 600bd8d06414..230f3b241930 100644
--- a/cui/uiconfig/ui/select_persona_dialog.ui
+++ b/cui/uiconfig/ui/select_persona_dialog.ui
@@ -225,7 +225,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Suggested Categories</property>
+ <property name="label" translatable="yes">Categories</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>