Merge lp:~ted/libindicate/propfix into lp:libindicate/0.6

Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/libindicate/propfix
Merge into: lp:libindicate/0.6
Diff against target: None lines
To merge this branch: bzr merge lp:~ted/libindicate/propfix
Reviewer Review Type Date Requested Status
Cody Russell (community) Approve
Review via email: mp+11641@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Fixing so we can get the count property.

Revision history for this message
Cody Russell (bratsche) :
review: Approve

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 2009-09-08 20:58:26 +0000
3+++ libindicate/server.c 2009-09-11 21:13:52 +0000
4@@ -429,7 +429,7 @@
5 set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec)
6 {
7 g_return_if_fail(G_VALUE_HOLDS_STRING(value));
8- g_return_if_fail(id == PROP_DESKTOP || id == PROP_TYPE);
9+ g_return_if_fail(id == PROP_DESKTOP || id == PROP_TYPE || id == PROP_COUNT);
10
11 IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(obj);
12 switch (id) {
13@@ -463,7 +463,7 @@
14 static void
15 get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec)
16 {
17- g_return_if_fail(id == PROP_DESKTOP || id == PROP_TYPE);
18+ g_return_if_fail(id == PROP_DESKTOP || id == PROP_TYPE || id == PROP_COUNT);
19
20 IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(obj);
21 switch (id) {

Subscribers

People subscribed via source and target branches

to all changes: