aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2010-10-08 00:20:21 -0500
committerKenny Root <kenny@the-b.org>2010-10-08 00:20:21 -0500
commit25f50d9ba6966f127722c095661da7766600ba69 (patch)
tree2766210cc4777bf1b163646b2a05f0e2b778ad41 /src
parent321493cbd9e7459027a1eb4d7b5d9a00738c2863 (diff)
parent1375da7d5a42e3942b71393720670db10e249126 (diff)
downloadconnectbot-25f50d9ba6966f127722c095661da7766600ba69.tar.gz
connectbot-25f50d9ba6966f127722c095661da7766600ba69.tar.bz2
connectbot-25f50d9ba6966f127722c095661da7766600ba69.zip
Merge branch 'master' of http://github.com/irishmark/connectbot
Diffstat (limited to 'src')
-rw-r--r--src/org/connectbot/HostListActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java
index f65c069..3b02530 100644
--- a/src/org/connectbot/HostListActivity.java
+++ b/src/org/connectbot/HostListActivity.java
@@ -178,7 +178,8 @@ public class HostListActivity extends ListActivity {
// start thread to check for new version
new UpdateHelper(this);
- this.makingShortcut = Intent.ACTION_CREATE_SHORTCUT.equals(getIntent().getAction());
+ this.makingShortcut = Intent.ACTION_CREATE_SHORTCUT.equals(getIntent().getAction())
+ || Intent.ACTION_PICK.equals(getIntent().getAction());
// connect with hosts database and populate list
this.hostdb = new HostDatabase(this);