libindicate

Merge lp:~chrisccoulson/libindicate/lp736240 into lp:libindicate/0.6

  1. lp736240
  2. Merge into trunk
Proposed by Chris Coulson
Status: Merged
Merged at revision: 410
Proposed branch: lp:~chrisccoulson/libindicate/lp736240
Merge into: lp:libindicate/0.6
Diff against target: 44 lines (+17/-17)
1 file modified
libindicate/server.c (+17/-17)
To merge this branch: bzr merge lp:~chrisccoulson/libindicate/lp736240
Reviewer Review Type Date Requested Status
Ted Gould Pending
Review via email: mp+55540@code.launchpad.net

Description of the change

Ensure that we use valid error names on the bus

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libindicate/server.c'
2--- libindicate/server.c 2011-01-14 22:03:10 +0000
3+++ libindicate/server.c 2011-03-30 13:39:43 +0000
4@@ -840,23 +840,23 @@
5 quark = g_quark_from_static_string (G_LOG_DOMAIN);
6
7 /* Register our dbus error codes as well */
8- g_dbus_error_register_error(quark, NO_GET_DESKTOP, "NO_GET_DESKTOP");
9- g_dbus_error_register_error(quark, NO_GET_INDICATOR_COUNT, "NO_GET_INDICATOR_COUNT");
10- g_dbus_error_register_error(quark, NO_GET_INDICATOR_LIST, "NO_GET_INDICATOR_LIST");
11- g_dbus_error_register_error(quark, NO_GET_INDICATOR_PROPERTY, "NO_GET_INDICATOR_PROPERTY");
12- g_dbus_error_register_error(quark, NO_GET_INDICATOR_PROPERTY_GROUP, "NO_GET_INDICATOR_PROPERTY_GROUP");
13- g_dbus_error_register_error(quark, NO_GET_INDICATOR_PROPERTIES, "NO_GET_INDICATOR_PROPERTIES");
14- g_dbus_error_register_error(quark, NO_SHOW_INDICATOR_TO_USER, "NO_SHOW_INDICATOR_TO_USER");
15- g_dbus_error_register_error(quark, NO_INDICATOR_DISPLAYED, "NO_INDICATOR_DISPLAYED");
16- g_dbus_error_register_error(quark, INVALID_INDICATOR_ID, "INVALID_INDICATOR_ID");
17- g_dbus_error_register_error(quark, NO_SHOW_INTEREST, "NO_SHOW_INTEREST");
18- g_dbus_error_register_error(quark, NO_REMOVE_INTEREST, "NO_REMOVE_INTEREST");
19- g_dbus_error_register_error(quark, SHOW_INTEREST_FAILED, "SHOW_INTEREST_FAILED");
20- g_dbus_error_register_error(quark, REMOVE_INTEREST_FAILED, "REMOVE_INTEREST_FAILED");
21- g_dbus_error_register_error(quark, NO_MAX_INDICATORS_SET, "NO_MAX_INDICATORS_SET");
22- g_dbus_error_register_error(quark, MAX_INDICATORS_SET_FAILED, "MAX_INDICATORS_SET_FAILED");
23- g_dbus_error_register_error(quark, NO_SUCH_PROPERTY, "NO_SUCH_PROPERTY");
24- g_dbus_error_register_error(quark, NOT_IMPLEMENTED, "NOT_IMPLEMENTED");
25+ g_dbus_error_register_error(quark, NO_GET_DESKTOP, "com.canonical.indicate.NO_GET_DESKTOP");
26+ g_dbus_error_register_error(quark, NO_GET_INDICATOR_COUNT, "com.canonical.indicate.NO_GET_INDICATOR_COUNT");
27+ g_dbus_error_register_error(quark, NO_GET_INDICATOR_LIST, "com.canonical.indicate.NO_GET_INDICATOR_LIST");
28+ g_dbus_error_register_error(quark, NO_GET_INDICATOR_PROPERTY, "com.canonical.indicate.NO_GET_INDICATOR_PROPERTY");
29+ g_dbus_error_register_error(quark, NO_GET_INDICATOR_PROPERTY_GROUP, "com.canonical.indicate.NO_GET_INDICATOR_PROPERTY_GROUP");
30+ g_dbus_error_register_error(quark, NO_GET_INDICATOR_PROPERTIES, "com.canonical.indicate.NO_GET_INDICATOR_PROPERTIES");
31+ g_dbus_error_register_error(quark, NO_SHOW_INDICATOR_TO_USER, "com.canonical.indicate.NO_SHOW_INDICATOR_TO_USER");
32+ g_dbus_error_register_error(quark, NO_INDICATOR_DISPLAYED, "com.canonical.indicate.NO_INDICATOR_DISPLAYED");
33+ g_dbus_error_register_error(quark, INVALID_INDICATOR_ID, "com.canonical.indicate.INVALID_INDICATOR_ID");
34+ g_dbus_error_register_error(quark, NO_SHOW_INTEREST, "com.canonical.indicate.NO_SHOW_INTEREST");
35+ g_dbus_error_register_error(quark, NO_REMOVE_INTEREST, "com.canonical.indicate.NO_REMOVE_INTEREST");
36+ g_dbus_error_register_error(quark, SHOW_INTEREST_FAILED, "com.canonical.indicate.SHOW_INTEREST_FAILED");
37+ g_dbus_error_register_error(quark, REMOVE_INTEREST_FAILED, "com.canonical.indicate.REMOVE_INTEREST_FAILED");
38+ g_dbus_error_register_error(quark, NO_MAX_INDICATORS_SET, "com.canonical.indicate.NO_MAX_INDICATORS_SET");
39+ g_dbus_error_register_error(quark, MAX_INDICATORS_SET_FAILED, "com.canonical.indicate.MAX_INDICATORS_SET_FAILED");
40+ g_dbus_error_register_error(quark, NO_SUCH_PROPERTY, "com.canonical.indicate.NO_SUCH_PROPERTY");
41+ g_dbus_error_register_error(quark, NOT_IMPLEMENTED, "com.canonical.indicate.NOT_IMPLEMENTED");
42 }
43 return quark;
44 }

Subscribers

People subscribed via source and target branches