U++ forum: Welcome to the forum

Re: .deb libnotify-dev warning! [message #24581 is a reply to message #24568]

Mon, 25 January 2010 09:11

tojocky
Messages: 607
Registered: April 2008
Location: UK

Contributor

Mirek,

Please apply this patch for correct compile in win32!
Problem Description: you had include glib.h and libnotify/notify.h for win 32 too!
Patch text:

Index: uppsrc/CtrlLib/TrayIconX11.cpp
===================================================================
--- uppsrc/CtrlLib/TrayIconX11.cpp	(revision 1945)
+++ uppsrc/CtrlLib/TrayIconX11.cpp	(working copy)
@@ -2,6 +2,8 @@
 
 #define LLOG(x) // LOG(x)
 
+#ifdef PLATFORM_X11
+
 #if !defined(flagNOGTK)
 	#include <glib.h>
 	#include <libnotify/notify.h>
@@ -9,8 +11,6 @@
 
 NAMESPACE_UPP
 
-#ifdef PLATFORM_X11
-
 Atom TraySelection()
 {
 	return XAtom(Format("_NET_SYSTEM_TRAY_S%d", Xscreenno));
@@ -226,6 +226,6 @@
 }
 
 
+END_UPP_NAMESPACE
+
 #endif
-
-END_UPP_NAMESPACE

luzr wrote on Sun, 24 January 2010 19:52

Hi,

as I have accepted TrayIcon patch that requires libnotify, it should be now added to .deb requirements.

I have done so for infrastructure server, at least I hope. Please report any problems with next automated deb64 release.

Mirek

Attachment: win32_tray_icon_patch.patch
(Size: 0.57KB, Downloaded 333 times)

[Updated on: Mon, 25 January 2010 09:16]

Report message to a moderator