Skip to content
Browse files

Fix missing addref + close event (Linux)

  • Loading branch information...
1 parent 454051f commit 4e38308e232dd22f8deb2bcbc25b06bf070533ae @nmaier nmaier committed Sep 1, 2010
Showing with 1 addition and 13 deletions.
  1. +0 −13 components_src/trayPlatformGtk2.cpp
  2. +1 −0 components_src/trayToolkit.cpp
View
13 components_src/trayPlatformGtk2.cpp
@@ -4,8 +4,6 @@
#include "nsCOMPtr.h"
#include "nsServiceManagerUtils.h"
-#define XATOM(atom) static const Atom atom = XInternAtom(xev->xany.display, #atom, false)
-
namespace mintrayr {
namespace platform {
@@ -15,8 +13,6 @@ namespace platform {
static
GdkFilterReturn filterWindows(XEvent *xev, GdkEvent* event, nsIDOMWindow* window)
{
- XATOM(WM_DELETE_WINDOW);
-
if (!xev) {
return GDK_FILTER_CONTINUE;
}
@@ -35,15 +31,6 @@ GdkFilterReturn filterWindows(XEvent *xev, GdkEvent* event, nsIDOMWindow* window
}
break;
- case ClientMessage:
- if (xev->xclient.data.l
- && static_cast<Atom>(xev->xclient.data.l[0]) == WM_DELETE_WINDOW
- && DoMinimizeWindow(window, kTrayOnClose)
- ) {
- return GDK_FILTER_REMOVE;
- }
- break;
-
default:
break;
}
View
1 components_src/trayToolkit.cpp
@@ -369,6 +369,7 @@ NS_IMETHODIMP TrayServiceImpl::CreateIcon(nsIDOMWindow *aWindow, PRBool aCloseOn
continue;
}
*aResult = mIcons[i];
+ NS_ADDREF(*aResult);
return NS_OK;
}

0 comments on commit 4e38308

Please sign in to comment.
Something went wrong with that request. Please try again.