mysql-gui-tools/mysql-gui-tools-sigc_2.1.1_api_fixes.diff

   1 diff -Naurp mysql-gui-tools-5.0r12/administrator/source/linux/MABackupPanel.cc mysql-gui-tools-5.0r12.oden/administrator/source/linux/MABackupPanel.cc
   2 --- mysql-gui-tools-5.0r12/administrator/source/linux/MABackupPanel.cc  2007-02-28 14:51:50.000000000 +0100
   3 +++ mysql-gui-tools-5.0r12.oden/administrator/source/linux/MABackupPanel.cc     2007-11-08 16:21:44.000000000 +0100
   4 @@ -1282,7 +1282,7 @@ void MABackupPanel::perform_backup()
   5
   6    if (_inst->check_connection())
   7    {
   8 -    SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
   9 +    sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
  10                                                           (sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata),
  11                                                           50);
  12      dlg->show();
  13 diff -Naurp mysql-gui-tools-5.0r12/administrator/source/linux/MACatalogsPanel.cc mysql-gui-tools-5.0r12.oden/administrator/source/linux/MACatalogsPanel.cc
  14 --- mysql-gui-tools-5.0r12/administrator/source/linux/MACatalogsPanel.cc        2007-02-21 01:48:34.000000000 +0100
  15 +++ mysql-gui-tools-5.0r12.oden/administrator/source/linux/MACatalogsPanel.cc   2007-11-08 16:21:23.000000000 +0100
  16 @@ -1488,7 +1488,7 @@ void MACatalogsPanel::maint_next_page()
  17
  18        _maint_dlg_xml->get_button("next_button")->set_sensitive(false);
  19        _maint_dlg_xml->get_note("note")->set_current_page(4);
  20 -      SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
  21 +      sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
  22
  23        status= (MYX_TABLE_COMMAND_STATUSES*)
  24          _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table,
  25 @@ -1528,7 +1528,7 @@ void MACatalogsPanel::maint_next_page()
  26
  27        _maint_dlg_xml->get_button("next_button")->set_sensitive(false);
  28        _maint_dlg_xml->get_note("note")->set_current_page(4);
  29 -      SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
  30 +      sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
  31
  32        status= (MYX_TABLE_COMMAND_STATUSES*)
  33          _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table,
  34 @@ -1568,7 +1568,7 @@ void MACatalogsPanel::maint_next_page()
  35
  36        _maint_dlg_xml->get_button("next_button")->set_sensitive(false);
  37        _maint_dlg_xml->get_note("note")->set_current_page(4);
  38 -      SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
  39 +      sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
  40
  41        status= (MYX_TABLE_COMMAND_STATUSES*)
  42          _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table,
  43 diff -Naurp mysql-gui-tools-5.0r12/administrator/source/linux/MAdministrator.h mysql-gui-tools-5.0r12.oden/administrator/source/linux/MAdministrator.h
  44 --- mysql-gui-tools-5.0r12/administrator/source/linux/MAdministrator.h  2007-03-27 15:09:56.000000000 +0200
  45 +++ mysql-gui-tools-5.0r12.oden/administrator/source/linux/MAdministrator.h     2007-11-08 16:21:37.000000000 +0100
  46 @@ -66,7 +66,7 @@ class MAdministrator : public Glib::Obje
  47
  48      sigc::signal0<void> _signal_prefs_changed;
  49
  50 -    SigC::Connection _pulse_conn;
  51 +    sigc::connection _pulse_conn;
  52      bool pulse_progress();
  53
  54      void setup_sidebar();
  55 diff -Naurp mysql-gui-tools-5.0r12/administrator/source/linux/MARestorePanel.cc mysql-gui-tools-5.0r12.oden/administrator/source/linux/MARestorePanel.cc
  56 --- mysql-gui-tools-5.0r12/administrator/source/linux/MARestorePanel.cc 2006-09-26 20:12:56.000000000 +0200
  57 +++ mysql-gui-tools-5.0r12.oden/administrator/source/linux/MARestorePanel.cc    2007-11-08 16:21:16.000000000 +0100
  58 @@ -728,7 +728,7 @@ MYX_BACKUP_CONTENT *MARestorePanel::perf
  59    op_aborted= false;
  60
  61    {
  62 -    SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
  63 +    sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
  64                                                           (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
  65                                                           50);
  66
  67 @@ -854,7 +854,7 @@ void MARestorePanel::perform_restore()
  68    //{
  69      MYX_BACKUP_ERROR err;
  70
  71 -    SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
  72 +    sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
  73                                                           (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
  74                                                           50);
  75
  76 diff -Naurp mysql-gui-tools-5.0r12/administrator/source/linux/MAServerConnectionsPanel.h mysql-gui-tools-5.0r12.oden/administrator/source/linux/MAServerConnectionsPanel.h
  77 --- mysql-gui-tools-5.0r12/administrator/source/linux/MAServerConnectionsPanel.h        2005-04-22 05:21:41.000000000 +0200
  78 +++ mysql-gui-tools-5.0r12.oden/administrator/source/linux/MAServerConnectionsPanel.h   2007-11-08 16:21:32.000000000 +0100
  79 @@ -87,7 +87,7 @@ class MAServerConnectionsPanel : public
  80
  81      Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
  82
  83 -    SigC::Connection _timer;
  84 +    sigc::connection _timer;
  85
  86      int _current_page;
  87
  88 diff -Naurp mysql-gui-tools-5.0r12/common/source/linux/MGConnectDialog.cc mysql-gui-tools-5.0r12.oden/common/source/linux/MGConnectDialog.cc
  89 --- mysql-gui-tools-5.0r12/common/source/linux/MGConnectDialog.cc       2006-12-05 23:44:08.000000000 +0100
  90 +++ mysql-gui-tools-5.0r12.oden/common/source/linux/MGConnectDialog.cc  2007-11-08 16:21:54.000000000 +0100
  91 @@ -659,9 +659,9 @@ void MGConnectDialog::open_connection_ed
  92    // select back the original item
  93    ((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);
  94
  95 -  SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
  96 +  sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
  97                                                                                             &MGConnectDialog::preferences_closed));
  98 -  SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
  99 +  sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
 100                                                                                              &MGConnectDialog::preferences_changed));
 101    MGPreferencesEditor::instance()->show(true);
 102    MGPreferencesEditor::instance()->set_modal(true);
 103 @@ -676,7 +676,7 @@ void MGConnectDialog::show_connection_fa
 104  {
 105    Gtk::Button *btn;
 106    pid_t ping_pid= 0;
 107 -  SigC::Connection input_handler;
 108 +  sigc::connection input_handler;
 109    int rc;
 110    bool pinging= false;
 111    int myerror= 0;
 112 diff -Naurp mysql-gui-tools-5.0r12/common/source/linux/MGTreeTooltip.h mysql-gui-tools-5.0r12.oden/common/source/linux/MGTreeTooltip.h
 113 --- mysql-gui-tools-5.0r12/common/source/linux/MGTreeTooltip.h  2005-10-07 13:31:36.000000000 +0200
 114 +++ mysql-gui-tools-5.0r12.oden/common/source/linux/MGTreeTooltip.h     2007-11-08 16:21:49.000000000 +0100
 115 @@ -39,7 +39,7 @@ class MGTreeTooltip : public Glib::Objec
 116
 117      WillShowSignal _show_signal;
 118
 119 -    SigC::Connection _timeout;
 120 +    sigc::connection _timeout;
 121
 122      void expose_event(GdkEventExpose *event);
 123      void leave_event(GdkEventCrossing *event);
 124 diff -Naurp mysql-gui-tools-5.0r12/query-browser/source/linux/MQResultTab.h mysql-gui-tools-5.0r12.oden/query-browser/source/linux/MQResultTab.h
 125 --- mysql-gui-tools-5.0r12/query-browser/source/linux/MQResultTab.h     2006-12-06 16:50:09.000000000 +0100
 126 +++ mysql-gui-tools-5.0r12.oden/query-browser/source/linux/MQResultTab.h        2007-11-08 16:21:09.000000000 +0100
 127 @@ -45,7 +45,7 @@ class MQResultTab : public MQBaseTab {
 128
 129        Gtk::Paned *paned;
 130
 131 -      SigC::Connection scroll_con;
 132 +      sigc::connection scroll_con;
 133      };
 134
 135      enum CompareAction {
 136 @@ -71,7 +71,7 @@ class MQResultTab : public MQBaseTab {
 137
 138      bool _vertical;
 139
 140 -    SigC::Connection _sync_con1, _sync_con2;
 141 +    sigc::connection _sync_con1, _sync_con2;
 142
 143      void scrolled(MQResultSetView *sender);
 144      void activated(MQResultSetView *sender);