Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=fba514b2e7c1a8dfd3b26eb34607fa4d4b120f42
commit fba514b2e7c1a8dfd3b26eb34607fa4d4b120f42
Author: bouleetbil <bouleet...@frogdev.info>
Date: Sun Jan 2 00:13:54 2011 +0100
*fixes debug mode
*added libindicate (disable it by default)
diff --git a/frugal-tweak-vala/Makefile b/frugal-tweak-vala/Makefile
index a7c169c..2d6fd42 100644
--- a/frugal-tweak-vala/Makefile
+++ b/frugal-tweak-vala/Makefile
@@ -1,6 +1,10 @@
VERSION = 0.1
-VALAFLAG = DEBUG=1
+ENABLEDEBUG = 1
+ifeq "$(ENABLEDEBUG)" "1"
+ DEBUGFLAG = DEBUG
+endif
+
SOURCEDIR = src
DAEMONSOURCES = $(SOURCEDIR)/daemon.vala $(SOURCEDIR)/pacman.vala
$(SOURCEDIR)/tools.vala $(SOURCEDIR)/DbusServer.vala
@@ -10,26 +14,35 @@ PACMANUPDATESOURCES = $(SOURCEDIR)/Tree.vala
$(SOURCEDIR)/Pacman-update.vala $(S
#for start modules
FRUGALTWEAKSOURCES = $(SOURCEDIR)/MainClient.vala $(SOURCEDIR)/Tree.vala
$(SOURCEDIR)/pacman.vala $(SOURCEDIR)/tools.vala \
- $(SOURCEDIR)/popup.vala
$(SOURCEDIR)/configuration.vala
+ $(SOURCEDIR)/popup.vala
$(SOURCEDIR)/configuration.vala \
+ ./vapi/config.vapi
+
+ENABLEINDICATE = 0
+ifeq "$(ENABLEINDICATE)" "1"
+ INDICATEVALA = --pkg Dbusmenu-Glib-0.2 --pkg Indicate-0.2
--library=Indicate-0.2 -D LIBINDICATE -X -I/usr/include/libindicate-0.2 -X
-I/usr/include/libdbusmenu-0.1/
+ INDICATEFLAG = ENABLEINDICATE
+endif
+
VALAC = valac
all: daemon terminal browser frugalwaretweak pacmanupdate
frugalwaretweak:
- $(VALAC) --define=$(VALAFLAG) --pkg gio-2.0 --pkg gtk+-2.0 --pkg
gmodule-2.0 --pkg pacman --pkg unique-1.0 --pkg libnotify \
+ $(VALAC) --define=$(DEBUGFLAG) --pkg gio-2.0 --pkg gtk+-2.0 --pkg
gmodule-2.0 --pkg pacman --pkg unique-1.0 --pkg libnotify \
+ --define=$(INDICATEFLAG) $(INDICATEVALA) \
$(FRUGALTWEAKSOURCES) -o frugalware-tweak2
pacmanupdate:
- $(VALAC) --define=$(VALAFLAG) --pkg gio-2.0 --pkg gtk+-2.0 --pkg
gmodule-2.0 --pkg pacman $(PACMANUPDATESOURCES) -o
frugalware-tweak-pacman-update
+ $(VALAC) --define=$(DEBUGFLAG) --pkg gio-2.0 --pkg gtk+-2.0 --pkg
gmodule-2.0 --pkg pacman $(PACMANUPDATESOURCES) -o
frugalware-tweak-pacman-update
daemon:
- $(VALAC) --define=$(VALAFLAG) --pkg pacman --pkg gio-2.0
$(DAEMONSOURCES) -o frugalware-tweak-daemon
+ $(VALAC) --define=$(DEBUGFLAG) --pkg pacman --pkg gio-2.0
$(DAEMONSOURCES) -o frugalware-tweak-daemon
terminal:
- $(VALAC) --define=$(VALAFLAG) --pkg vte $(TERMINALSOURCES) -o
frugalware-tweak-terminal
+ $(VALAC) --define=$(DEBUGFLAG) --pkg vte $(TERMINALSOURCES) -o
frugalware-tweak-terminal
browser:
- $(VALAC) --define=$(VALAFLAG) --pkg gtk+-2.0 --pkg webkit-1.0
$(BROWSERSOURCES) -o frugalware-tweak-browser
+ $(VALAC) --define=$(DEBUGFLAG) --pkg gtk+-2.0 --pkg webkit-1.0
$(BROWSERSOURCES) -o frugalware-tweak-browser
install:
mkdir -p $(DESTDIR)/usr/bin
diff --git a/frugal-tweak-vala/src/MainClient.vala
b/frugal-tweak-vala/src/MainClient.vala
index 72c6755..9539eab 100644
--- a/frugal-tweak-vala/src/MainClient.vala
+++ b/frugal-tweak-vala/src/MainClient.vala
@@ -60,7 +60,7 @@ int main (string[] args) {
Tree.setup_treeviewModule (view);
window.add(view);
- #if DEBUG==1
+ #if DEBUG
//for tested notification
Popup.PopupShow("titre test","test");
#endif
diff --git a/frugal-tweak-vala/src/popup.vala b/frugal-tweak-vala/src/popup.vala
index 712b3a9..e9cb002 100644
--- a/frugal-tweak-vala/src/popup.vala
+++ b/frugal-tweak-vala/src/popup.vala
@@ -20,6 +20,9 @@
using Notify;
using Tools;
using Configuration;
+#if ENABLEINDICATE
+ using Indicate;
+#endif
public static class Popup {
@@ -39,6 +42,29 @@ public static class Popup {
{
ConsoleDebug("Unable to show low notification");
}
- }
+
+ #if ENABLEINDICATE
+ //indicator support
+ /*var server = Indicate.Server.ref_default();
+
+ server.set_type("message.frugalware-tweak2");
+
server.set_desktop_file("/usr/share/indicators/messages/applications/frugalware-tweak2.desktop");
+ server.server_display.connect(dirty_activate);
+ server.show();*/
+
+ var indicator = new Indicate.Indicator();
+ indicator.set_property("subtype", "im");
+ indicator.set_property("sender", "frugalware-tweak2");
+ indicator.set_property("body", text);
+ indicator.user_display.connect(dirty_activate);
+ indicator.show();
+ #endif
+
+ }
+
+ public static void dirty_activate() {
+ ConsoleDebug("libindicate activated");
+ }
+
}
diff --git a/frugal-tweak-vala/src/tools.vala b/frugal-tweak-vala/src/tools.vala
index ef7483a..3d20fae 100644
--- a/frugal-tweak-vala/src/tools.vala
+++ b/frugal-tweak-vala/src/tools.vala
@@ -21,7 +21,7 @@ public static class Tools
{
public static void ConsoleDebug(string text)
{
- #if DEBUG==1
+ #if DEBUG
stdout.printf(text);
#endif
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
