Print this page
8807 More recent glib updates break hald build
Reviewed by: Dan McDonald <danmcd@joyent.com>


  56         if (parent_class->finalize)
  57                 parent_class->finalize (obj);
  58 }
  59 
  60 static void
  61 hal_device_store_class_init (HalDeviceStoreClass *klass)
  62 {
  63         GObjectClass *obj_class = (GObjectClass *) klass;
  64 
  65         parent_class = g_type_class_peek_parent (klass);
  66 
  67         obj_class->finalize = hal_device_store_finalize;
  68 
  69         signals[STORE_CHANGED] =
  70                 g_signal_new ("store_changed",
  71                               G_TYPE_FROM_CLASS (klass),
  72                               G_SIGNAL_RUN_LAST,
  73                               G_STRUCT_OFFSET (HalDeviceStoreClass,
  74                                                store_changed),
  75                               NULL, NULL,
  76                               hald_marshal_VOID__OBJECT_BOOL,
  77                               G_TYPE_NONE, 2,
  78                               G_TYPE_OBJECT,
  79                               G_TYPE_BOOLEAN);
  80 
  81         signals[DEVICE_PROPERTY_CHANGED] =
  82                 g_signal_new ("device_property_changed",
  83                               G_TYPE_FROM_CLASS (klass),
  84                               G_SIGNAL_RUN_LAST,
  85                               G_STRUCT_OFFSET (HalDeviceStoreClass,
  86                                                device_property_changed),
  87                               NULL, NULL,
  88                               hald_marshal_VOID__OBJECT_STRING_BOOL_BOOL,
  89                               G_TYPE_NONE, 4,
  90                               G_TYPE_OBJECT,
  91                               G_TYPE_STRING,
  92                               G_TYPE_BOOLEAN,
  93                               G_TYPE_BOOLEAN);
  94 
  95         signals[DEVICE_CAPABILITY_ADDED] =
  96                 g_signal_new ("device_capability_added",
  97                               G_TYPE_FROM_CLASS (klass),
  98                               G_SIGNAL_RUN_LAST,
  99                               G_STRUCT_OFFSET (HalDeviceStoreClass,
 100                                                device_capability_added),
 101                               NULL, NULL,
 102                               hald_marshal_VOID__OBJECT_STRING,
 103                               G_TYPE_NONE, 2,
 104                               G_TYPE_OBJECT,
 105                               G_TYPE_STRING);
 106 }
 107 
 108 static void




  56         if (parent_class->finalize)
  57                 parent_class->finalize (obj);
  58 }
  59 
  60 static void
  61 hal_device_store_class_init (HalDeviceStoreClass *klass)
  62 {
  63         GObjectClass *obj_class = (GObjectClass *) klass;
  64 
  65         parent_class = g_type_class_peek_parent (klass);
  66 
  67         obj_class->finalize = hal_device_store_finalize;
  68 
  69         signals[STORE_CHANGED] =
  70                 g_signal_new ("store_changed",
  71                               G_TYPE_FROM_CLASS (klass),
  72                               G_SIGNAL_RUN_LAST,
  73                               G_STRUCT_OFFSET (HalDeviceStoreClass,
  74                                                store_changed),
  75                               NULL, NULL,
  76                               hald_marshal_VOID__OBJECT_BOOLEAN,
  77                               G_TYPE_NONE, 2,
  78                               G_TYPE_OBJECT,
  79                               G_TYPE_BOOLEAN);
  80 
  81         signals[DEVICE_PROPERTY_CHANGED] =
  82                 g_signal_new ("device_property_changed",
  83                               G_TYPE_FROM_CLASS (klass),
  84                               G_SIGNAL_RUN_LAST,
  85                               G_STRUCT_OFFSET (HalDeviceStoreClass,
  86                                                device_property_changed),
  87                               NULL, NULL,
  88                               hald_marshal_VOID__OBJECT_STRING_BOOLEAN_BOOLEAN,
  89                               G_TYPE_NONE, 4,
  90                               G_TYPE_OBJECT,
  91                               G_TYPE_STRING,
  92                               G_TYPE_BOOLEAN,
  93                               G_TYPE_BOOLEAN);
  94 
  95         signals[DEVICE_CAPABILITY_ADDED] =
  96                 g_signal_new ("device_capability_added",
  97                               G_TYPE_FROM_CLASS (klass),
  98                               G_SIGNAL_RUN_LAST,
  99                               G_STRUCT_OFFSET (HalDeviceStoreClass,
 100                                                device_capability_added),
 101                               NULL, NULL,
 102                               hald_marshal_VOID__OBJECT_STRING,
 103                               G_TYPE_NONE, 2,
 104                               G_TYPE_OBJECT,
 105                               G_TYPE_STRING);
 106 }
 107 
 108 static void