← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/glib2.0/intrepid-updates

« back to all changes in this revision

Viewing changes to gio/gunionvolumemonitor.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge, Loic Minier, Sebastian Dröge
  • Date: 2008-07-22 11:17:05 UTC
  • mfrom: (1.2.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20080722111705-0ejknwv7o1dyxmjj
Tags: 2.17.4-1
[ Loic Minier ]
* List back m68k in arches where we could make the testsuite fatal,
  following the update on GNOME #481575.
* Document why testsuite is currently completely disabled (fails when
  there's no writable $HOME).

[ Sebastian Dröge ]
* New upstream development release, the new API might still change:
  + debian/rules,
    debian/libglib2.0-0.symbols:
    - Updated for the new symbols.
  + debian/patches/90_gio-nautilus-crash.patch:
    - Dropped, merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gio/gunionvolumemonitor.c
344
344
}
345
345
 
346
346
static void
 
347
child_drive_eject_button (GVolumeMonitor      *child_monitor,
 
348
                          GDrive             *child_drive,
 
349
                          GUnionVolumeMonitor *union_monitor)
 
350
{
 
351
  g_signal_emit_by_name (union_monitor,
 
352
                         "drive_eject_button",
 
353
                         child_drive);
 
354
}
 
355
 
 
356
static void
347
357
g_union_volume_monitor_add_monitor (GUnionVolumeMonitor *union_monitor,
348
358
                                    GVolumeMonitor      *volume_monitor)
349
359
{
364
374
  g_signal_connect (volume_monitor, "drive_connected", (GCallback)child_drive_connected, union_monitor);
365
375
  g_signal_connect (volume_monitor, "drive_disconnected", (GCallback)child_drive_disconnected, union_monitor);
366
376
  g_signal_connect (volume_monitor, "drive_changed", (GCallback)child_drive_changed, union_monitor);
 
377
  g_signal_connect (volume_monitor, "drive_eject_button", (GCallback)child_drive_eject_button, union_monitor);
367
378
}
368
379
 
369
380
static void
388
399
  g_signal_handlers_disconnect_by_func (child_monitor, child_drive_connected, union_monitor);
389
400
  g_signal_handlers_disconnect_by_func (child_monitor, child_drive_disconnected, union_monitor);
390
401
  g_signal_handlers_disconnect_by_func (child_monitor, child_drive_changed, union_monitor);
 
402
  g_signal_handlers_disconnect_by_func (child_monitor, child_drive_eject_button, union_monitor);
391
403
}
392
404
 
393
405
static GType