diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2009-07-13 07:42:11 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2009-07-13 07:42:11 +0000 |
| commit | 407c4fcd750766eeea4293407115705c8d3255e8 (patch) | |
| tree | a104370d4c327ae6ec8f1dee0340fb13d3fd0d88 /databases/mysql-gui-tools/files | |
| parent | - Add a temporary bugfix patch to correct an error where the (diff) | |
- Update to 5.0r14
Notes
Notes:
svn path=/head/; revision=237674
Diffstat (limited to 'databases/mysql-gui-tools/files')
15 files changed, 221 insertions, 156 deletions
diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MABackupPanel.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MABackupPanel.cc new file mode 100644 index 000000000000..880eb723f3c3 --- /dev/null +++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MABackupPanel.cc @@ -0,0 +1,11 @@ +--- administrator/source/linux/MABackupPanel.cc.orig 2009-07-08 12:06:17.000000000 +0200 ++++ administrator/source/linux/MABackupPanel.cc 2009-07-08 12:06:37.000000000 +0200 +@@ -1282,7 +1282,7 @@ + + 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(); diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MACatalogsPanel.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MACatalogsPanel.cc new file mode 100644 index 000000000000..e57e6f53c9d7 --- /dev/null +++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MACatalogsPanel.cc @@ -0,0 +1,29 @@ +--- administrator/source/linux/MACatalogsPanel.cc.orig 2009-07-08 12:51:09.000000000 +0200 ++++ administrator/source/linux/MACatalogsPanel.cc 2009-07-08 12:51:33.000000000 +0200 +@@ -1488,7 +1488,7 @@ +
+ _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 @@ +
+ _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 @@ +
+ _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,
diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MARestorePanel.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MARestorePanel.cc new file mode 100644 index 000000000000..542ba5f7314a --- /dev/null +++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MARestorePanel.cc @@ -0,0 +1,20 @@ +--- administrator/source/linux/MARestorePanel.cc.orig 2009-07-08 12:49:02.000000000 +0200 ++++ administrator/source/linux/MARestorePanel.cc 2009-07-08 12:49:13.000000000 +0200 +@@ -728,7 +728,7 @@ + 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 @@ + //{ + 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); + diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAServerConnectionsPanel.h b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAServerConnectionsPanel.h new file mode 100644 index 000000000000..51aa715df62e --- /dev/null +++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAServerConnectionsPanel.h @@ -0,0 +1,11 @@ +--- administrator/source/linux/MAServerConnectionsPanel.h.orig 2009-07-08 12:01:06.000000000 +0200 ++++ administrator/source/linux/MAServerConnectionsPanel.h 2009-07-08 12:01:13.000000000 +0200 +@@ -87,7 +87,7 @@ +
+ Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
+
+- SigC::Connection _timer;
++ sigc::connection _timer;
+
+ int _current_page;
+
diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAdministrator.h b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAdministrator.h new file mode 100644 index 000000000000..fde28952a655 --- /dev/null +++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAdministrator.h @@ -0,0 +1,11 @@ +--- administrator/source/linux/MAdministrator.h.orig 2009-07-08 11:51:36.000000000 +0200 ++++ administrator/source/linux/MAdministrator.h 2009-07-08 11:55:04.000000000 +0200 +@@ -66,7 +66,7 @@ +
+ sigc::signal0<void> _signal_prefs_changed;
+
+- SigC::Connection _pulse_conn;
++ sigc::connection _pulse_conn;
+ bool pulse_progress();
+
+ void setup_sidebar();
diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MInstanceInfo.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MInstanceInfo.cc new file mode 100644 index 000000000000..b3c0575c5eaf --- /dev/null +++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MInstanceInfo.cc @@ -0,0 +1,11 @@ +--- administrator/source/linux/MInstanceInfo.cc.orig 2009-07-08 11:56:19.000000000 +0200 ++++ administrator/source/linux/MInstanceInfo.cc 2009-07-08 11:58:17.000000000 +0200 +@@ -1124,7 +1124,7 @@ + char *buffer= (char*)g_malloc(diff+1);
+ int fd= open(path.c_str(), O_RDONLY);
+
+- lseek64(fd, _log_file_pos, SEEK_SET);
++ lseek(fd, _log_file_pos, SEEK_SET);
+ if ((len= read(fd, buffer, diff)) < 0)
+ {
+ close(fd);
diff --git a/databases/mysql-gui-tools/files/patch-mysql-gui-common-source-linux_MDispatcher.cc b/databases/mysql-gui-tools/files/patch-common-source-linux_MDispatcher.cc index bf4b37a269b8..00fc479df048 100644 --- a/databases/mysql-gui-tools/files/patch-mysql-gui-common-source-linux_MDispatcher.cc +++ b/databases/mysql-gui-tools/files/patch-common-source-linux_MDispatcher.cc @@ -1,5 +1,5 @@ ---- mysql-gui-common/source/linux/MDispatcher.cc.orig 2008-09-25 08:24:31.000000000 +0000 -+++ mysql-gui-common/source/linux/MDispatcher.cc 2008-09-25 08:25:09.000000000 +0000 +--- common/source/linux/MDispatcher.cc.orig 2008-09-25 08:24:31.000000000 +0000 ++++ common/source/linux/MDispatcher.cc 2008-09-25 08:25:09.000000000 +0000 @@ -21,8 +21,8 @@ #include <unistd.h>
#include <mysql.h>
diff --git a/databases/mysql-gui-tools/files/patch-common-source-linux_MGConnectDialog.cc b/databases/mysql-gui-tools/files/patch-common-source-linux_MGConnectDialog.cc new file mode 100644 index 000000000000..2487c9a1780f --- /dev/null +++ b/databases/mysql-gui-tools/files/patch-common-source-linux_MGConnectDialog.cc @@ -0,0 +1,24 @@ +--- common/source/linux/MGConnectDialog.cc.orig 2006-12-05 23:44:08.000000000 +0100 ++++ common/source/linux/MGConnectDialog.cc 2007-11-08 16:21:54.000000000 +0100 +@@ -659,9 +659,9 @@ void MGConnectDialog::open_connection_ed + // select back the original item
+ ((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);
+
+- SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
++ sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
+ &MGConnectDialog::preferences_closed));
+- SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
++ sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
+ &MGConnectDialog::preferences_changed));
+ MGPreferencesEditor::instance()->show(true);
+ MGPreferencesEditor::instance()->set_modal(true);
+@@ -676,7 +676,7 @@ void MGConnectDialog::show_connection_fa + {
+ Gtk::Button *btn;
+ pid_t ping_pid= 0;
+- SigC::Connection input_handler;
++ sigc::connection input_handler;
+ int rc;
+ bool pinging= false;
+ int myerror= 0;
+ diff --git a/databases/mysql-gui-tools/files/patch-mysql-gui-common-source-linux_MGExecSU.cc b/databases/mysql-gui-tools/files/patch-common-source-linux_MGExecSU.cc index 996923b782d9..5ca17635cfc2 100644 --- a/databases/mysql-gui-tools/files/patch-mysql-gui-common-source-linux_MGExecSU.cc +++ b/databases/mysql-gui-tools/files/patch-common-source-linux_MGExecSU.cc @@ -1,5 +1,5 @@ ---- mysql-gui-common/source/linux/MGExecSU.cc.orig 2008-03-07 01:50:54.000000000 +0100 -+++ mysql-gui-common/source/linux/MGExecSU.cc 2008-03-07 01:52:50.000000000 +0100 +--- common/source/linux/MGExecSU.cc.orig 2008-03-07 01:50:54.000000000 +0100 ++++ common/source/linux/MGExecSU.cc 2008-03-07 01:52:50.000000000 +0100 @@ -5,10 +5,14 @@ #include "myg_gtkutils.h" #include "mygpriv.h" diff --git a/databases/mysql-gui-tools/files/patch-common-source-linux_MGTreeTooltip.h b/databases/mysql-gui-tools/files/patch-common-source-linux_MGTreeTooltip.h new file mode 100644 index 000000000000..049bc1ed5e6b --- /dev/null +++ b/databases/mysql-gui-tools/files/patch-common-source-linux_MGTreeTooltip.h @@ -0,0 +1,11 @@ +--- common/source/linux/MGTreeTooltip.h.orig 2009-07-07 17:08:50.000000000 +0200 ++++ common/source/linux/MGTreeTooltip.h 2009-07-07 17:09:06.000000000 +0200 +@@ -39,7 +39,7 @@ +
+ WillShowSignal _show_signal;
+
+- SigC::Connection _timeout;
++ sigc::connection _timeout;
+
+ void expose_event(GdkEventExpose *event);
+ void leave_event(GdkEventCrossing *event);
diff --git a/databases/mysql-gui-tools/files/patch-mysql-query-browser_configure b/databases/mysql-gui-tools/files/patch-mysql-query-browser_configure deleted file mode 100644 index e6439a8b1bea..000000000000 --- a/databases/mysql-gui-tools/files/patch-mysql-query-browser_configure +++ /dev/null @@ -1,16 +0,0 @@ ---- mysql-query-browser/configure.orig 2007-05-02 15:00:47.000000000 +0200 -+++ mysql-query-browser/configure 2008-09-04 21:54:58.000000000 +0200 -@@ -1555,12 +1555,7 @@ - do - test -d $d && rmdir $d - done -- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -- if test -f "$ac_aux_dir/mkinstalldirs"; then -- mkdir_p='$(mkinstalldirs)' -- else -- mkdir_p='$(install_sh) -d' -- fi -+ mkdir_p='$(install_sh) -d' - fi - - for ac_prog in gawk mawk nawk awk diff --git a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MGCodeEditor.cc b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MGCodeEditor.cc new file mode 100644 index 000000000000..69e2a91fa215 --- /dev/null +++ b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MGCodeEditor.cc @@ -0,0 +1,38 @@ +--- query-browser/source/linux/MGCodeEditor.cc.orig 2009-07-08 11:17:31.000000000 +0200 ++++ query-browser/source/linux/MGCodeEditor.cc 2009-07-08 11:22:58.000000000 +0200 +@@ -39,6 +39,7 @@ + _wrapper->show();
+
+ gtk_source_view_set_show_line_markers(GTK_SOURCE_VIEW(_srcv), TRUE);
++#if 0
+ gtk_source_view_set_compose_line_markers(GTK_SOURCE_VIEW(_srcv), FALSE);
+
+ bg_color= Gdk::Color("#ffa6a6");
+@@ -54,6 +55,7 @@ + _wrapper->get_colormap()->alloc_color(fg_color);
+ gtk_source_view_set_marker_highlight_colors(GTK_SOURCE_VIEW(_srcv), "pc",
+ fg_color.gobj(), bg_color.gobj());
++#endif
+ }
+
+
+@@ -157,7 +159,9 @@ + {
+ _pc_marker= gtk_source_buffer_create_marker(_buffer, "pc", "pc",
+ iter.gobj());
++#if 0
+ gtk_source_marker_set_priority(_pc_marker, 100);
++#endif
+ }
+ else
+ gtk_source_buffer_move_marker(_buffer, _pc_marker, iter.gobj());
+@@ -264,7 +268,9 @@ + {
+ marker= gtk_source_buffer_create_marker(_buffer, NULL, "breakpoint",
+ iter.gobj());
++#if 0
+ gtk_source_marker_set_priority(marker, 10);
++#endif
+ }
+ }
+ _wrapper->queue_draw();
diff --git a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQResultTab.h b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQResultTab.h new file mode 100644 index 000000000000..8bed353a0464 --- /dev/null +++ b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQResultTab.h @@ -0,0 +1,20 @@ +--- query-browser/source/linux/MQResultTab.h.orig 2009-07-07 17:12:56.000000000 +0200 ++++ query-browser/source/linux/MQResultTab.h 2009-07-07 17:13:17.000000000 +0200 +@@ -45,7 +45,7 @@ +
+ Gtk::Paned *paned;
+
+- SigC::Connection scroll_con;
++ sigc::connection scroll_con;
+ };
+
+ enum CompareAction {
+@@ -71,7 +71,7 @@ +
+ bool _vertical;
+
+- SigC::Connection _sync_con1, _sync_con2;
++ sigc::connection _sync_con1, _sync_con2;
+
+ void scrolled(MQResultSetView *sender);
+ void activated(MQResultSetView *sender);
diff --git a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_Makefile.am b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_Makefile.am new file mode 100644 index 000000000000..d2cc820650f1 --- /dev/null +++ b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_Makefile.am @@ -0,0 +1,31 @@ +--- query-browser/source/linux/Makefile.am.orig 2006-12-13 06:18:53.000000000 +0100 ++++ query-browser/source/linux/Makefile.am 2009-07-08 11:26:35.000000000 +0200 +@@ -40,7 +40,7 @@ + -I$(top_srcdir)/../mysql-gui-common/library/utilities/shared_include\
+ -I$(top_srcdir)/../mysql-gui-common/library/utilities/include\
+ -I$(top_srcdir)/library/include\
+- -I$(top_srcdir)/source/linux/gtksourceview\
++ -I%%LOCALBASE%%/include/gtksourceview-1.0\
+ -DPREFIX=\""$(PREFIX)"\"\
+ -DDATADIRNAME=\""$(DATADIRNAME)"\"\
+ -DCOMMONDIRNAME=\""$(MG_COMMONDIR)"\"\
+@@ -52,18 +52,4 @@ + $(top_builddir)/../mysql-gui-common/library/base-library/source/.libs/libmysqlx.a\
+ $(top_builddir)/../mysql-gui-common/library/utilities/source/.libs/libguiutil.a\
+ $(top_builddir)/../mysql-gui-common/library/sql-parser/source/.libs/libsqlparser.a\
+- $(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a\
+- @MYSQL_LIBS@ @GNOME_LIBS@ @PCRE_LIBS@
+-
+-#
+-# Can't add this as a AC_CONFIG_SUBDIRS in configure.in because
+-# toplevel autogen.sh is breaking the configure scripts in gtksourceview
+-# If a solution is found, this could be removed.
+-#
+-$(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a:
+- (cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests; make CFLAGS="$(CFLAGS) -fno-strict-aliasing")
+-
+-clean-generic:
+- -make -C gtksourceview distclean
+- (cd gtksourceview; rm -fr autom4te.cache config.log)
+-
++ @MYSQL_LIBS@ @GNOME_LIBS@ @PCRE_LIBS@ -L%%LOCALBASE%%/lib -lgtksourceview-1.0
diff --git a/databases/mysql-gui-tools/files/patch-sigc b/databases/mysql-gui-tools/files/patch-sigc deleted file mode 100644 index ecfda5a1b14e..000000000000 --- a/databases/mysql-gui-tools/files/patch-sigc +++ /dev/null @@ -1,136 +0,0 @@ ---- mysql-administrator/source/linux/MABackupPanel.cc.orig 2007-02-28 14:51:50.000000000 +0100 -+++ mysql-administrator/source/linux/MABackupPanel.cc 2007-11-08 16:21:44.000000000 +0100 -@@ -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(); ---- mysql-administrator/source/linux/MACatalogsPanel.cc.orig 2007-02-21 01:48:34.000000000 +0100 -+++ mysql-administrator/source/linux/MACatalogsPanel.cc 2007-11-08 16:21:23.000000000 +0100 -@@ -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,
---- mysql-administrator/source/linux/MAdministrator.h.orig 2007-03-27 15:09:56.000000000 +0200 -+++ mysql-administrator/source/linux/MAdministrator.h 2007-11-08 16:21:37.000000000 +0100 -@@ -66,7 +66,7 @@ class MAdministrator : public Glib::Obje -
- sigc::signal0<void> _signal_prefs_changed;
-
-- SigC::Connection _pulse_conn;
-+ sigc::connection _pulse_conn;
- bool pulse_progress();
-
- void setup_sidebar();
---- mysql-administrator/source/linux/MARestorePanel.cc.orig 2006-09-26 20:12:56.000000000 +0200 -+++ mysql-administrator/source/linux/MARestorePanel.cc 2007-11-08 16:21:16.000000000 +0100 -@@ -728,7 +728,7 @@ MYX_BACKUP_CONTENT *MARestorePanel::perf - 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); - ---- mysql-administrator/source/linux/MAServerConnectionsPanel.h.orig 2005-04-22 05:21:41.000000000 +0200 -+++ mysql-administrator/source/linux/MAServerConnectionsPanel.h 2007-11-08 16:21:32.000000000 +0100 -@@ -87,7 +87,7 @@ class MAServerConnectionsPanel : public -
- Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
-
-- SigC::Connection _timer;
-+ sigc::connection _timer;
-
- int _current_page;
-
---- mysql-gui-common/source/linux/MGConnectDialog.cc.orig 2006-12-05 23:44:08.000000000 +0100 -+++ mysql-gui-common/source/linux/MGConnectDialog.cc 2007-11-08 16:21:54.000000000 +0100 -@@ -659,9 +659,9 @@ void MGConnectDialog::open_connection_ed - // select back the original item
- ((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);
-
-- SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
-+ sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
- &MGConnectDialog::preferences_closed));
-- SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
-+ sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
- &MGConnectDialog::preferences_changed));
- MGPreferencesEditor::instance()->show(true);
- MGPreferencesEditor::instance()->set_modal(true);
-@@ -676,7 +676,7 @@ void MGConnectDialog::show_connection_fa - {
- Gtk::Button *btn;
- pid_t ping_pid= 0;
-- SigC::Connection input_handler;
-+ sigc::connection input_handler;
- int rc;
- bool pinging= false;
- int myerror= 0;
---- mysql-gui-common/source/linux/MGTreeTooltip.h.orig 2005-10-07 13:31:36.000000000 +0200 -+++ mysql-gui-common/source/linux/MGTreeTooltip.h 2007-11-08 16:21:49.000000000 +0100 -@@ -39,7 +39,7 @@ class MGTreeTooltip : public Glib::Objec -
- WillShowSignal _show_signal;
-
-- SigC::Connection _timeout;
-+ sigc::connection _timeout;
-
- void expose_event(GdkEventExpose *event);
- void leave_event(GdkEventCrossing *event);
---- mysql-query-browser/source/linux/MQResultTab.h.orig 2006-12-06 16:50:09.000000000 +0100 -+++ mysql-query-browser/source/linux/MQResultTab.h 2007-11-08 16:21:09.000000000 +0100 -@@ -45,7 +45,7 @@ class MQResultTab : public MQBaseTab {
-
- Gtk::Paned *paned;
-
-- SigC::Connection scroll_con;
-+ sigc::connection scroll_con;
- };
-
- enum CompareAction {
-@@ -71,7 +71,7 @@ class MQResultTab : public MQBaseTab {
-
- bool _vertical;
-
-- SigC::Connection _sync_con1, _sync_con2;
-+ sigc::connection _sync_con1, _sync_con2;
-
- void scrolled(MQResultSetView *sender);
- void activated(MQResultSetView *sender);
|