[Gtk2hs-commit] (main branch): Fix merge

[Daniel W. <dm...@lu...>]

diffing dir...
Sat Jan  5 02:06:54 GMT 2013  Hamish Mackenzie <ham...@go...>
  * Fix merge
  Ignore-this: 7995f7a9ae26906c1928a4c0b56804b4
    hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 485
    -#if GTK_CHECK_VERSION(2,18,0)
    --- | Get the 'EntryBuffer' object which holds the text for this widget.
    -entryGetBuffer :: EntryClass self => self
    -  -> IO EntryBuffer
    -entryGetBuffer self =
    -  makeNewGObject mkEntryBuffer $
    -  {# call gtk_entry_get_buffer #}
    -    (toEntry self)
    -
    --- | Set the 'EntryBuffer' object which holds the text for this widget.
    -entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self
    -  -> buffer -> IO ()
    -entrySetBuffer self =
    -  {# call gtk_entry_set_buffer #}
    -    (toEntry self) . toEntryBuffer
    -#endif
    -
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 104
    +  menuItemActivatedItem,
    +  menuItemActivated,
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 361
    +menuItemActivatedItem :: MenuItemClass self => Signal self (IO ())
    +menuItemActivatedItem = Signal (connect_NONE__NONE "activate-item")
    +
    +-- | Deprecated. See 'menuItemActivatedItem'.