'dev'->'master'

remap · Feb 23, 2016 · fabaa42 · fabaa42
2 parents e10a17b + 2c44bf6
commit fabaa42
Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/NdnCon copy-Info.plist b/NdnCon copy-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.4</string>
+	<string>0.7.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>34</string>
+	<string>35</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.video</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/ndncon/NCActiveStreamViewer.mm b/ndncon/NCActiveStreamViewer.mm
@@ -114,7 +114,7 @@ -(void)threadUpdatedTo:(NSString*)threadName;
             [ConsumerStatusNoData] =     "chasing",
             [ConsumerStatusAdjusting] =      "adjusting",
             [ConsumerStatusBuffering] =   "buffering",
-            [ConsumerStatusFetching] =     "fetching",
+            [ConsumerStatusFetching] =     "fetching"
 //            [ConsumerStatusChallenge] =     "challenge"
         };
 

diff --git a/ndncon/NCDiscoveryLibraryController.mm b/ndncon/NCDiscoveryLibraryController.mm
@@ -1112,7 +1112,7 @@ -(void)withdrawAllChatrooms
 #pragma mark - private
 -(NSString*)broadcastPrefix
 {
-    return [NCPreferencesController sharedInstance].chatBroadcastPrefix;
+    return [NCPreferencesController sharedInstance].chatroomBroadcastPrefix;
 }
 
 -(void)shutdown

diff --git a/ndncon/NSString+NCAdditions.mm b/ndncon/NSString+NCAdditions.mm
@@ -95,7 +95,7 @@ +(NSString *)chatroomPrefixForChat:(NSString *)chatroomName
     if (chatroomName && username && hubPrefix)
     {
         NSString *userSessionPrefix = [NSString userSessionPrefixForUser:username withHubPrefix:hubPrefix];
-        return [[userSessionPrefix stringByAppendingNdnComponent:@"chat"] stringByAppendingNdnComponent:chatroomName];
+        return [userSessionPrefix stringByAppendingNdnComponent:@"chat"];
     }
 
     return nil;

diff --git a/ndncon/NdnCon-Info.plist b/ndncon/NdnCon-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.2</string>
+	<string>0.7.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>35</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.video</string>
 	<key>LSMinimumSystemVersion</key>