f-spot-dbus.patch

   1 --- f-spot-0.4.0.orig/dbus-sharp-glib/GLib.IO.cs
   2 +++ f-spot-0.4.0/dbus-sharp-glib/GLib.IO.cs
   3 @@ -43,14 +43,12 @@
   4                 }
   5
   6                 [DllImport(GLIB)]
   7 -                       //static extern int g_io_channel_unix_get_fd (IntPtr channel);
   8 -                       static extern int g_io_channel_unix_get_fd (IOChannel channel);
   9 +                       static extern int g_io_channel_unix_get_fd (IntPtr channel);
  10
  11                 public int UnixFd
  12                 {
  13                         get {
  14 -                               //return g_io_channel_unix_get_fd (Handle);
  15 -                               return g_io_channel_unix_get_fd (this);
  16 +                               return g_io_channel_unix_get_fd (Handle);
  17                         }
  18                 }
  19
  20 @@ -65,43 +63,43 @@
  21
  22
  23                 [DllImport(GLIB)]
  24 -                       public static extern uint g_io_channel_get_buffer_size (IOChannel channel);
  25 +                       public static extern uint g_io_channel_get_buffer_size (IntPtr channel);
  26
  27                 [DllImport(GLIB)]
  28 -                       public static extern void g_io_channel_set_buffer_size (IOChannel channel, uint size);
  29 +                       public static extern void g_io_channel_set_buffer_size (IntPtr channel, uint size);
  30
  31                 public uint BufferSize
  32                 {
  33                         get {
  34 -                               return g_io_channel_get_buffer_size (this);
  35 +                               return g_io_channel_get_buffer_size (Handle);
  36                         } set {
  37 -                               g_io_channel_set_buffer_size (this, value);
  38 +                               g_io_channel_set_buffer_size (Handle, value);
  39                         }
  40                 }
  41
  42                 [DllImport(GLIB)]
  43 -                       public static extern IOCondition g_io_channel_get_buffer_condition (IOChannel channel);
  44 +                       public static extern IOCondition g_io_channel_get_buffer_condition (IntPtr channel);
  45
  46                 public IOCondition BufferCondition
  47                 {
  48                         get {
  49 -                               return g_io_channel_get_buffer_condition (this);
  50 +                               return g_io_channel_get_buffer_condition (Handle);
  51                         }
  52                 }
  53
  54                 [DllImport(GLIB)]
  55 -                       public static extern IOFlags g_io_channel_get_flags (IOChannel channel);
  56 +                       public static extern IOFlags g_io_channel_get_flags (IntPtr channel);
  57
  58                 [DllImport(GLIB)]
  59 -                       static extern short g_io_channel_set_flags (IOChannel channel, IOFlags flags, IntPtr error);
  60 +                       static extern short g_io_channel_set_flags (IntPtr channel, IOFlags flags, IntPtr error);
  61
  62                 public IOFlags Flags
  63                 {
  64                         get {
  65 -                               return g_io_channel_get_flags (this);
  66 +                               return g_io_channel_get_flags (Handle);
  67                         } set {
  68                                 //TODO: fix return and error
  69 -                               g_io_channel_set_flags (this, value, IntPtr.Zero);
  70 +                               g_io_channel_set_flags (Handle, value, IntPtr.Zero);
  71                         }
  72                 }
  73         }
  74 @@ -124,13 +122,13 @@
  75                 Returns: the event source id.
  76                 */
  77                 [DllImport(GLIB)]
  78 -                       protected static extern uint g_io_add_watch (IOChannel channel, IOCondition condition, IOFunc func, IntPtr user_data);
  79 +                       protected static extern uint g_io_add_watch (IntPtr channel, IOCondition condition, IOFunc func, IntPtr user_data);
  80
  81                 public static uint AddWatch (IOChannel channel, IOCondition condition, IOFunc func)
  82                 {
  83                         objs.Add (func);
  84
  85 -                       return g_io_add_watch (channel, condition, func, IntPtr.Zero);
  86 +                       return g_io_add_watch (channel.Handle, condition, func, IntPtr.Zero);
  87                 }
  88
  89                 /*
  90 @@ -146,14 +144,14 @@
  91                 Returns: the event source id.
  92                 */
  93                 [DllImport(GLIB)]
  94 -                       protected static extern uint g_io_add_watch_full (IOChannel channel, int priority, IOCondition condition, IOFunc func, IntPtr user_data, DestroyNotify notify);
  95 +                       protected static extern uint g_io_add_watch_full (IntPtr channel, int priority, IOCondition condition, IOFunc func, IntPtr user_data, DestroyNotify notify);
  96
  97                 public static uint AddWatch (IOChannel channel, int priority, IOCondition condition, IOFunc func, DestroyNotify notify)
  98                 {
  99                         objs.Add (func);
 100                         objs.Add (notify);
 101
 102 -                       return g_io_add_watch_full (channel, priority, condition, func, IntPtr.Zero, notify);
 103 +                       return g_io_add_watch_full (channel.Handle, priority, condition, func, IntPtr.Zero, notify);
 104                 }
 105
 106                 [DllImport(GLIB)]