~ubuntu-branches/ubuntu/maverick/gnome-keyring/maverick-proposed

« back to all changes in this revision

Viewing changes to pk/gkr-pk-object.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-02-25 10:14:17 UTC
  • mto: (2.2.1 sid)
  • mto: This revision was merged to the branch mainline in revision 49.
  • Revision ID: james.westby@ubuntu.com-20080225101417-wh6qww55r4uiwz7z
Tags: upstream-2.21.92
ImportĀ upstreamĀ versionĀ 2.21.92

Show diffs side-by-side

added added

removed removed

Lines of Context:
43
43
        PROP_0,
44
44
        PROP_MANAGER,
45
45
        PROP_LOCATION,
46
 
        PROP_UNIQUE,
 
46
        PROP_DIGEST,
47
47
        PROP_ORIG_LABEL,
48
48
        PROP_LABEL
49
49
};
238
238
        case PROP_LOCATION:
239
239
                g_value_set_uint (value, xobj->location);
240
240
                break;
241
 
        case PROP_UNIQUE:
242
 
                g_value_set_boxed (value, xobj->unique);
 
241
        case PROP_DIGEST:
 
242
                g_value_set_boxed (value, xobj->digest);
243
243
                break;
244
244
        case PROP_ORIG_LABEL:
245
245
                g_value_set_string (value, pv->orig_label);
268
268
        case PROP_LOCATION:
269
269
                xobj->location = g_value_get_uint (value);
270
270
                break;
271
 
        case PROP_UNIQUE:
272
 
                gkr_id_free (xobj->unique);
273
 
                xobj->unique = gkr_id_dup (g_value_get_boxed (value));
 
271
        case PROP_DIGEST:
 
272
                gkr_id_free (xobj->digest);
 
273
                xobj->digest = gkr_id_dup (g_value_get_boxed (value));
274
274
                break;
275
275
        case PROP_ORIG_LABEL:
276
276
                g_free (pv->orig_label);
327
327
                g_param_spec_uint ("location", "Location", "Location of Data",
328
328
                                   0, G_MAXUINT, 0, G_PARAM_READWRITE));
329
329
                                   
330
 
        g_object_class_install_property (gobject_class, PROP_UNIQUE,
331
 
                g_param_spec_boxed ("unique", "Unique", "Unique Identifier for Data",
 
330
        g_object_class_install_property (gobject_class, PROP_DIGEST,
 
331
                g_param_spec_boxed ("digest", "Digest", "Digest Identifier for Data",
332
332
                                    GKR_ID_BOXED_TYPE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
333
333
                                    
334
334
        g_object_class_install_property (gobject_class, PROP_ORIG_LABEL,