Author: grothoff
Date: 2006-05-13 14:41:29 -0700 (Sat, 13 May 2006)
New Revision: 2788
Added:
gnunet-gtk/pixmaps/gnunet-gtk-tray.png
Modified:
gnunet-gtk/AUTHORS
gnunet-gtk/src/core/Makefile.am
gnunet-gtk/src/core/main.c
Log:
adding system tray icon code
Modified: gnunet-gtk/AUTHORS
===================================================================
--- gnunet-gtk/AUTHORS 2006-05-13 20:54:36 UTC (rev 2787)
+++ gnunet-gtk/AUTHORS 2006-05-13 21:41:29 UTC (rev 2788)
@@ -2,11 +2,13 @@
Christian Grothoff <[EMAIL PROTECTED]>
Code contributions also came from:
-Igor Wronsky <[EMAIL PROTECTED]>
+Anders Carlsson <[EMAIL PROTECTED]>
+Nils Durner <[EMAIL PROTECTED]>
Nicklas Larsson <[EMAIL PROTECTED]>
-Nils Durner <[EMAIL PROTECTED]>
Milan <[EMAIL PROTECTED]>
+Igor Wronsky <[EMAIL PROTECTED]>
+
Images and other content from:
Jakub 'jimmac' Steiner <[EMAIL PROTECTED]>
Christian Muellner <[EMAIL PROTECTED]>
Added: gnunet-gtk/pixmaps/gnunet-gtk-tray.png
===================================================================
(Binary files differ)
Property changes on: gnunet-gtk/pixmaps/gnunet-gtk-tray.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: gnunet-gtk/src/core/Makefile.am
===================================================================
--- gnunet-gtk/src/core/Makefile.am 2006-05-13 20:54:36 UTC (rev 2787)
+++ gnunet-gtk/src/core/Makefile.am 2006-05-13 21:41:29 UTC (rev 2788)
@@ -7,6 +7,7 @@
bin_PROGRAMS = gnunet-gtk
gnunet_gtk_SOURCES = \
+ eggtrayicon.c eggtrayicon.h \
main.c
gnunet_gtk_LDADD = \
Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c 2006-05-13 20:54:36 UTC (rev 2787)
+++ gnunet-gtk/src/core/main.c 2006-05-13 21:41:29 UTC (rev 2788)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2005 Christian Grothoff (and other contributing authors)
+ (C) 2005, 2006 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -26,7 +26,10 @@
#include "platform.h"
#include "gnunetgtk_common.h"
+#include "eggtrayicon.h"
+
+
/**
* Prints the usage information for this command if the user errs.
*/
@@ -105,6 +108,7 @@
addLogEntry("%s", msg);
}
+
int main(int argc,
char *argv[]) {
GtkWidget * root;
@@ -132,6 +136,7 @@
= glade_xml_get_widget(getMainXML(),
"mainWindow");
gtk_window_maximize(GTK_WINDOW(root));
+ initTrayIcon();
gtk_widget_show(root);
setCustomLogProc(&customLog);
/* start the event loop */
_______________________________________________
GNUnet-SVN mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnunet-svn
