1
diff -ruN evolution-data-server-2.22.0.orig/libedataserver/e-categories.c evolution-data-server-2.22.0/libedataserver/e-categories.c
2
--- evolution-data-server-2.22.0.orig/libedataserver/e-categories.c 2007-11-29 13:53:48.000000000 +0100
3
+++ evolution-data-server-2.22.0/libedataserver/e-categories.c 2008-03-11 21:01:54.000000000 +0100
1
diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
2
index 24ee076..5ef17cd 100644
3
--- a/libedataserver/e-categories.c
4
+++ b/libedataserver/e-categories.c
6
7
#include "libedataserver-private.h"
14
@@ -202,7 +204,7 @@ idle_saver_cb (gpointer user_data)
15
16
filename = build_categories_filename ();
17
18
- g_debug ("Saving categories to \"%s\"", filename);
18
+ d (g_debug ("Saving categories to \"%s\"", filename) );
19
+ d (g_debug ("Saving categories to \"%s\"", filename));
20
21
/* build the file contents */
21
22
buffer = g_string_new ("<categories>\n");
23
@@ -303,7 +305,7 @@ load_categories (void)
23
24
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
26
27
- g_debug ("Loading categories from \"%s\"", filename);
27
+ d ( g_debug ("Loading categories from \"%s\"", filename) );
28
+ d (g_debug ("Loading categories from \"%s\"", filename));
29
30
if (!g_file_get_contents (filename, &contents, &length, &error)) {
30
31
g_warning ("Unable to load categories: %s", error->message);
32
@@ -359,7 +361,7 @@ migrate_old_categories (void)
32
33
if (string == NULL || *string == '\0')
35
36
- g_debug ("Loading categories from GConf key \"%s\"", key);
36
+ d (g_debug ("Loading categories from GConf key \"%s\"", key) );
37
+ d (g_debug ("Loading categories from GConf key \"%s\"", key));
38
39
n_added = parse_categories (string, strlen (string));
41
@@ -440,20 +442,20 @@ initialize_categories (void)
42
43
n_added = load_categories ();
44
45
- g_debug ("Loaded %d categories", n_added);
45
+ d ( g_debug ("Loaded %d categories", n_added) );
46
+ d (g_debug ("Loaded %d categories", n_added));
46
47
save_is_pending = FALSE;
50
51
n_added = migrate_old_categories ();
52
53
- g_debug ("Loaded %d categories", n_added);
53
+ d ( g_debug ("Loaded %d categories", n_added) );
54
+ d (g_debug ("Loaded %d categories", n_added));
54
55
save_categories ();
58
59
load_default_categories ();
59
60
- g_debug ("Loaded default categories");
60
+ d ( g_debug ("Loaded default categories") );
61
+ d (g_debug ("Loaded default categories"));
61
62
save_categories ();