Files

Merge lp:~jeremywootten/pantheon-files/dropbox-plugin-reformat-for-loki into lp:~elementary-apps/pantheon-files/pantheon-files-plugin-dropbox

  1. dropbox-plugin-reformat-for-loki
  2. Merge into pantheon-files-plugin-dropbox
Proposed by Jeremy Wootten
Status: Merged
Approved by: Zisu Andrei
Approved revision: 24
Merged at revision: 23
Proposed branch: lp:~jeremywootten/pantheon-files/dropbox-plugin-reformat-for-loki
Merge into: lp:~elementary-apps/pantheon-files/pantheon-files-plugin-dropbox
Diff against target: 760 lines (+155/-153)
15 files modified
CMakeLists.txt (+2/-1)
async-io-coroutine.h (+26/-26)
cmake/ParseArguments.cmake (+3/-3)
cmake/README (+1/-1)
config.h.cmake (+1/-0)
debian/copyright (+3/-3)
debian/rules (+2/-2)
dropbox-client-util.c (+8/-8)
dropbox-client.c (+29/-29)
dropbox-client.h (+6/-6)
dropbox-command-client.c (+37/-37)
dropbox-command-client.h (+12/-12)
dropbox-hooks.c (+1/-1)
plugin.c (+17/-17)
plugin.h (+7/-7)
To merge this branch: bzr merge lp:~jeremywootten/pantheon-files/dropbox-plugin-reformat-for-loki
Reviewer Review Type Date Requested Status
Zisu Andrei (community) Approve
Review via email: mp+298093@code.launchpad.net

Commit message

Whitespace fixes for dropbox plugin

Description of the change

This branch just makes format changes:

1) Tabs are replaced by spaces
2) Trailing spaces are removed.

This is to prepare for updating the code for Loki.

To post a comment you must log in.
lp:~jeremywootten/pantheon-files/dropbox-plugin-reformat-for-loki updated
24. By Jeremy Wootten

Align continuation line endings

