aboutsummaryrefslogtreecommitdiff
path: root/src/github
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-11-05 20:09:19 -0800
committerScott Jackson <daneren2005@gmail.com>2013-11-05 20:09:19 -0800
commite4a91d16f874b6ff0e9c349fbb9a0c1670dd0595 (patch)
tree61b5db20e997ebca1fc54132808f0b73ec2404c1 /src/github
parenta32d17cf4810ba2477f2c5077e975d7c6fcd74be (diff)
downloaddsub-e4a91d16f874b6ff0e9c349fbb9a0c1670dd0595.tar.gz
dsub-e4a91d16f874b6ff0e9c349fbb9a0c1670dd0595.tar.bz2
dsub-e4a91d16f874b6ff0e9c349fbb9a0c1670dd0595.zip
Fix web commits
Diffstat (limited to 'src/github')
-rw-r--r--src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java3
-rw-r--r--src/github/daneren2005/dsub/domain/Bookmark.java4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
index de82504e..a97e5dda 100644
--- a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
+++ b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
@@ -42,6 +42,7 @@ import github.daneren2005.dsub.domain.MusicDirectory;
import github.daneren2005.dsub.domain.PlayerState;
import github.daneren2005.dsub.fragments.ChatFragment;
import github.daneren2005.dsub.fragments.MainFragment;
+import github.daneren2005.dsub.fragments.SearchFragment;
import github.daneren2005.dsub.fragments.SelectArtistFragment;
import github.daneren2005.dsub.fragments.SelectDirectoryFragment;
import github.daneren2005.dsub.fragments.SelectPlaylistFragment;
@@ -101,7 +102,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity {
if(getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_QUERY) != null) {
SearchFragment fragment = new SearchFragment();
- replaceFragment(fragment, currentFragment.getRootId(), fragment.getSupportTag());
+ replaceFragment(fragment, R.id.home_layout, fragment.getSupportTag());
}
}
diff --git a/src/github/daneren2005/dsub/domain/Bookmark.java b/src/github/daneren2005/dsub/domain/Bookmark.java
index f842ba36..83002a62 100644
--- a/src/github/daneren2005/dsub/domain/Bookmark.java
+++ b/src/github/daneren2005/dsub/domain/Bookmark.java
@@ -92,11 +92,11 @@ public class Bookmark {
}
}
- public Entry getEntry() {
+ public MusicDirectory.Entry getEntry() {
return this.entry;
}
- public void setEntry(Entry entry) {
+ public void setEntry(MusicDirectory.Entry entry) {
this.entry = entry;
}
}