Behave correctly when dock icon clicked and no windows are open. From David Haas (haasd@cae.wisc.edu)

camino/MainController.mm

@@ -487,4 +487,24 @@ static PRBool gSetupSmoothTextMenu = PR_FALSE;
   return image;
 }
 
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApp hasVisibleWindows:(BOOL)flag
+{
+  // If AppKit knows what to do, let it.
+  if (flag)
+    return YES;
+    
+  // If window available, wake it up. |mainWindow| should always be null.
+  NSWindow* mainWindow = [mApplication mainWindow];
+  if (!mainWindow)
+    [self newWindow:self];
+  else {												// Don't think this will ever happen, but just in case
+    if ([[mainWindow windowController]respondsToSelector:@selector(showWindow:)])
+      [[mainWindow windowController] showWindow:self];
+    else
+      [self newWindow:self];
+  }
+
+  return NO;
+}
+
 @end

camino/src/application/MainController.mm

@@ -487,4 +487,24 @@ static PRBool gSetupSmoothTextMenu = PR_FALSE;
   return image;
 }
 
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApp hasVisibleWindows:(BOOL)flag
+{
+  // If AppKit knows what to do, let it.
+  if (flag)
+    return YES;
+    
+  // If window available, wake it up. |mainWindow| should always be null.
+  NSWindow* mainWindow = [mApplication mainWindow];
+  if (!mainWindow)
+    [self newWindow:self];
+  else {												// Don't think this will ever happen, but just in case
+    if ([[mainWindow windowController]respondsToSelector:@selector(showWindow:)])
+      [[mainWindow windowController] showWindow:self];
+    else
+      [self newWindow:self];
+  }
+
+  return NO;
+}
+
 @end

chimera/MainController.mm

@@ -487,4 +487,24 @@ static PRBool gSetupSmoothTextMenu = PR_FALSE;
   return image;
 }
 
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApp hasVisibleWindows:(BOOL)flag
+{
+  // If AppKit knows what to do, let it.
+  if (flag)
+    return YES;
+    
+  // If window available, wake it up. |mainWindow| should always be null.
+  NSWindow* mainWindow = [mApplication mainWindow];
+  if (!mainWindow)
+    [self newWindow:self];
+  else {												// Don't think this will ever happen, but just in case
+    if ([[mainWindow windowController]respondsToSelector:@selector(showWindow:)])
+      [[mainWindow windowController] showWindow:self];
+    else
+      [self newWindow:self];
+  }
+
+  return NO;
+}
+
 @end

chimera/src/application/MainController.mm

@@ -487,4 +487,24 @@ static PRBool gSetupSmoothTextMenu = PR_FALSE;
   return image;
 }
 
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApp hasVisibleWindows:(BOOL)flag
+{
+  // If AppKit knows what to do, let it.
+  if (flag)
+    return YES;
+    
+  // If window available, wake it up. |mainWindow| should always be null.
+  NSWindow* mainWindow = [mApplication mainWindow];
+  if (!mainWindow)
+    [self newWindow:self];
+  else {												// Don't think this will ever happen, but just in case
+    if ([[mainWindow windowController]respondsToSelector:@selector(showWindow:)])
+      [[mainWindow windowController] showWindow:self];
+    else
+      [self newWindow:self];
+  }
+
+  return NO;
+}
+
 @end