diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-07-12 20:38:48 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-07-12 20:38:48 +0000 |
commit | 935203c804ad6ec126e4a07483de95dd876a73f2 (patch) | |
tree | 5b097e35684219e8d9a4fb4a8c0934c89ecae85c /src/lib | |
parent | d4d065ab407d672099377eef2a4f0b15fe7e0079 (diff) | |
download | gnunet-gtk-935203c804ad6ec126e4a07483de95dd876a73f2.tar.gz gnunet-gtk-935203c804ad6ec126e4a07483de95dd876a73f2.zip |
rename animation symbols to reflect non-FS common status
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Makefile.am | 2 | ||||
-rw-r--r-- | src/lib/animations.c | 46 |
2 files changed, 24 insertions, 24 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index b91a87ab..efd43e6d 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am | |||
@@ -27,4 +27,4 @@ libgnunetgtk_la_LIBADD = \ | |||
27 | 27 | ||
28 | libgnunetgtk_la_LDFLAGS = \ | 28 | libgnunetgtk_la_LDFLAGS = \ |
29 | $(GN_LIB_LDFLAGS) \ | 29 | $(GN_LIB_LDFLAGS) \ |
30 | -version-info 2:0:1 | 30 | -version-info 3:0:0 |
diff --git a/src/lib/animations.c b/src/lib/animations.c index 041283bb..40f1f1e9 100644 --- a/src/lib/animations.c +++ b/src/lib/animations.c | |||
@@ -38,17 +38,17 @@ | |||
38 | * Handle for an animation. Each animation file should only | 38 | * Handle for an animation. Each animation file should only |
39 | * be loaded once and can then be used in multiple tree views. | 39 | * be loaded once and can then be used in multiple tree views. |
40 | */ | 40 | */ |
41 | struct GNUNET_FS_AnimationContext | 41 | struct GNUNET_GTK_AnimationContext |
42 | { | 42 | { |
43 | /** | 43 | /** |
44 | * This is a doublye-linked list. | 44 | * This is a doublye-linked list. |
45 | */ | 45 | */ |
46 | struct GNUNET_FS_AnimationContext *next; | 46 | struct GNUNET_GTK_AnimationContext *next; |
47 | 47 | ||
48 | /** | 48 | /** |
49 | * This is a doublye-linked list. | 49 | * This is a doublye-linked list. |
50 | */ | 50 | */ |
51 | struct GNUNET_FS_AnimationContext *prev; | 51 | struct GNUNET_GTK_AnimationContext *prev; |
52 | 52 | ||
53 | /** | 53 | /** |
54 | * Handle to the animation. | 54 | * Handle to the animation. |
@@ -74,17 +74,17 @@ struct GNUNET_FS_AnimationContext | |||
74 | * must be told about the tree view and column for the animations | 74 | * must be told about the tree view and column for the animations |
75 | * to work. | 75 | * to work. |
76 | */ | 76 | */ |
77 | struct GNUNET_FS_AnimationTreeViewHandle | 77 | struct GNUNET_GTK_AnimationTreeViewHandle |
78 | { | 78 | { |
79 | /** | 79 | /** |
80 | * This is a doublye-linked list. | 80 | * This is a doublye-linked list. |
81 | */ | 81 | */ |
82 | struct GNUNET_FS_AnimationTreeViewHandle *next; | 82 | struct GNUNET_GTK_AnimationTreeViewHandle *next; |
83 | 83 | ||
84 | /** | 84 | /** |
85 | * This is a doublye-linked list. | 85 | * This is a doublye-linked list. |
86 | */ | 86 | */ |
87 | struct GNUNET_FS_AnimationTreeViewHandle *prev; | 87 | struct GNUNET_GTK_AnimationTreeViewHandle *prev; |
88 | 88 | ||
89 | /** | 89 | /** |
90 | * Tree view to watch. | 90 | * Tree view to watch. |
@@ -101,22 +101,22 @@ struct GNUNET_FS_AnimationTreeViewHandle | |||
101 | /** | 101 | /** |
102 | * Head of linked list of animations. | 102 | * Head of linked list of animations. |
103 | */ | 103 | */ |
104 | static struct GNUNET_FS_AnimationContext *animation_head; | 104 | static struct GNUNET_GTK_AnimationContext *animation_head; |
105 | 105 | ||
106 | /** | 106 | /** |
107 | * Tail of linked list of animations. | 107 | * Tail of linked list of animations. |
108 | */ | 108 | */ |
109 | static struct GNUNET_FS_AnimationContext *animation_tail; | 109 | static struct GNUNET_GTK_AnimationContext *animation_tail; |
110 | 110 | ||
111 | /** | 111 | /** |
112 | * Head of linked list of tree views with animations. | 112 | * Head of linked list of tree views with animations. |
113 | */ | 113 | */ |
114 | static struct GNUNET_FS_AnimationTreeViewHandle *atv_head; | 114 | static struct GNUNET_GTK_AnimationTreeViewHandle *atv_head; |
115 | 115 | ||
116 | /** | 116 | /** |
117 | * Tail of linked list of tree views with animations. | 117 | * Tail of linked list of tree views with animations. |
118 | */ | 118 | */ |
119 | static struct GNUNET_FS_AnimationTreeViewHandle *atv_tail; | 119 | static struct GNUNET_GTK_AnimationTreeViewHandle *atv_tail; |
120 | 120 | ||
121 | /** | 121 | /** |
122 | * Task run to update animations. | 122 | * Task run to update animations. |
@@ -132,13 +132,13 @@ static GNUNET_SCHEDULER_TaskIdentifier ticker_task; | |||
132 | * @param filename name of the file with the animation to show | 132 | * @param filename name of the file with the animation to show |
133 | * @return context to use to get the animated pixbuf, NULL on error | 133 | * @return context to use to get the animated pixbuf, NULL on error |
134 | */ | 134 | */ |
135 | struct GNUNET_FS_AnimationContext * | 135 | struct GNUNET_GTK_AnimationContext * |
136 | GNUNET_GTK_animation_context_create (const char *filename) | 136 | GNUNET_GTK_animation_context_create (const char *filename) |
137 | { | 137 | { |
138 | GError *err = NULL; | 138 | GError *err = NULL; |
139 | struct GNUNET_FS_AnimationContext *ac; | 139 | struct GNUNET_GTK_AnimationContext *ac; |
140 | 140 | ||
141 | ac = GNUNET_new (struct GNUNET_FS_AnimationContext); | 141 | ac = GNUNET_new (struct GNUNET_GTK_AnimationContext); |
142 | ac->ani = gdk_pixbuf_animation_new_from_file (filename, &err); | 142 | ac->ani = gdk_pixbuf_animation_new_from_file (filename, &err); |
143 | if (NULL == ac->ani) | 143 | if (NULL == ac->ani) |
144 | { | 144 | { |
@@ -164,7 +164,7 @@ GNUNET_GTK_animation_context_create (const char *filename) | |||
164 | * @param ac animation context to destroy. | 164 | * @param ac animation context to destroy. |
165 | */ | 165 | */ |
166 | void | 166 | void |
167 | GNUNET_GTK_animation_context_destroy (struct GNUNET_FS_AnimationContext *ac) | 167 | GNUNET_GTK_animation_context_destroy (struct GNUNET_GTK_AnimationContext *ac) |
168 | { | 168 | { |
169 | if (NULL == ac) | 169 | if (NULL == ac) |
170 | return; | 170 | return; |
@@ -188,7 +188,7 @@ GNUNET_GTK_animation_context_destroy (struct GNUNET_FS_AnimationContext *ac) | |||
188 | * @return pixbuf of the AC, NULL on error loading the pixbuf | 188 | * @return pixbuf of the AC, NULL on error loading the pixbuf |
189 | */ | 189 | */ |
190 | GdkPixbuf * | 190 | GdkPixbuf * |
191 | GNUNET_GTK_animation_context_get_pixbuf (struct GNUNET_FS_AnimationContext *ac) | 191 | GNUNET_GTK_animation_context_get_pixbuf (struct GNUNET_GTK_AnimationContext *ac) |
192 | { | 192 | { |
193 | if (NULL == ac) | 193 | if (NULL == ac) |
194 | return NULL; | 194 | return NULL; |
@@ -203,7 +203,7 @@ GNUNET_GTK_animation_context_get_pixbuf (struct GNUNET_FS_AnimationContext *ac) | |||
203 | * @return 0 if nothing needed to be done | 203 | * @return 0 if nothing needed to be done |
204 | */ | 204 | */ |
205 | static int | 205 | static int |
206 | tick_animation (struct GNUNET_FS_AnimationContext *ac) | 206 | tick_animation (struct GNUNET_GTK_AnimationContext *ac) |
207 | { | 207 | { |
208 | GdkPixbuf *pixbuf; | 208 | GdkPixbuf *pixbuf; |
209 | gint width; | 209 | gint width; |
@@ -226,7 +226,7 @@ tick_animation (struct GNUNET_FS_AnimationContext *ac) | |||
226 | * @param atv handle to the tree view to redraw | 226 | * @param atv handle to the tree view to redraw |
227 | */ | 227 | */ |
228 | static void | 228 | static void |
229 | redraw_tree_view (struct GNUNET_FS_AnimationTreeViewHandle *atv) | 229 | redraw_tree_view (struct GNUNET_GTK_AnimationTreeViewHandle *atv) |
230 | { | 230 | { |
231 | GdkWindow *gw; | 231 | GdkWindow *gw; |
232 | GdkRectangle r; | 232 | GdkRectangle r; |
@@ -267,8 +267,8 @@ static void | |||
267 | ticker (void *cls, | 267 | ticker (void *cls, |
268 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 268 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
269 | { | 269 | { |
270 | struct GNUNET_FS_AnimationContext *pos; | 270 | struct GNUNET_GTK_AnimationContext *pos; |
271 | struct GNUNET_FS_AnimationTreeViewHandle *atv; | 271 | struct GNUNET_GTK_AnimationTreeViewHandle *atv; |
272 | unsigned int counter; | 272 | unsigned int counter; |
273 | 273 | ||
274 | ticker_task = GNUNET_SCHEDULER_add_delayed (TICKER_DELAY, | 274 | ticker_task = GNUNET_SCHEDULER_add_delayed (TICKER_DELAY, |
@@ -293,13 +293,13 @@ ticker (void *cls, | |||
293 | * @param image_col column in the tree view with the animated pixbufs | 293 | * @param image_col column in the tree view with the animated pixbufs |
294 | * @return handle to unregister the tree view later | 294 | * @return handle to unregister the tree view later |
295 | */ | 295 | */ |
296 | struct GNUNET_FS_AnimationTreeViewHandle * | 296 | struct GNUNET_GTK_AnimationTreeViewHandle * |
297 | GNUNET_GTK_animation_tree_view_register (GtkTreeView *tv, | 297 | GNUNET_GTK_animation_tree_view_register (GtkTreeView *tv, |
298 | GtkTreeViewColumn *image_col) | 298 | GtkTreeViewColumn *image_col) |
299 | { | 299 | { |
300 | struct GNUNET_FS_AnimationTreeViewHandle *atv; | 300 | struct GNUNET_GTK_AnimationTreeViewHandle *atv; |
301 | 301 | ||
302 | atv = GNUNET_new (struct GNUNET_FS_AnimationTreeViewHandle); | 302 | atv = GNUNET_new (struct GNUNET_GTK_AnimationTreeViewHandle); |
303 | atv->tv = tv; | 303 | atv->tv = tv; |
304 | atv->image_col = image_col; | 304 | atv->image_col = image_col; |
305 | GNUNET_CONTAINER_DLL_insert (atv_head, | 305 | GNUNET_CONTAINER_DLL_insert (atv_head, |
@@ -319,7 +319,7 @@ GNUNET_GTK_animation_tree_view_register (GtkTreeView *tv, | |||
319 | * @param atv tree view to unregister | 319 | * @param atv tree view to unregister |
320 | */ | 320 | */ |
321 | void | 321 | void |
322 | GNUNET_GTK_animation_tree_view_unregister (struct GNUNET_FS_AnimationTreeViewHandle *atv) | 322 | GNUNET_GTK_animation_tree_view_unregister (struct GNUNET_GTK_AnimationTreeViewHandle *atv) |
323 | { | 323 | { |
324 | GNUNET_CONTAINER_DLL_remove (atv_head, | 324 | GNUNET_CONTAINER_DLL_remove (atv_head, |
325 | atv_tail, | 325 | atv_tail, |