~ubuntu-branches/ubuntu/vivid/nip2/vivid-proposed

« back to all changes in this revision

Viewing changes to src/managedgobject.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry
  • Date: 2009-05-12 09:26:46 UTC
  • mfrom: (1.2.11 upstream) (2.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090512092646-j8lb1w2x69pvgma4
Tags: 7.18.1-1ubuntu1
* Merge from debian unstable (LP: #375435), remaining changes:
  - debian/control: Also Recommend abrowser

Show diffs side-by-side

added added

removed removed

Lines of Context:
51
51
}
52
52
 
53
53
static void
54
 
managedgobject_info( iObject *iobject, BufInfo *buf )
55
 
{
56
 
        Managedgobject *managedgobject = MANAGEDGOBJECT( iobject );
57
 
        GObject *object = managedgobject->object;
58
 
 
59
 
        IOBJECT_CLASS( parent_class )->info( iobject, buf );
60
 
 
61
 
        if( object ) 
62
 
                buf_appendf( buf, "->object :: %s", 
63
 
                        G_OBJECT_TYPE_NAME( object ) );
64
 
}
65
 
 
66
 
static void
67
54
managedgobject_class_init( ManagedgobjectClass *class )
68
55
{
69
56
        GObjectClass *gobject_class = G_OBJECT_CLASS( class );
70
 
        iObjectClass *iobject_class = IOBJECT_CLASS( class );
71
57
 
72
58
        parent_class = g_type_class_peek_parent( class );
73
59
 
74
60
        gobject_class->dispose = managedgobject_dispose;
75
 
 
76
 
        iobject_class->info = managedgobject_info;
77
61
}
78
62
 
79
63
static void