AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

Use G_STRLOC instead __FILE__ and __LINE__

Browse Source
This commit is contained in:
Javier Jardón 2009-10-26 22:51:41 +01:00
parent 92a68f4cf9
commit d0f2cd73b0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkstatusicon.c
View File

@ -702,7 +702,7 @@ wndproc (HWND hwnd,
if (!Shell_NotifyIconW (NIM_ADD, &priv->nid)) if (!Shell_NotifyIconW (NIM_ADD, &priv->nid))
{ {
g_warning ("%s:%d:Shell_NotifyIcon(NIM_ADD) failed", __FILE__, __LINE__-2); g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_ADD) failed");
priv->nid.hWnd = NULL; priv->nid.hWnd = NULL;
continue; continue;
} }
@ -902,7 +902,7 @@ gtk_status_icon_init (GtkStatusIcon *status_icon)
if (!Shell_NotifyIconW (NIM_ADD, &priv->nid)) if (!Shell_NotifyIconW (NIM_ADD, &priv->nid))
{ {
g_warning ("%s:%d:Shell_NotifyIcon(NIM_ADD) failed", __FILE__, __LINE__-2); g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_ADD) failed");
priv->nid.hWnd = NULL; priv->nid.hWnd = NULL;
} }
@ -1391,7 +1391,7 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
priv->nid.uFlags |= NIF_ICON; priv->nid.uFlags |= NIF_ICON;
if (priv->nid.hWnd != NULL && priv->visible) if (priv->nid.hWnd != NULL && priv->visible)
if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1); g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
if (prev_hicon) if (prev_hicon)
DestroyIcon (prev_hicon); DestroyIcon (prev_hicon);
#endif #endif
@ -1440,7 +1440,7 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
priv->nid.uFlags |= NIF_ICON; priv->nid.uFlags |= NIF_ICON;
if (priv->nid.hWnd != NULL && priv->visible) if (priv->nid.hWnd != NULL && priv->visible)
if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1); g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
if (prev_hicon) if (prev_hicon)
DestroyIcon (prev_hicon); DestroyIcon (prev_hicon);
#endif #endif
@ -1461,7 +1461,7 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
priv->nid.uFlags &= ~NIF_ICON; priv->nid.uFlags &= ~NIF_ICON;
if (priv->nid.hWnd != NULL && priv->visible) if (priv->nid.hWnd != NULL && priv->visible)
if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1); g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
#endif #endif
#ifdef GDK_WINDOWING_QUARTZ #ifdef GDK_WINDOWING_QUARTZ
[priv->status_item setImage:NULL]; [priv->status_item setImage:NULL];
@ -1491,7 +1491,7 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
priv->nid.uFlags |= NIF_ICON; priv->nid.uFlags |= NIF_ICON;
if (priv->nid.hWnd != NULL && priv->visible) if (priv->nid.hWnd != NULL && priv->visible)
if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1); g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
if (prev_hicon) if (prev_hicon)
DestroyIcon (prev_hicon); DestroyIcon (prev_hicon);
g_object_unref (pixbuf); g_object_unref (pixbuf);
@ -1535,7 +1535,7 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
priv->nid.uFlags |= NIF_ICON; priv->nid.uFlags |= NIF_ICON;
if (priv->nid.hWnd != NULL && priv->visible) if (priv->nid.hWnd != NULL && priv->visible)
if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1); g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
if (prev_hicon) if (prev_hicon)
DestroyIcon (prev_hicon); DestroyIcon (prev_hicon);
g_object_unref (pixbuf); g_object_unref (pixbuf);
@ -1582,7 +1582,7 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
priv->nid.uFlags |= NIF_ICON; priv->nid.uFlags |= NIF_ICON;
if (priv->nid.hWnd != NULL && priv->visible) if (priv->nid.hWnd != NULL && priv->visible)
if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1); g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
if (prev_hicon) if (prev_hicon)
DestroyIcon (prev_hicon); DestroyIcon (prev_hicon);
g_object_unref (pixbuf); g_object_unref (pixbuf);
@ -1615,7 +1615,7 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
priv->nid.uFlags &= ~NIF_ICON; priv->nid.uFlags &= ~NIF_ICON;
if (priv->nid.hWnd != NULL && priv->visible) if (priv->nid.hWnd != NULL && priv->visible)
if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1); g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
#endif #endif
#ifdef GDK_WINDOWING_QUARTZ #ifdef GDK_WINDOWING_QUARTZ
{ {
@ -2737,7 +2737,7 @@ gtk_status_icon_set_tooltip_text (GtkStatusIcon *status_icon,
} }
if (priv->nid.hWnd != NULL && priv->visible) if (priv->nid.hWnd != NULL && priv->visible)
if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
g_warning ("%s:%d:Shell_NotifyIconW(NIM_MODIFY) failed", __FILE__, __LINE__-1); g_warning (G_STRLOC ": Shell_NotifyIconW(NIM_MODIFY) failed");
g_free (priv->tooltip_text); g_free (priv->tooltip_text);
priv->tooltip_text = g_strdup (text); priv->tooltip_text = g_strdup (text);