Commit 1991ee23 authored by David Smith's avatar David Smith Committed by david

Part 2 of N

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@7659 b35dd754-fafc-0310-a699-88a17e54d16e
parent b832bb0a
B/* Localized versions of Info.plist keys */ B/* Localized versions of Info.plist keys */
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Wildfire</string> <string>Openfire</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string></string> <string></string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0</string> <string>1.0</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>
<string>wildfirePrefPane</string> <string>openfirePrefPane</string>
<key>NSPrefPaneIconFile</key> <key>NSPrefPaneIconFile</key>
<string>wildfirePrefPaneLogo.tiff</string> <string>openfirePrefPaneLogo.tiff</string>
<key>NSPrefPaneIconLabel</key> <key>NSPrefPaneIconLabel</key>
<string>Wildfire</string> <string>Openfire</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
<string>wildfirePrefPane</string> <string>openfirePrefPane</string>
</dict> </dict>
</plist> </plist>
...@@ -116,7 +116,7 @@ static void toggleOpenfire() ...@@ -116,7 +116,7 @@ static void toggleOpenfire()
args[1] = "unload"; args[1] = "unload";
else else
args[1] = "load"; args[1] = "load";
args[2] = "/Library/LaunchDaemons/org.jivesoftware.wildfire.plist"; args[2] = "/Library/LaunchDaemons/org.jivesoftware.openfire.plist";
args[3] = NULL; args[3] = NULL;
execv("/bin/launchctl", args); execv("/bin/launchctl", args);
......
// //
// wildfirePrefPane.h // openfirePrefPane.h
// Preference panel for Openfire // Preference panel for Openfire
// //
// Created by Daniel Henninger on 7/7/06. // Created by Daniel Henninger on 7/7/06.
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
#include <unistd.h> #include <unistd.h>
// 'ps' command to use to check for running openfire daemon // 'ps' command to use to check for running openfire daemon
char *pscmd = "/bin/ps auxww | fgrep -v 'fgrep' | fgrep wildfire/lib/startup.jar"; char *pscmd = "/bin/ps auxww | fgrep -v 'fgrep' | fgrep openfire/lib/startup.jar";
// The path to the plist file // The path to the plist file
NSString *plistPath = @"/Library/LaunchDaemons/org.jivesoftware.wildfire.plist"; NSString *plistPath = @"/Library/LaunchDaemons/org.jivesoftware.openfire.plist";
@interface wildfirePrefPane : NSPreferencePane @interface openfirePrefPane : NSPreferencePane
{ {
IBOutlet NSButton *startButton; IBOutlet NSButton *startButton;
IBOutlet NSButton *autoStartCheckbox; IBOutlet NSButton *autoStartCheckbox;
......
// //
// wildfirePrefPane.m // openfirePrefPane.m
// Preference panel for Wildfire // Preference panel for Openfire
// //
// Created by Daniel Henninger on 7/7/06. // Created by Daniel Henninger on 7/7/06.
// Copyright (c) 2006 Jive Software. All rights reserved. // Copyright (c) 2006 Jive Software. All rights reserved.
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
#import <Security/Security.h> #import <Security/Security.h>
#import <CoreFoundation/CoreFoundation.h> #import <CoreFoundation/CoreFoundation.h>
#import "wildfirePrefPane.h" #import "openfirePrefPane.h"
@implementation wildfirePrefPane @implementation openfirePrefPane
- (void)mainViewDidLoad - (void)mainViewDidLoad
{ {
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
nil, nil,
nil, nil,
self, self,
@"An error occured while detecting a running Wildfire process.", @"An error occured while detecting a running Openfire process.",
nil); nil);
return NO; return NO;
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
nil, nil,
nil, nil,
self, self,
@"Could not start the Wildfire server.", @"Could not start the Openfire server.",
nil); nil);
[statusTimer invalidate]; [statusTimer invalidate];
[self checkStatus]; [self checkStatus];
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
[statusMessage setStringValue:@"Stopped"]; [statusMessage setStringValue:@"Stopped"];
[statusMessage setTextColor:[NSColor redColor]]; [statusMessage setTextColor:[NSColor redColor]];
[statusDescription setStringValue:@"The server may take a few seconds to start up."]; [statusDescription setStringValue:@"The server may take a few seconds to start up."];
[startButton setTitle:@"Start Wildfire"]; [startButton setTitle:@"Start Openfire"];
[viewAdminButton setEnabled:NO]; [viewAdminButton setEnabled:NO];
} }
else else
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
[statusMessage setStringValue:@"Running"]; [statusMessage setStringValue:@"Running"];
[statusMessage setTextColor:[NSColor greenColor]]; [statusMessage setTextColor:[NSColor greenColor]];
[statusDescription setStringValue:@"The server may take a few seconds to stop."]; [statusDescription setStringValue:@"The server may take a few seconds to stop."];
[startButton setTitle:@"Stop Wildfire"]; [startButton setTitle:@"Stop Openfire"];
[viewAdminButton setEnabled:YES]; [viewAdminButton setEnabled:YES];
} }
BOOL isStartingAtBoot = [[[NSMutableDictionary dictionaryWithContentsOfFile:plistPath] objectForKey:@"RunAtLoad"] boolValue]; BOOL isStartingAtBoot = [[[NSMutableDictionary dictionaryWithContentsOfFile:plistPath] objectForKey:@"RunAtLoad"] boolValue];
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
nil, nil,
nil, nil,
self, self,
@"Could not start the Wildfire server.", @"Could not start the Openfire server.",
nil); nil);
[statusTimer invalidate]; [statusTimer invalidate];
[self checkStatus]; [self checkStatus];
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
nil, nil,
nil, nil,
self, self,
@"Could not stop the Wildfire server.", @"Could not stop the Openfire server.",
nil); nil);
[statusTimer invalidate]; [statusTimer invalidate];
[self checkStatus]; [self checkStatus];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment