[GNUnet-SVN] r33470 - in gnunet-gtk: pixmaps src/conversation src/lib

[gnunet]

Author: grothoff
Date: 2014-06-02 18:36:08 +0200 (Mon, 02 Jun 2014)
New Revision: 33470

Modified:
   gnunet-gtk/pixmaps/Makefile.am
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
   gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
   gnunet-gtk/src/lib/trayicon.c
Log:
note for #3419

Modified: gnunet-gtk/pixmaps/Makefile.am
===================================================================
--- gnunet-gtk/pixmaps/Makefile.am      2014-06-02 16:25:01 UTC (rev 33469)
+++ gnunet-gtk/pixmaps/Makefile.am      2014-06-02 16:36:08 UTC (rev 33470)
@@ -9,6 +9,16 @@
  apps,gnunet-fs-gtk-24.png \
  apps,gnunet-fs-gtk-32.png
 
+# Theme icons needed (#3419)
+# gnunet-conversation-gtk-tray-call-incoming -- our phone is ringing
+# gnunet-conversation-gtk-tray-available -- online, waiting for calls
+# gnunet-conversation-offline -- phone is offline (no ego, error)
+# gnunet-conversation-call-active -- we are on the phone
+# gnunet-conversation-call-on-hold -- we are on hold
+# gnunet-conversation-gtk-tray-call-pending -- resolving target
+# gnunet-conversation-gtk-tray-call-ringing -- target phone is ringing
+
+
 pkgpixdir= $(pkgdatadir)
 
 install_icon_exec=${top_srcdir}/pixmaps/icon-theme-installer -d "x${DESTDIR}" 
-t ${theme} -s ${srcdir} -b ${themedir} -m "${mkinstalldirs}" -x 
"${INSTALL_DATA}"
@@ -29,7 +39,7 @@
            if test -f $$pixmap; then \
              cp -p $$pixmap $(distdir)/pixmaps; \
            fi \
-       done 
+       done
 
 
 uninstall-hook:
@@ -45,4 +55,4 @@
   gnunet-fs-gtk-ns-association-16.png \
   gnunet-fs-gtk.svg \
   gnunet-fs-gtk-16.png gnunet-fs-gtk-22.png gnunet-fs-gtk-24.png 
gnunet-fs-gtk-32.png\
-  icon-theme-installer 
+  icon-theme-installer

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-06-02 
16:25:01 UTC (rev 33469)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-06-02 
16:36:08 UTC (rev 33470)
@@ -97,7 +97,7 @@
                                 icon_name,
                                 GTK_ICON_SIZE_BUTTON);
   GNUNET_GTK_tray_icon_change (icon_name,
-                               "gnunet-conversation-gtk-status");
+                               NULL /* tooltip */);
 }
 
 

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-02 
16:25:01 UTC (rev 33469)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-02 
16:36:08 UTC (rev 33470)
@@ -473,7 +473,7 @@
       {
         GCG_update_status_bar ("%s",
                                _("No ego selected, phone is down."));
-        GCG_set_status_icon ("gnunet-conversation-gtk-tray-pending");
+        GCG_set_status_icon ("gnunet-conversation-offline");
       }
       else
       {

Modified: gnunet-gtk/src/lib/trayicon.c
===================================================================
--- gnunet-gtk/src/lib/trayicon.c       2014-06-02 16:25:01 UTC (rev 33469)
+++ gnunet-gtk/src/lib/trayicon.c       2014-06-02 16:36:08 UTC (rev 33470)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010, 2011 Christian Grothoff (and other contributing authors)
+     (C) 2010, 2011, 2014 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
@@ -41,9 +41,13 @@
 /**
  * We got a click on our tray icon. Toggle visibility of the main
  * window.
+ *
+ * @param status_icon widget that received the click
+ * @param user_data unused
  */
 static void
-tray_icon_on_click (GtkStatusIcon * status_icon, gpointer user_data)
+tray_icon_on_click (GtkStatusIcon *status_icon,
+                    gpointer user_data)
 {
   gboolean tlf;
 
@@ -69,7 +73,8 @@
  * @param user_data the main loop context
  */
 void
-GNUNET_GTK_tray_icon_quit (GtkMenuItem * menuitem, gpointer user_data)
+GNUNET_GTK_tray_icon_quit (GtkMenuItem *menuitem,
+                           gpointer user_data)
 {
   /* struct GNUNET_GTK_MainLoop *ml = user_data; */
   GNUNET_SCHEDULER_shutdown ();
@@ -79,9 +84,15 @@
 /**
  * We got a right-click on the tray icon. Display the context
  * menu (which should have a 'quit' button).
+ *
+ * @param widget widget that received the click
+ * @param event the event details (check for right click)
+ * @param user_data unused
  */
 static int
-tray_icon_on_menu (GtkWidget * widget, GdkEvent * event, gpointer user_data)
+tray_icon_on_menu (GtkWidget *widget,
+                   GdkEvent *event,
+                   gpointer user_data)
 {
   struct GNUNET_GTK_MainLoop *ml = user_data;
   GtkMenu *tray_menu;
@@ -117,8 +128,10 @@
  * @param tooltip tooltip for the tray icon
  */
 void
-GNUNET_GTK_tray_icon_create (struct GNUNET_GTK_MainLoop *ml, GtkWindow * main,
-                             const char *icon_name, const char *tooltip)
+GNUNET_GTK_tray_icon_create (struct GNUNET_GTK_MainLoop *ml,
+                             GtkWindow *main,
+                             const char *icon_name,
+                             const char *tooltip)
 {
   if (NULL != tray_icon)
   {
@@ -136,16 +149,16 @@
   gtk_status_icon_set_visible (tray_icon, TRUE);
 }
 
+
 /**
  * Change our tray icon.
  *
- * @param ml main loop
- * @param main handle to the main window (show or hide)
  * @param icon_name name of the tray icon file
  * @param tooltip tooltip for the tray icon
  */
 void
-GNUNET_GTK_tray_icon_change (const char *icon_name, const char *tooltip)
+GNUNET_GTK_tray_icon_change (const char *icon_name,
+                             const char *tooltip)
 {
   if (NULL == tray_icon)
   {
@@ -158,14 +171,13 @@
 }
 
 
-
 /**
  * Destroy the tray icon.
  */
 void
 GNUNET_GTK_tray_icon_destroy ()
 {
-  if (tray_icon == NULL)
+  if (NULL == tray_icon)
     return;
   g_object_unref (G_OBJECT (tray_icon));
   tray_icon = NULL;