Unbreak after libsigc++ upgrade.

spotted by STeve Andre', thanks.
This commit is contained in:
ajacoutot 2009-09-24 11:52:21 +00:00
parent a136c45ecd
commit 9c25657ed7
6 changed files with 89 additions and 2 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2009/08/10 06:31:07 kili Exp $
# $OpenBSD: Makefile,v 1.22 2009/09/24 11:52:21 ajacoutot Exp $
COMMENT= visual administration console for MySQL
DISTNAME= mysql-gui-tools-5.0r12
PKGNAME= mysql-administrator-1.2.12p3
PKGNAME= mysql-administrator-1.2.12p4
CATEGORIES= databases
HOMEPAGE= http://www.mysql.com/products/tools/administrator/

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-source_linux_MABackupPanel_cc,v 1.1 2009/09/24 11:52:21 ajacoutot Exp $
--- source/linux/MABackupPanel.cc.orig Thu Sep 24 12:54:51 2009
+++ source/linux/MABackupPanel.cc Thu Sep 24 12:55:05 2009
@@ -1282,7 +1282,7 @@ void MABackupPanel::perform_backup()
if (_inst->check_connection())
{
- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
(sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata),
50);
dlg->show();

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-source_linux_MACatalogsPanel_cc,v 1.1 2009/09/24 11:52:21 ajacoutot Exp $
--- source/linux/MACatalogsPanel.cc.orig Thu Sep 24 10:57:09 2009
+++ source/linux/MACatalogsPanel.cc Thu Sep 24 12:55:05 2009
@@ -1488,7 +1488,7 @@ void MACatalogsPanel::maint_next_page()
_maint_dlg_xml->get_button("next_button")->set_sensitive(false);
_maint_dlg_xml->get_note("note")->set_current_page(4);
- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
status= (MYX_TABLE_COMMAND_STATUSES*)
_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table,
@@ -1528,7 +1528,7 @@ void MACatalogsPanel::maint_next_page()
_maint_dlg_xml->get_button("next_button")->set_sensitive(false);
_maint_dlg_xml->get_note("note")->set_current_page(4);
- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
status= (MYX_TABLE_COMMAND_STATUSES*)
_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table,
@@ -1568,7 +1568,7 @@ void MACatalogsPanel::maint_next_page()
_maint_dlg_xml->get_button("next_button")->set_sensitive(false);
_maint_dlg_xml->get_note("note")->set_current_page(4);
- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
status= (MYX_TABLE_COMMAND_STATUSES*)
_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table,

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-source_linux_MARestorePanel_cc,v 1.1 2009/09/24 11:52:21 ajacoutot Exp $
--- source/linux/MARestorePanel.cc.orig Thu Sep 24 10:56:43 2009
+++ source/linux/MARestorePanel.cc Thu Sep 24 12:55:05 2009
@@ -728,7 +728,7 @@ MYX_BACKUP_CONTENT *MARestorePanel::perform_load(const
op_aborted= false;
{
- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
(sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
50);
@@ -854,7 +854,7 @@ void MARestorePanel::perform_restore()
//{
MYX_BACKUP_ERROR err;
- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
(sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
50);

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-source_linux_MAServerConnectionsPanel_h,v 1.1 2009/09/24 11:52:21 ajacoutot Exp $
--- source/linux/MAServerConnectionsPanel.h.orig Thu Sep 24 10:56:26 2009
+++ source/linux/MAServerConnectionsPanel.h Thu Sep 24 12:55:05 2009
@@ -87,7 +87,7 @@ class MAServerConnectionsPanel : public MAPanel {
Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
- SigC::Connection _timer;
+ sigc::connection _timer;
int _current_page;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-source_linux_MAdministrator_h,v 1.1 2009/09/24 11:52:21 ajacoutot Exp $
--- source/linux/MAdministrator.h.orig Thu Sep 24 10:56:08 2009
+++ source/linux/MAdministrator.h Thu Sep 24 12:55:05 2009
@@ -66,7 +66,7 @@ class MAdministrator : public Glib::ObjectBase {
sigc::signal0<void> _signal_prefs_changed;
- SigC::Connection _pulse_conn;
+ sigc::connection _pulse_conn;
bool pulse_progress();
void setup_sidebar();