macosx: re-implement macosx-background

[vlc] / modules / gui / macosx / ExtensionsManager.m

diff --git a/modules/gui/macosx/ExtensionsManager.m b/modules/gui/macosx/ExtensionsManager.m
index 4db951fe145e49e476f57ea20bb73bce2344c27d..5e7d33948c77fc6cb1714a95f0f30043b39c5046 100644 (file)
--- a/modules/gui/macosx/ExtensionsManager.m
+++ b/modules/gui/macosx/ExtensionsManager.m
@@ -4,7 +4,7 @@
  * Copyright (C) 2009-2012 VideoLAN and authors
  * $Id$
  *
- * Authors: Brendon Justin <brendonjustin at gmail.com>,
+ * Authors: Brendon Justin <brendonjustin@gmail.com>,
  *          Jean-Philippe André < jpeg # videolan.org >
  *
  * This program is free software; you can redistribute it and/or modify
@@ -33,11 +33,11 @@
 #define MENU_GET_ACTION(a) ( (uint16_t)( ((uint32_t)a) >> 16 ) )
 #define MENU_GET_EXTENSION(a) ( (uint16_t)( ((uint32_t)a) & 0xFFFF ) )
 
- at implementation ExtensionsManager
+@implementation ExtensionsManager
 
 static ExtensionsManager* instance = nil;
 
- at synthesize isUnloading = b_unloading;
+@synthesize isUnloading = b_unloading;
 
 + (ExtensionsManager *)getInstance:( intf_thread_t *)_p_intf
 {
@@ -92,8 +92,8 @@ static ExtensionsManager* instance = nil;
     {
         bool b_Active = extension_IsActivated( p_extensions_manager, p_ext );
 
-        NSString *titleString = [NSString stringWithCString:p_ext->psz_title 
-                                                   encoding:NSASCIIStringEncoding];
+        NSString *titleString = [NSString stringWithCString:p_ext->psz_title
+                                                   encoding:NSUTF8StringEncoding];
 
         if( b_Active && extension_HasMenu( p_extensions_manager, p_ext ) )
         {
@@ -116,7 +116,7 @@ static ExtensionsManager* instance = nil;
                 {
                     ++i_num;
                     titleString = [NSString stringWithCString:ppsz_titles[i]
-                                                     encoding:NSASCIIStringEncoding];
+                                                     encoding:NSUTF8StringEncoding];
                     NSMenuItem *menuItem = [submenu addItemWithTitle:titleString
                                                               action:@selector(triggerMenu:)
                                                        keyEquivalent:@""];
@@ -147,8 +147,8 @@ static ExtensionsManager* instance = nil;
 
             [submenu addItem:[NSMenuItem separatorItem]];
 
-            NSMenuItem *deactivateItem = [submenu addItemWithTitle:@"Deactivate" 
-                                                            action:@selector(triggerMenu:) 
+            NSMenuItem *deactivateItem = [submenu addItemWithTitle:@"Deactivate"
+                                                            action:@selector(triggerMenu:)
                                                      keyEquivalent:@""];
             [deactivateItem setTarget:self];
             deactivateItem.tag = MENU_MAP(0, i_ext);
@@ -352,7 +352,8 @@ static ExtensionsManager* instance = nil;
     msg_Dbg( p_intf, "Killing extension dialog provider" );
     [ExtensionsDialogProvider killInstance];
 
-    vlc_object_release( p_extensions_manager );
+    if( p_extensions_manager )
+        vlc_object_release( p_extensions_manager );
 
     [p_extDict release];
 
@@ -369,4 +370,4 @@ static ExtensionsManager* instance = nil;
     return b_unloading || b_failed;
 }
 
- at end
+@end