[Gtk2hs-commit] (main branch): Adjust signal name to avoid conflict

[Andy S. <And...@co...>]

diffing dir...
Sun Oct 24 23:05:51 EDT 2010  Andy Stewart <laz...@gm...>
  * Adjust signal name to avoid conflict
  Ignore-this: 7012887d7edc89ebc2c00340d0c7957
    {
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 82
    -  menuItemSelect,
    -  menuItemDeselect,
    -  menuItemActivate,
    +  menuItemEmitSelect,
    +  menuItemEmitDeselect,
    +  menuItemEmitActivate,
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 94
    -  activateItem,
    -  activateLeaf,
    -  select,
    -  deselect,
    -  toggle,
    +  menuItemActivateItem,
    +  menuItemActivate,
    +  menuItemSelect,
    +  menuItemDeselect,
    +  menuItemToggle,
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 195
    -menuItemSelect :: MenuItemClass self => self -> IO ()
    -menuItemSelect self =
    +menuItemEmitSelect :: MenuItemClass self => self -> IO ()
    +menuItemEmitSelect self =
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 202
    -menuItemDeselect :: MenuItemClass self => self -> IO ()
    -menuItemDeselect self =
    +menuItemEmitDeselect :: MenuItemClass self => self -> IO ()
    +menuItemEmitDeselect self =
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 209
    -menuItemActivate :: MenuItemClass self => self -> IO ()
    -menuItemActivate self =
    +menuItemEmitActivate :: MenuItemClass self => self -> IO ()
    +menuItemEmitActivate self =
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 289
    -activateLeaf :: MenuItemClass self => Signal self (IO ())
    -activateLeaf = Signal (connect_NONE__NONE "activate")
    +menuItemActivate :: MenuItemClass self => Signal self (IO ())
    +menuItemActivate = Signal (connect_NONE__NONE "activate")
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 297
    -activateItem :: MenuItemClass self => Signal self (IO ())
    -activateItem = Signal (connect_NONE__NONE "activate-item")
    +menuItemActivateItem :: MenuItemClass self => Signal self (IO ())
    +menuItemActivateItem = Signal (connect_NONE__NONE "activate-item")
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 302
    -select :: ItemClass i => Signal i (IO ())
    -select = Signal (connect_NONE__NONE "select")
    +menuItemSelect :: ItemClass i => Signal i (IO ())
    +menuItemSelect = Signal (connect_NONE__NONE "select")
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 307
    -deselect :: ItemClass i => Signal i (IO ())
    -deselect = Signal (connect_NONE__NONE "deselect")
    +menuItemDeselect :: ItemClass i => Signal i (IO ())
    +menuItemDeselect = Signal (connect_NONE__NONE "deselect")
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 312
    -toggle :: ItemClass i => Signal i (IO ())
    -toggle = Signal (connect_NONE__NONE "toggle")
    +menuItemToggle :: ItemClass i => Signal i (IO ())
    +menuItemToggle = Signal (connect_NONE__NONE "toggle")
    }