gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r33958 - in gnunet-gtk/src: fs include lib


From: gnunet
Subject: [GNUnet-SVN] r33958 - in gnunet-gtk/src: fs include lib
Date: Sat, 12 Jul 2014 22:38:48 +0200

Author: grothoff
Date: 2014-07-12 22:38:48 +0200 (Sat, 12 Jul 2014)
New Revision: 33958

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
   gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h
   gnunet-gtk/src/include/gnunet_gtk.h
   gnunet-gtk/src/lib/Makefile.am
   gnunet-gtk/src/lib/animations.c
Log:
rename animation symbols to reflect non-FS common status

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2014-07-12 20:29:25 UTC 
(rev 33957)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2014-07-12 20:38:48 UTC 
(rev 33958)
@@ -206,7 +206,7 @@
   /**
    * Animation handle associated with the tree store.
    */
-  struct GNUNET_FS_AnimationTreeViewHandle *atv;
+  struct GNUNET_GTK_AnimationTreeViewHandle *atv;
 };
 
 
@@ -289,42 +289,42 @@
 /**
  * Animation to display while publishing.
  */
-static struct GNUNET_FS_AnimationContext *animation_publishing;
+static struct GNUNET_GTK_AnimationContext *animation_publishing;
 
 /**
  * Animation to display after publishing is complete.
  */
-static struct GNUNET_FS_AnimationContext *animation_published;
+static struct GNUNET_GTK_AnimationContext *animation_published;
 
 /**
  * Animation to display while downloading.
  */
-static struct GNUNET_FS_AnimationContext *animation_downloading;
+static struct GNUNET_GTK_AnimationContext *animation_downloading;
 
 /**
  * Animation to display after downloading is complete.
  */
-static struct GNUNET_FS_AnimationContext *animation_downloaded;
+static struct GNUNET_GTK_AnimationContext *animation_downloaded;
 
 /**
  * Animation to display if a download has stalled.
  */
-static struct GNUNET_FS_AnimationContext *animation_download_stalled;
+static struct GNUNET_GTK_AnimationContext *animation_download_stalled;
 
 /**
  * Animation to display while searching for sources to download from.
  */
-static struct GNUNET_FS_AnimationContext *animation_searching_sources;
+static struct GNUNET_GTK_AnimationContext *animation_searching_sources;
 
 /**
  * Animation to display if we found sources to download from.
  */
-static struct GNUNET_FS_AnimationContext *animation_found_sources;
+static struct GNUNET_GTK_AnimationContext *animation_found_sources;
 
 /**
  * Animation to display if we encountered a hard error.
  */
-static struct GNUNET_FS_AnimationContext *animation_error;
+static struct GNUNET_GTK_AnimationContext *animation_error;
 
 
 /**
@@ -347,10 +347,10 @@
  * @param basename basename of the animation file to load
  * @return handle to the animation.
  */
