Plug memory leak on Win32.

2005-11-04  Tor Lillqvist  <tml@novell.com>

	* gtk/gtkstatusicon.c (gtk_status_icon_set_tooltip): Plug memory
	leak on Win32.

diff --git a/ChangeLog b/ChangeLog
index e6c79bfe1d005ba4375c5810b04c72d25daf8357..ecad919859058fc4cd2355c486ed6ae899cc4c62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-04  Tor Lillqvist  <tml@novell.com>
+
+       * gtk/gtkstatusicon.c (gtk_status_icon_set_tooltip): Plug memory
+       leak on Win32.
+
 2005-11-03  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkcursor-win32.c: As there is only one GdkDisplay in

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e6c79bfe1d005ba4375c5810b04c72d25daf8357..ecad919859058fc4cd2355c486ed6ae899cc4c62 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-11-04  Tor Lillqvist  <tml@novell.com>
+
+       * gtk/gtkstatusicon.c (gtk_status_icon_set_tooltip): Plug memory
+       leak on Win32.
+
 2005-11-03  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkcursor-win32.c: As there is only one GdkDisplay in

diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index a745a255cdb8f0d260ac46504e64fe110922e2af..18a504e13837b616a2009370696f15905b31d6e8 100755 (executable)
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -1273,10 +1273,12 @@ gtk_status_icon_set_tooltip (GtkStatusIcon *status_icon,
   else
     {
       WCHAR *wcs = g_utf8_to_utf16 (tooltip_text, -1, NULL, NULL, NULL);
+
       status_icon->priv->nid.uFlags |= NIF_TIP;
       wcsncpy (status_icon->priv->nid.szTip, wcs,
               G_N_ELEMENTS (status_icon->priv->nid.szTip) - 1);
       status_icon->priv->nid.szTip[G_N_ELEMENTS (status_icon->priv->nid.szTip) - 1] = 0;
+      g_free (wcs);
     }
   if (status_icon->priv->nid.hWnd != NULL && status_icon->priv->visible)
     if (!Shell_NotifyIconW (NIM_MODIFY, &status_icon->priv->nid))