Revision history for this message
Zisu Andrei (matzipan) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-07-29 14:31:30 +0000
3+++ CMakeLists.txt 2016-06-24 12:31:45 +0000
4@@ -18,7 +18,7 @@
5 marlincore
6 )
7 set(CFLAGS
8- ${DROPBOX_CFLAGS} ${DROPBOX_CFLAGS_OTHER}
9+ ${DROPBOX_CFLAGS} ${DROPBOX_CFLAGS_OTHER}
10 )
11 include_directories(${CMAKE_BINARY_DIR})
12 include_directories(${CMAKE_SOURCE_DIR}/libcore/)
13@@ -29,3 +29,4 @@
14 plugin.c dropbox-client-util.c dropbox-command-client.c dropbox-client.c dropbox-hooks.c)
15 target_link_libraries(marlin-dropbox marlincore marlinwidgets ${DROPBOX_LIBRARIES})
16 install(TARGETS marlin-dropbox DESTINATION lib/pantheon-files/plugins/)
17+
18
19=== modified file 'async-io-coroutine.h'
20--- async-io-coroutine.h 2011-10-05 04:35:08 +0000
21+++ async-io-coroutine.h 2016-06-24 12:31:45 +0000
22@@ -31,33 +31,33 @@
23 #define CRBEGIN(pos) switch (pos) { case 0:
24 #define CREND } return FALSE
25 #define CRYIELD(pos) do { pos = __LINE__; return TRUE; case __LINE__:;} while (0)
26-#define CRHALT return FALSE
27+#define CRHALT return FALSE
28
29-#define CRREADLINE(pos, chan, where) \
30- while (1) { \
31- gchar *__line; \
32- gsize __line_length, __newline_pos; \
33- GIOStatus __iostat; \
34- \
35- __iostat = g_io_channel_read_line(chan, &__line, \
36- &__line_length, \
37- &__newline_pos, NULL); \
38- if (__iostat == G_IO_STATUS_AGAIN) { \
39- CRYIELD(pos); \
40- } \
41- else if (__iostat == G_IO_STATUS_NORMAL) { \
42- *(__line + __newline_pos) = '\0'; \
43- where = __line; \
44- break; \
45- } \
46- else if (__iostat == G_IO_STATUS_EOF || \
47- __iostat == G_IO_STATUS_ERROR) { \
48- CRHALT; \
49- } \
50- else { \
51- g_assert_not_reached(); \
52- CRHALT; \
53- } \
54+#define CRREADLINE(pos, chan, where) \
55+ while (1) { \
56+ gchar *__line; \
57+ gsize __line_length, __newline_pos; \
58+ GIOStatus __iostat; \
59+ \
60+ __iostat = g_io_channel_read_line(chan, &__line, \
61+ &__line_length, \
62+ &__newline_pos, NULL); \
63+ if (__iostat == G_IO_STATUS_AGAIN) { \
64+ CRYIELD(pos); \
65+ } \
66+ else if (__iostat == G_IO_STATUS_NORMAL) { \
67+ *(__line + __newline_pos) = '\0'; \
68+ where = __line; \
69+ break; \
70+ } \
71+ else if (__iostat == G_IO_STATUS_EOF || \
72+ __iostat == G_IO_STATUS_ERROR) { \
73+ CRHALT; \
74+ } \
75+ else { \
76+ g_assert_not_reached(); \
77+ CRHALT; \
78+ } \
79 }
80
81 G_END_DECLS
82
83=== modified file 'cmake/ParseArguments.cmake'
84--- cmake/ParseArguments.cmake 2011-10-04 09:11:24 +0000
85+++ cmake/ParseArguments.cmake 2016-06-24 12:31:45 +0000
86@@ -1,6 +1,6 @@
87 ##
88 # This is a helper Macro to parse optional arguments in Macros/Functions
89-# It has been taken from the public CMake wiki.
90+# It has been taken from the public CMake wiki.
91 # See http://www.cmake.org/Wiki/CMakeMacroParseArguments for documentation and
92 # licensing.
93 ##
94@@ -26,9 +26,9 @@
95 set(loption_names ${option_names})
96 list(FIND loption_names "${arg}" is_option)
97 if(is_option GREATER -1)
98- set(${prefix}_${arg} TRUE)
99+ set(${prefix}_${arg} TRUE)
100 else(is_option GREATER -1)
101- set(current_arg_list ${current_arg_list} ${arg})
102+ set(current_arg_list ${current_arg_list} ${arg})
103 endif(is_option GREATER -1)
104 endif(is_arg_name GREATER -1)
105 endforeach(arg)
106
107=== modified file 'cmake/README'
108--- cmake/README 2011-10-04 09:11:24 +0000
109+++ cmake/README 2016-06-24 12:31:45 +0000
110@@ -2,7 +2,7 @@
111
112 This is a set of CMake modules: Translations, GSettings, and Vala modules.
113
114-For all the Vala related modules see README.Vala.rst:
115+For all the Vala related modules see README.Vala.rst:
116 - ParseArguments.cmake
117 - ValaPrecompile.cmake
118 - ValaVersion.cmake
119
120=== modified file 'config.h.cmake'
121--- config.h.cmake 2011-10-04 09:11:24 +0000
122+++ config.h.cmake 2016-06-24 12:31:45 +0000
123@@ -6,3 +6,4 @@
124 #cmakedefine VERSION "@VERSION@"
125
126 #endif
127+
128
129=== modified file 'debian/copyright'
130--- debian/copyright 2013-05-17 19:09:51 +0000
131+++ debian/copyright 2016-06-24 12:31:45 +0000
132@@ -2,11 +2,11 @@
133 Thu, 06 Oct 2011 09:17:32 +0200
134
135 Upstream Authors:
136- ammonkey <am.monkeyd@gmail.com>
137+ ammonkey <am.monkeyd@gmail.com>
138
139 Copyright:
140- © 2008, Evenflow, Inc.
141- © 2011 Marlin Devs
142+ © 2008, Evenflow, Inc.
143+ © 2011 Marlin Devs
144
145 License: GPL-3
146 Marlin - The sexiest fish in the large sea of file-browsers.
147
148=== modified file 'debian/rules'
149--- debian/rules 2011-10-06 07:22:51 +0000
150+++ debian/rules 2016-06-24 12:31:45 +0000
151@@ -10,7 +10,7 @@
152 #export DH_VERBOSE=1
153
154 %:
155- dh $@
156+ dh $@
157
158 override_dh_builddeb:
159- dh_builddeb -- -Zxz
160+ dh_builddeb -- -Zxz
161
162=== modified file 'dropbox-client-util.c'
163--- dropbox-client-util.c 2011-10-05 04:35:08 +0000
164+++ dropbox-client-util.c 2016-06-24 12:31:45 +0000
165@@ -58,27 +58,27 @@
166 gchar **argval;
167 guint len;
168 gboolean retval;
169-
170+
171 argval = g_strsplit(line, "\t", 0);
172 len = g_strv_length(argval);
173
174 /* debug("parsed: (%d) %s", len, line); */
175-
176+
177 if (len > 1) {
178 int i;
179 gchar **vals;
180-
181+
182 vals = g_new(gchar *, len);
183 vals[len - 1] = NULL;
184-
185+
186 for (i = 1; argval[i] != NULL; i++) {
187 vals[i-1] = dropbox_client_util_desanitize(argval[i]);
188-
189+
190 }
191-
192+
193 g_hash_table_insert(return_table,
194- dropbox_client_util_desanitize(argval[0]),
195- vals);
196+ dropbox_client_util_desanitize(argval[0]),
197+ vals);
198 retval = TRUE;
199 }
200 else {
201
202=== modified file 'dropbox-client.c'
203--- dropbox-client.c 2011-10-05 04:35:08 +0000
204+++ dropbox-client.c 2016-06-24 12:31:45 +0000
205@@ -30,7 +30,7 @@
206 static void
207 hook_on_connect(DropboxClient *dc) {
208 dc->hook_connect_called = TRUE;
209-
210+
211 if (dc->command_connect_called) {
212 debug("client connection");
213 g_hook_list_invoke(&(dc->onconnect_hooklist), FALSE);
214@@ -42,7 +42,7 @@
215 static void
216 command_on_connect(DropboxClient *dc) {
217 dc->command_connect_called = TRUE;
218-
219+
220 if (dc->hook_connect_called) {
221 debug("client connection");
222 g_hook_list_invoke(&(dc->onconnect_hooklist), FALSE);
223@@ -54,7 +54,7 @@
224 static void
225 command_on_disconnect(DropboxClient *dc) {
226 dc->command_disconnect_called = TRUE;
227-
228+
229 if (dc->hook_disconnect_called) {
230 debug("client disconnect");
231 g_hook_list_invoke(&(dc->ondisconnect_hooklist), FALSE);
232@@ -69,7 +69,7 @@
233 static void
234 hook_on_disconnect(DropboxClient *dc) {
235 dc->hook_disconnect_called = TRUE;
236-
237+
238 if (dc->command_disconnect_called) {
239 debug("client disconnect");
240 g_hook_list_invoke(&(dc->ondisconnect_hooklist), FALSE);
241@@ -84,7 +84,7 @@
242 gboolean
243 dropbox_client_is_connected(DropboxClient *dc) {
244 return (dropbox_command_client_is_connected(&(dc->dcc)) &&
245- marlin_dropbox_hooks_is_connected(&(dc->hookserv)));
246+ marlin_dropbox_hooks_is_connected(&(dc->hookserv)));
247 }
248
249 void
250@@ -108,60 +108,60 @@
251 dc->hook_disconnect_called = dc->command_disconnect_called = FALSE;
252 dc->hook_connect_called = dc->command_connect_called = FALSE;
253
254- marlin_dropbox_hooks_add_on_connect_hook(&(dc->hookserv),
255- (DropboxHookClientConnectHook)
256- hook_on_connect, dc);
257-
258+ marlin_dropbox_hooks_add_on_connect_hook(&(dc->hookserv),
259+ (DropboxHookClientConnectHook)
260+ hook_on_connect, dc);
261+
262 dropbox_command_client_add_on_connect_hook(&(dc->dcc),
263- (DropboxCommandClientConnectHook)
264- command_on_connect, dc);
265-
266- marlin_dropbox_hooks_add_on_disconnect_hook(&(dc->hookserv),
267- (DropboxHookClientConnectHook)
268- hook_on_disconnect, dc);
269-
270+ (DropboxCommandClientConnectHook)
271+ command_on_connect, dc);
272+
273+ marlin_dropbox_hooks_add_on_disconnect_hook(&(dc->hookserv),
274+ (DropboxHookClientConnectHook)
275+ hook_on_disconnect, dc);
276+
277 dropbox_command_client_add_on_disconnect_hook(&(dc->dcc),
278- (DropboxCommandClientConnectHook)
279- command_on_disconnect, dc);
280+ (DropboxCommandClientConnectHook)
281+ command_on_disconnect, dc);
282 }
283
284 /* not thread safe */
285 void
286 dropbox_client_add_on_disconnect_hook(DropboxClient *dc,
287- DropboxClientConnectHook dhcch,
288- gpointer ud) {
289+ DropboxClientConnectHook dhcch,
290+ gpointer ud) {
291 GHook *newhook;
292-
293+
294 newhook = g_hook_alloc(&(dc->ondisconnect_hooklist));
295 newhook->func = dhcch;
296 newhook->data = ud;
297-
298+
299 g_hook_append(&(dc->ondisconnect_hooklist), newhook);
300 }
301
302 /* not thread safe */
303 void
304 dropbox_client_add_on_connect_hook(DropboxClient *dc,
305- DropboxClientConnectHook dhcch,
306- gpointer ud) {
307+ DropboxClientConnectHook dhcch,
308+ gpointer ud) {
309 GHook *newhook;
310-
311+
312 newhook = g_hook_alloc(&(dc->onconnect_hooklist));
313 newhook->func = dhcch;
314 newhook->data = ud;
315-
316+
317 g_hook_append(&(dc->onconnect_hooklist), newhook);
318 }
319
320 /* not thread safe */
321 void
322 dropbox_client_add_connection_attempt_hook(DropboxClient *dc,
323- DropboxClientConnectionAttemptHook dhcch,
324- gpointer ud) {
325+ DropboxClientConnectionAttemptHook dhcch,
326+ gpointer ud) {
327 debug("shouldn't be here...");
328
329 dropbox_command_client_add_connection_attempt_hook(&(dc->dcc),
330- dhcch, ud);
331+ dhcch, ud);
332 }
333
334 /* should only be called once on initialization */
335
336=== modified file 'dropbox-client.h'
337--- dropbox-client.h 2011-10-05 04:35:08 +0000
338+++ dropbox-client.h 2016-06-24 12:31:45 +0000
339@@ -58,18 +58,18 @@
340
341 void
342 dropbox_client_add_on_connect_hook(DropboxClient *dc,
343- DropboxClientConnectHook dhcch,
344- gpointer ud);
345+ DropboxClientConnectHook dhcch,
346+ gpointer ud);
347
348 void
349 dropbox_client_add_on_disconnect_hook(DropboxClient *dc,
350- DropboxClientConnectHook dhcch,
351- gpointer ud);
352+ DropboxClientConnectHook dhcch,
353+ gpointer ud);
354
355 void
356 dropbox_client_add_connection_attempt_hook(DropboxClient *dc,
357- DropboxClientConnectionAttemptHook dhcch,
358- gpointer ud);
359+ DropboxClientConnectionAttemptHook dhcch,
360+ gpointer ud);
361
362 G_END_DECLS
363
364
365=== modified file 'dropbox-command-client.c'
366--- dropbox-command-client.c 2011-10-06 01:09:50 +0000
367+++ dropbox-command-client.c 2016-06-24 12:31:45 +0000
368@@ -162,7 +162,7 @@
369
370 static GList *my_g_hash_table_get_keys(GHashTable *ght) {
371 GList *list = NULL;
372- g_hash_table_foreach(ght, (GHFunc)
373+ g_hash_table_foreach(ght, (GHFunc)
374 my_g_hash_table_get_keys_helper, &list);
375 return list;
376 }
377@@ -187,31 +187,31 @@
378 g_assert(command_name != NULL);
379
380
381-#define WRITE_OR_DIE_SANI(s,l) { \
382- gchar *sani_s; \
383- sani_s = dropbox_client_util_sanitize(s); \
384- iostat = g_io_channel_write_chars(chan, sani_s,l, &bytes_trans, \
385- &tmp_error); \
386- g_free(sani_s); \
387- if (iostat == G_IO_STATUS_ERROR || \
388- iostat == G_IO_STATUS_AGAIN) { \
389- if (tmp_error != NULL) { \
390- g_propagate_error(err, tmp_error); \
391- } \
392- return NULL; \
393- } \
394+#define WRITE_OR_DIE_SANI(s,l) { \
395+ gchar *sani_s; \
396+ sani_s = dropbox_client_util_sanitize(s); \
397+ iostat = g_io_channel_write_chars(chan, sani_s,l, &bytes_trans, \
398+ &tmp_error); \
399+ g_free(sani_s); \
400+ if (iostat == G_IO_STATUS_ERROR || \
401+ iostat == G_IO_STATUS_AGAIN) { \
402+ if (tmp_error != NULL) { \
403+ g_propagate_error(err, tmp_error); \
404+ } \
405+ return NULL; \
406+ } \
407 }
408
409-#define WRITE_OR_DIE(s,l) { \
410- iostat = g_io_channel_write_chars(chan, s,l, &bytes_trans, \
411- &tmp_error); \
412- if (iostat == G_IO_STATUS_ERROR || \
413- iostat == G_IO_STATUS_AGAIN) { \
414- if (tmp_error != NULL) { \
415- g_propagate_error(err, tmp_error); \
416- } \
417- return NULL; \
418- } \
419+#define WRITE_OR_DIE(s,l) { \
420+ iostat = g_io_channel_write_chars(chan, s,l, &bytes_trans, \
421+ &tmp_error); \
422+ if (iostat == G_IO_STATUS_ERROR || \
423+ iostat == G_IO_STATUS_AGAIN) { \
424+ if (tmp_error != NULL) { \
425+ g_propagate_error(err, tmp_error); \
426+ } \
427+ return NULL; \
428+ } \
429 }
430
431 /* send command to server */
432@@ -281,7 +281,7 @@
433
434 /* if the response was okay */
435 if (strncmp(line, "ok\n", 3) == 0) {
436- GHashTable *return_table =
437+ GHashTable *return_table =
438 g_hash_table_new_full((GHashFunc) g_str_hash,
439 (GEqualFunc) g_str_equal,
440 (GDestroyNotify) g_free,
441@@ -502,7 +502,7 @@
442 }
443
444 iostat = g_io_channel_read_chars(chan, fake_buf,
445- sizeof(fake_buf),
446+ sizeof(fake_buf),
447 &bytes_read, &tmp_error);
448
449 ret = g_io_channel_set_flags(chan, flags, NULL);
450@@ -539,7 +539,7 @@
451 finish_general_command(dgcr);
452 }
453 break;
454- default:
455+ default:
456 g_assert_not_reached();
457 break;
458 }
459@@ -613,13 +613,13 @@
460 }
461
462 if (connect(sock, (struct sockaddr *) &addr, addr_len) < 0) {
463- /* debug("couldn't connect to command server after 1 second"); */
464+ /* debug("couldn't connect to command server after 1 second"); */
465 break;
466 }
467 }
468 /* errno != EINPROGRESS */
469 else {
470- /* debug("bad connection"); */
471+ /* debug("bad connection"); */
472 break;
473 }
474 }
475@@ -656,10 +656,10 @@
476 g_io_channel_set_close_on_unref(chan, TRUE);
477 g_io_channel_set_line_term(chan, "\n", -1);
478
479-#define SET_CONNECTED_STATE(s) { \
480- g_mutex_lock(dcc->command_connected_mutex); \
481- dcc->command_connected = s; \
482- g_mutex_unlock(dcc->command_connected_mutex); \
483+#define SET_CONNECTED_STATE(s) { \
484+ g_mutex_lock(dcc->command_connected_mutex); \
485+ dcc->command_connected = s; \
486+ g_mutex_unlock(dcc->command_connected_mutex); \
487 }
488
489 SET_CONNECTED_STATE(TRUE);
490@@ -703,7 +703,7 @@
491 do_general_command(chan, (DropboxGeneralCommand *) dc, &gerr);
492 }
493 break;
494- default:
495+ default:
496 g_assert_not_reached();
497 break;
498 }
499@@ -711,7 +711,7 @@
500 debug("done.");
501
502 if (gerr != NULL) {
503- // debug("COMMAND ERROR*****************************");
504+ // debug("COMMAND ERROR*****************************");
505 /* mark this request as never to be completed */
506 end_request(dc);
507
508@@ -831,7 +831,7 @@
509 }
510
511 /* thread safe */
512-void dropbox_command_client_send_simple_command(DropboxCommandClient *dcc,
513+void dropbox_command_client_send_simple_command(DropboxCommandClient *dcc,
514 const char *command) {
515 DropboxGeneralCommand *dgc;
516
517@@ -849,7 +849,7 @@
518 /* thread safe */
519 /* this is the C API, there is another send_command_to_db
520 that is more the actual over the wire command */
521-void dropbox_command_client_send_command(DropboxCommandClient *dcc,
522+void dropbox_command_client_send_command(DropboxCommandClient *dcc,
523 MarlinDropboxCommandResponseHandler h,
524 gpointer ud,
525 const char *command, ...) {
526
527=== modified file 'dropbox-command-client.h'
528--- dropbox-command-client.h 2011-11-06 17:39:41 +0000
529+++ dropbox-command-client.h 2016-06-24 12:31:45 +0000
530@@ -67,7 +67,7 @@
531 typedef struct {
532 GMutex *command_connected_mutex;
533 gboolean command_connected;
534- GAsyncQueue *command_queue;
535+ GAsyncQueue *command_queue;
536 GList *ca_hooklist;
537 GHookList onconnect_hooklist;
538 GHookList ondisconnect_hooklist;
539@@ -87,26 +87,26 @@
540 dropbox_command_client_start(DropboxCommandClient *dcc);
541
542 void dropbox_command_client_send_simple_command(DropboxCommandClient *dcc,
543- const char *command);
544+ const char *command);
545
546-void dropbox_command_client_send_command(DropboxCommandClient *dcc,
547- MarlinDropboxCommandResponseHandler h,
548- gpointer ud,
549- const char *command, ...);
550+void dropbox_command_client_send_command(DropboxCommandClient *dcc,
551+ MarlinDropboxCommandResponseHandler h,
552+ gpointer ud,
553+ const char *command, ...);
554 void
555 dropbox_command_client_add_on_connect_hook(DropboxCommandClient *dcc,
556- DropboxCommandClientConnectHook dhcch,
557- gpointer ud);
558+ DropboxCommandClientConnectHook dhcch,
559+ gpointer ud);
560
561 void
562 dropbox_command_client_add_on_disconnect_hook(DropboxCommandClient *dcc,
563- DropboxCommandClientConnectHook dhcch,
564- gpointer ud);
565+ DropboxCommandClientConnectHook dhcch,
566+ gpointer ud);
567
568 void
569 dropbox_command_client_add_connection_attempt_hook(DropboxCommandClient *dcc,
570- DropboxCommandClientConnectionAttemptHook dhcch,
571- gpointer ud);
572+ DropboxCommandClientConnectionAttemptHook dhcch,
573+ gpointer ud);
574
575 G_END_DECLS
576
577
578=== modified file 'dropbox-hooks.c'
579--- dropbox-hooks.c 2011-10-05 04:35:08 +0000
580+++ dropbox-hooks.c 2016-06-24 12:31:45 +0000
581@@ -242,7 +242,7 @@
582 hookserv->hhsi.line = 0;
583 hookserv->hhsi.command_args = NULL;
584 hookserv->hhsi.command_name = NULL;
585- hookserv->event_source =
586+ hookserv->event_source =
587 g_io_add_watch_full(hookserv->chan, G_PRIORITY_DEFAULT,
588 G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
589 (GIOFunc) handle_hook_server_input, hookserv,
590
591=== modified file 'plugin.c'
592--- plugin.c 2012-02-16 00:46:15 +0000
593+++ plugin.c 2016-06-24 12:31:45 +0000
594@@ -1,16 +1,16 @@
595 /*
596 * Copyright (C) 2011 ammonkey <am.monkeyd@gmail.com>
597- *
598+ *
599 * Marlin is free software: you can redistribute it and/or modify it
600 * under the terms of the GNU General Public License as published by the
601 * Free Software Foundation, either version 3 of the License, or
602 * (at your option) any later version.
603- *
604+ *
605 * Marlin is distributed in the hope that it will be useful, but
606 * WITHOUT ANY WARRANTY; without even the implied warranty of
607 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
608 * See the GNU General Public License for more details.
609- *
610+ *
611 * You should have received a copy of the GNU General Public License along
612 * with this program. If not, see <http://www.gnu.org/licenses/>.
613 */
614@@ -401,8 +401,8 @@
615 return FALSE;
616 }
617
618-static void
619-marlin_dropbox_real_directory_loaded (MarlinPluginsBase *base, void *user_data)
620+static void
621+marlin_dropbox_real_directory_loaded (MarlinPluginsBase *base, void *user_data)
622 {
623 /*GOFFile *file;
624
625@@ -414,8 +414,8 @@
626
627 }
628
629-static void
630-marlin_dropbox_update_file_info (MarlinPluginsBase *base, GOFFile *file)
631+static void
632+marlin_dropbox_update_file_info (MarlinPluginsBase *base, GOFFile *file)
633 {
634 MarlinDropbox *cvs = MARLIN_DROPBOX (base);
635
636@@ -438,7 +438,7 @@
637 stored_filename == NULL) {
638
639 if (stored_filename != NULL && cmp != 0) {
640- /* this happens when the filename changes name on a file obj
641+ /* this happens when the filename changes name on a file obj
642 but changed_cb isn't called */
643 g_object_weak_unref(G_OBJECT(file), (GWeakNotify) when_file_dies, cvs);
644 g_hash_table_remove(cvs->obj2filename, file);
645@@ -567,8 +567,8 @@
646 }
647
648 static void
649-marlin_dropbox_parse_menu(gchar **options,
650- GtkWidget *menu,
651+marlin_dropbox_parse_menu(gchar **options,
652+ GtkWidget *menu,
653 MarlinPluginsBase *base,
654 GOFFile *file)
655 {
656@@ -601,7 +601,7 @@
657 cb_data->cvs = cvs;
658 cb_data->verb = g_strdup (verb);
659 cb_data->file = file;
660-
661+
662 g_object_weak_ref (G_OBJECT (menu), (GWeakNotify) free_menu_cb_data, cb_data);
663
664 /* Deprecated ? */
665@@ -663,8 +663,8 @@
666 g_async_queue_unref(reply_queue);
667 }
668
669-static void
670-marlin_dropbox_context_menu (MarlinPluginsBase *base, GtkWidget *menu, GList *files)
671+static void
672+marlin_dropbox_context_menu (MarlinPluginsBase *base, GtkWidget *menu, GList *files)
673 {
674 MarlinDropbox *cvs = MARLIN_DROPBOX (base);
675 GOFFile *file;
676@@ -728,7 +728,7 @@
677 GHashTable *context_options_response = g_async_queue_timed_pop(reply_queue, &gtv);
678 g_async_queue_unref(reply_queue);
679
680- if (!context_options_response)
681+ if (!context_options_response)
682 return;
683
684 /*
685@@ -757,7 +757,7 @@
686
687 }
688
689-static void
690+static void
691 marlin_dropbox_class_init (MarlinDropboxClass *klass) {
692 MarlinPluginsBaseClass *object_class = MARLIN_PLUGINS_BASE_CLASS (klass);
693 //g_type_class_add_private (klass, sizeof (MarlinDropboxPrivate));
694@@ -769,7 +769,7 @@
695 }
696
697
698-static void
699+static void
700 marlin_dropbox_init (MarlinDropbox *cvs) {
701 //self->priv = MARLIN_DROPBOX_GET_PRIVATE (self);
702 //self->priv = g_new0 (MarlinDropboxPrivate, 1);
703@@ -808,7 +808,7 @@
704 }
705
706
707-static void
708+static void
709 marlin_dropbox_finalize (MarlinPluginsBase* obj) {
710 MarlinDropbox * self = MARLIN_DROPBOX (obj);
711
712
713=== modified file 'plugin.h'
714--- plugin.h 2011-11-06 17:39:41 +0000
715+++ plugin.h 2016-06-24 12:31:45 +0000
716@@ -1,16 +1,16 @@
717 /*
718 * Copyright (C) 2011 ammonkey <am.monkeyd@gmail.com>
719- *
720+ *
721 * Marlin is free software: you can redistribute it and/or modify it
722 * under the terms of the GNU General Public License as published by the
723 * Free Software Foundation, either version 3 of the License, or
724 * (at your option) any later version.
725- *
726+ *
727 * Marlin is distributed in the hope that it will be useful, but
728 * WITHOUT ANY WARRANTY; without even the implied warranty of
729 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
730 * See the GNU General Public License for more details.
731- *
732+ *
733 * You should have received a copy of the GNU General Public License along
734 * with this program. If not, see <http://www.gnu.org/licenses/>.
735 */
736@@ -40,8 +40,8 @@
737 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
738
739 struct _MarlinDropbox {
740- MarlinPluginsBase parent_instance;
741- //MarlinDropboxPrivate * priv;
742+ MarlinPluginsBase parent_instance;
743+ //MarlinDropboxPrivate * priv;
744
745 GHashTable *filename2obj;
746 GHashTable *obj2filename;
747@@ -53,11 +53,11 @@
748 };
749
750 struct _MarlinDropboxClass {
751- MarlinPluginsBaseClass parent_class;
752+ MarlinPluginsBaseClass parent_class;
753 };
754
755 struct _MarlinDropboxPrivate {
756- /*MarlinTrashMonitor* trash_monitor;*/
757+ /*MarlinTrashMonitor* trash_monitor;*/
758 };
759
760 GType marlin_dropbox_get_type (void) G_GNUC_CONST;

Subscribers

People subscribed via source and target branches