-static struct GNUNET_FS_AnimationContext *
+static struct GNUNET_GTK_AnimationContext *
 load_animation (const char *basename)
 {
-  struct GNUNET_FS_AnimationContext *ac;
+  struct GNUNET_GTK_AnimationContext *ac;
   const char *dd;
   char *fn;
 

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h     2014-07-12 20:29:25 UTC 
(rev 33957)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h     2014-07-12 20:38:48 UTC 
(rev 33958)
@@ -110,7 +110,7 @@
   /**
    * Animation handle associated with the tree store.
    */
-  struct GNUNET_FS_AnimationTreeViewHandle *atv;
+  struct GNUNET_GTK_AnimationTreeViewHandle *atv;
 
   /**
    * Number of results we got for this search.

Modified: gnunet-gtk/src/include/gnunet_gtk.h
===================================================================
--- gnunet-gtk/src/include/gnunet_gtk.h 2014-07-12 20:29:25 UTC (rev 33957)
+++ gnunet-gtk/src/include/gnunet_gtk.h 2014-07-12 20:38:48 UTC (rev 33958)
@@ -332,7 +332,7 @@
  * Handle for an animation.  Each animation file should only
  * be loaded once and can then be used in multiple tree views.
  */
-struct GNUNET_FS_AnimationContext;
+struct GNUNET_GTK_AnimationContext;
 
 
 /**
@@ -341,7 +341,7 @@
  * must be told about the tree view and column for the animations
  * to work.
  */
-struct GNUNET_FS_AnimationTreeViewHandle;
+struct GNUNET_GTK_AnimationTreeViewHandle;
 
 
 /**
@@ -352,7 +352,7 @@
  * @param filename name of the file with the animation to show
  * @return context to use to get the animated pixbuf, NULL on error
  */
-struct GNUNET_FS_AnimationContext *
+struct GNUNET_GTK_AnimationContext *
 GNUNET_GTK_animation_context_create (const char *filename);
 
 
@@ -363,7 +363,7 @@
  * @param ac animation context to destroy.
  */
 void
-GNUNET_GTK_animation_context_destroy (struct GNUNET_FS_AnimationContext *ac);
+GNUNET_GTK_animation_context_destroy (struct GNUNET_GTK_AnimationContext *ac);
 
 
 /**
@@ -376,7 +376,7 @@
  * @return pixbuf of the AC, NULL on error loading the pixbuf
  */
 GdkPixbuf *
-GNUNET_GTK_animation_context_get_pixbuf (struct GNUNET_FS_AnimationContext 
*ac);
+GNUNET_GTK_animation_context_get_pixbuf (struct GNUNET_GTK_AnimationContext 
*ac);
 
 
 /**
@@ -388,7 +388,7 @@
  * @param image_col column in the tree view with the animated pixbufs
  * @return handle to unregister the tree view later
  */
-struct GNUNET_FS_AnimationTreeViewHandle *
+struct GNUNET_GTK_AnimationTreeViewHandle *
 GNUNET_GTK_animation_tree_view_register (GtkTreeView *tv,
                                          GtkTreeViewColumn *image_col);
 
@@ -399,7 +399,7 @@
  * @param atv tree view to unregister
  */
 void
-GNUNET_GTK_animation_tree_view_unregister (struct 
GNUNET_FS_AnimationTreeViewHandle *atv);
+GNUNET_GTK_animation_tree_view_unregister (struct 
GNUNET_GTK_AnimationTreeViewHandle *atv);
 
 
 /* ********************* generic helpers ******************* */

Modified: gnunet-gtk/src/lib/Makefile.am
===================================================================
--- gnunet-gtk/src/lib/Makefile.am      2014-07-12 20:29:25 UTC (rev 33957)
+++ gnunet-gtk/src/lib/Makefile.am      2014-07-12 20:38:48 UTC (rev 33958)
@@ -27,4 +27,4 @@
 
 libgnunetgtk_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-  -version-info 2:0:1
+  -version-info 3:0:0

Modified: gnunet-gtk/src/lib/animations.c
===================================================================
--- gnunet-gtk/src/lib/animations.c     2014-07-12 20:29:25 UTC (rev 33957)
+++ gnunet-gtk/src/lib/animations.c     2014-07-12 20:38:48 UTC (rev 33958)
@@ -38,17 +38,17 @@
  * Handle for an animation.  Each animation file should only
  * be loaded once and can then be used in multiple tree views.
  */
-struct GNUNET_FS_AnimationContext
+struct GNUNET_GTK_AnimationContext
 {
   /**
    * This is a doublye-linked list.
    */
-  struct GNUNET_FS_AnimationContext *next;
+  struct GNUNET_GTK_AnimationContext *next;
 
   /**
    * This is a doublye-linked list.
    */
-  struct GNUNET_FS_AnimationContext *prev;
+  struct GNUNET_GTK_AnimationContext *prev;
 
   /**
    * Handle to the animation.
@@ -74,17 +74,17 @@
  * must be told about the tree view and column for the animations
  * to work.
  */
-struct GNUNET_FS_AnimationTreeViewHandle
+struct GNUNET_GTK_AnimationTreeViewHandle
 {
   /**
    * This is a doublye-linked list.
    */
-  struct GNUNET_FS_AnimationTreeViewHandle *next;
+  struct GNUNET_GTK_AnimationTreeViewHandle *next;
 
   /**
    * This is a doublye-linked list.
    */
-  struct GNUNET_FS_AnimationTreeViewHandle *prev;
+  struct GNUNET_GTK_AnimationTreeViewHandle *prev;
 
   /**
    * Tree view to watch.
@@ -101,22 +101,22 @@
 /**
  * Head of linked list of animations.
  */
-static struct GNUNET_FS_AnimationContext *animation_head;
+static struct GNUNET_GTK_AnimationContext *animation_head;
 
 /**
  * Tail of linked list of animations.
  */
-static struct GNUNET_FS_AnimationContext *animation_tail;
+static struct GNUNET_GTK_AnimationContext *animation_tail;
 
 /**
  * Head of linked list of tree views with animations.
  */
-static struct GNUNET_FS_AnimationTreeViewHandle *atv_head;
+static struct GNUNET_GTK_AnimationTreeViewHandle *atv_head;
 
 /**
  * Tail of linked list of tree views with animations.
  */
-static struct GNUNET_FS_AnimationTreeViewHandle *atv_tail;
+static struct GNUNET_GTK_AnimationTreeViewHandle *atv_tail;
 
 /**
  * Task run to update animations.
@@ -132,13 +132,13 @@
  * @param filename name of the file with the animation to show
  * @return context to use to get the animated pixbuf, NULL on error
  */
-struct GNUNET_FS_AnimationContext *
+struct GNUNET_GTK_AnimationContext *
 GNUNET_GTK_animation_context_create (const char *filename)
 {
   GError *err = NULL;
-  struct GNUNET_FS_AnimationContext *ac;
+  struct GNUNET_GTK_AnimationContext *ac;
 
-  ac = GNUNET_new (struct GNUNET_FS_AnimationContext);
+  ac = GNUNET_new (struct GNUNET_GTK_AnimationContext);
   ac->ani = gdk_pixbuf_animation_new_from_file (filename, &err);
   if (NULL == ac->ani)
     {
@@ -164,7 +164,7 @@
  * @param ac animation context to destroy.
  */
 void
-GNUNET_GTK_animation_context_destroy (struct GNUNET_FS_AnimationContext *ac)
+GNUNET_GTK_animation_context_destroy (struct GNUNET_GTK_AnimationContext *ac)
 {
   if (NULL == ac)
     return;
@@ -188,7 +188,7 @@
  * @return pixbuf of the AC, NULL on error loading the pixbuf
  */
 GdkPixbuf *
-GNUNET_GTK_animation_context_get_pixbuf (struct GNUNET_FS_AnimationContext *ac)
+GNUNET_GTK_animation_context_get_pixbuf (struct GNUNET_GTK_AnimationContext 
*ac)
 {
   if (NULL == ac)
     return NULL;
@@ -203,7 +203,7 @@
  * @return 0 if nothing needed to be done
  */
 static int
-tick_animation (struct GNUNET_FS_AnimationContext *ac)
+tick_animation (struct GNUNET_GTK_AnimationContext *ac)
 {
   GdkPixbuf *pixbuf;
   gint width;
@@ -226,7 +226,7 @@
  * @param atv handle to the tree view to redraw
  */
 static void
-redraw_tree_view (struct GNUNET_FS_AnimationTreeViewHandle *atv)
+redraw_tree_view (struct GNUNET_GTK_AnimationTreeViewHandle *atv)
 {
   GdkWindow *gw;
   GdkRectangle r;
@@ -267,8 +267,8 @@
 ticker (void *cls,
        const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_FS_AnimationContext *pos;
-  struct GNUNET_FS_AnimationTreeViewHandle *atv;
+  struct GNUNET_GTK_AnimationContext *pos;
+  struct GNUNET_GTK_AnimationTreeViewHandle *atv;
   unsigned int counter;
 
   ticker_task = GNUNET_SCHEDULER_add_delayed (TICKER_DELAY,
@@ -293,13 +293,13 @@
  * @param image_col column in the tree view with the animated pixbufs
  * @return handle to unregister the tree view later
  */
-struct GNUNET_FS_AnimationTreeViewHandle *
+struct GNUNET_GTK_AnimationTreeViewHandle *
 GNUNET_GTK_animation_tree_view_register (GtkTreeView *tv,
                                         GtkTreeViewColumn *image_col)
 {
-  struct GNUNET_FS_AnimationTreeViewHandle *atv;
+  struct GNUNET_GTK_AnimationTreeViewHandle *atv;
 
-  atv = GNUNET_new (struct GNUNET_FS_AnimationTreeViewHandle);
+  atv = GNUNET_new (struct GNUNET_GTK_AnimationTreeViewHandle);
   atv->tv = tv;
   atv->image_col = image_col;
   GNUNET_CONTAINER_DLL_insert (atv_head,
@@ -319,7 +319,7 @@
  * @param atv tree view to unregister
  */
 void
-GNUNET_GTK_animation_tree_view_unregister (struct 
GNUNET_FS_AnimationTreeViewHandle *atv)
+GNUNET_GTK_animation_tree_view_unregister (struct 
GNUNET_GTK_AnimationTreeViewHandle *atv)
 {
   GNUNET_CONTAINER_DLL_remove (atv_head,
                               atv_tail,




reply via email to

[Prev in Thread] Current Thread [Next in Thread]