libindicator

Merge lp:~charlesk/libindicator/cxx into lp:libindicator/12.10

  1. cxx
  2. Merge into trunk.12.10
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 467
Merged at revision: 467
Proposed branch: lp:~charlesk/libindicator/cxx
Merge into: lp:libindicator/12.10
Diff against target: 36 lines (+4/-4)
2 files modified
libindicator/indicator-service-manager.c (+2/-2)
libindicator/indicator-service-manager.h (+2/-2)
To merge this branch: bzr merge lp:~charlesk/libindicator/cxx
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+103024@code.launchpad.net

Description of the change

C++ doesn't like implicitly casting away const. :)

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

  review approve
  status approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libindicator/indicator-service-manager.c'
2--- libindicator/indicator-service-manager.c 2012-04-01 19:03:19 +0000
3+++ libindicator/indicator-service-manager.c 2012-04-22 19:28:19 +0000
4@@ -636,7 +636,7 @@
5 object.
6 */
7 IndicatorServiceManager *
8-indicator_service_manager_new (gchar * dbus_name)
9+indicator_service_manager_new (const gchar * dbus_name)
10 {
11 GObject * obj = g_object_new(INDICATOR_SERVICE_MANAGER_TYPE,
12 PROP_NAME_S, dbus_name,
13@@ -660,7 +660,7 @@
14 object.
15 */
16 IndicatorServiceManager *
17-indicator_service_manager_new_version (gchar * dbus_name, guint version)
18+indicator_service_manager_new_version (const gchar * dbus_name, guint version)
19 {
20 GObject * obj = g_object_new(INDICATOR_SERVICE_MANAGER_TYPE,
21 PROP_NAME_S, dbus_name,
22
23=== modified file 'libindicator/indicator-service-manager.h'
24--- libindicator/indicator-service-manager.h 2009-12-04 20:30:44 +0000
25+++ libindicator/indicator-service-manager.h 2012-04-22 19:28:19 +0000
26@@ -76,8 +76,8 @@
27
28 GType indicator_service_manager_get_type (void);
29
30-IndicatorServiceManager * indicator_service_manager_new (gchar * dbus_name);
31-IndicatorServiceManager * indicator_service_manager_new_version (gchar * dbus_name,
32+IndicatorServiceManager * indicator_service_manager_new (const gchar * dbus_name);
33+IndicatorServiceManager * indicator_service_manager_new_version (const gchar * dbus_name,
34 guint version);
35 gboolean indicator_service_manager_connected (IndicatorServiceManager * sm);
36 void indicator_service_manager_set_refresh (IndicatorServiceManager * sm,

Subscribers

People subscribed via source and target branches