Attachment #193278 for bug #272234

Lines 1282-1288 void MABackupPanel::perform_backup() Link Here

(-)a/administrator/source/linux/MABackupPanel.cc (-1 / +1 lines)
1282		1282
1283	if (_inst->check_connection())	1283	if (_inst->check_connection())
1284	{	1284	{
1285	SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>	1285	sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
1286	(sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata),	1286	(sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata),
1287	50);	1287	50);
1288	dlg->show();	1288	dlg->show();





      _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);

      status= (MYX_TABLE_COMMAND_STATUSES*)
        _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table,


      _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);

      status= (MYX_TABLE_COMMAND_STATUSES*)
        _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table,


      _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);

      status= (MYX_TABLE_COMMAND_STATUSES*)
        _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table,

Lines 728-734 MYX_BACKUP_CONTENT *MARestorePanel::perform_load(const std::string &file, Link Here

(-)a/administrator/source/linux/MARestorePanel.cc (-2 / +2 lines)
728	op_aborted= false;	728	op_aborted= false;
729		729
730	{	730	{
731	SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>	731	sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
732	(sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),	732	(sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
733	50);	733	50);
734		734
Lines 854-860 void MARestorePanel::perform_restore() Link Here
854	//{	854	//{
855	MYX_BACKUP_ERROR err;	855	MYX_BACKUP_ERROR err;
856		856
857	SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>	857	sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
858	(sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),	858	(sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
859	50);	859	50);
860		860

Lines 87-93 class MAServerConnectionsPanel : public MAPanel { Link Here

(-)a/administrator/source/linux/MAServerConnectionsPanel.h (-1 / +1 lines)
87		87
88	Glib::RefPtr<Gdk::Pixbuf> _thread_icon;	88	Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
89		89
90	SigC::Connection _timer;	90	sigc::connection _timer;
91		91
92	int _current_page;	92	int _current_page;
93		93

Lines 66-72 class MAdministrator : public Glib::ObjectBase { Link Here

(-)a/administrator/source/linux/MAdministrator.h (-1 / +1 lines)
66		66
67	sigc::signal0<void> _signal_prefs_changed;	67	sigc::signal0<void> _signal_prefs_changed;
68		68
69	SigC::Connection _pulse_conn;	69	sigc::connection _pulse_conn;
70	bool pulse_progress();	70	bool pulse_progress();
71		71
72	void setup_sidebar();	72	void setup_sidebar();




  // 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,
                                                                                           &MGConnectDialog::preferences_closed));
  sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
                                                                                            &MGConnectDialog::preferences_changed));
  MGPreferencesEditor::instance()->show(true);
  MGPreferencesEditor::instance()->set_modal(true);

{
  Gtk::Button *btn;
  pid_t ping_pid= 0;
  sigc::connection input_handler;
  int rc;
  bool pinging= false;
  int myerror= 0;

Lines 39-45 class MGTreeTooltip : public Glib::Object { Link Here

(-)a/common/source/linux/MGTreeTooltip.h (-1 / +1 lines)
39		39
40	WillShowSignal _show_signal;	40	WillShowSignal _show_signal;
41		41
42	SigC::Connection _timeout;	42	sigc::connection _timeout;
43		43
44	void expose_event(GdkEventExpose *event);	44	void expose_event(GdkEventExpose *event);
45	void leave_event(GdkEventCrossing *event);	45	void leave_event(GdkEventCrossing *event);

Lines 76-82 int GRTEnvironment::update_objects() Link Here

(-)a/migration-tool/source/linux/GRTEnvironment.cc (-1 / +1 lines)
76	}	76	}
77		77
78		78
79	void GRTEnvironment::set_shell_output_handler(const SigC::Slot1<void,const Glib::ustring&> &slot)	79	void GRTEnvironment::set_shell_output_handler(const sigc::slot1<void,const Glib::ustring&> &slot)
80	{	80	{
81	_shellOutputHandler= slot;	81	_shellOutputHandler= slot;
82		82

Lines 28-34 class GRTEnvironment { Link Here

(-)a/migration-tool/source/linux/GRTEnvironment.h (-2 / +2 lines)
28	int _msgOffset;	28	int _msgOffset;
29	std::vector<Glib::ustring> _sourceObjectNames;	29	std::vector<Glib::ustring> _sourceObjectNames;
30		30
31	SigC::Slot1<void,const Glib::ustring&> _shellOutputHandler;	31	sigc::slot1<void,const Glib::ustring&> _shellOutputHandler;
32		32
33	static void process_shell_output(const char text, void udata);	33	static void process_shell_output(const char text, void udata);
34		34
Lines 42-48 class GRTEnvironment { Link Here
42	int init_jni(const std::string &classpath);	42	int init_jni(const std::string &classpath);
43	int execute_shell_command(const Glib::ustring &command);	43	int execute_shell_command(const Glib::ustring &command);
44		44
45	void set_shell_output_handler(const SigC::Slot1<void,const Glib::ustring&> &slot);	45	void set_shell_output_handler(const sigc::slot1<void,const Glib::ustring&> &slot);
46		46
47	MYX_GRT_OBJ *get_object(const Glib::ustring &name);	47	MYX_GRT_OBJ *get_object(const Glib::ustring &name);
48	bool object_implements_interface(MYX_GRT_OBJ *obj, const Glib::ustring &name);	48	bool object_implements_interface(MYX_GRT_OBJ *obj, const Glib::ustring &name);





  tree->set_model(_otree);
  
  tree->get_selection()->signal_changed().connect(sigc::slot(*this,&ObjectShell::object_selected));
  
  
  tree= _xml->get_tree("inspector_tree");


  tree->set_model(_ilist);

  _xml->get_text("shell_text")->signal_key_press_event().connect(sigc::slot(*this,&ObjectShell::shell_key_press), false);
  
  env->set_shell_output_handler(sigc::slot(*this,&ObjectShell::print_shell));
  
  put_prompt();
}

Lines 45-51 class MQResultTab : public MQBaseTab { Link Here

(-)a/query-browser/source/linux/MQResultTab.h (-2 / +2 lines)
45		45
46	Gtk::Paned *paned;	46	Gtk::Paned *paned;
47		47
48	SigC::Connection scroll_con;	48	sigc::connection scroll_con;
49	};	49	};
50		50
51	enum CompareAction {	51	enum CompareAction {
Lines 71-77 class MQResultTab : public MQBaseTab { Link Here
71		71
72	bool _vertical;	72	bool _vertical;
73		73
74	SigC::Connection _sync_con1, _sync_con2;	74	sigc::connection _sync_con1, _sync_con2;
75		75
76	void scrolled(MQResultSetView *sender);	76	void scrolled(MQResultSetView *sender);
77	void activated(MQResultSetView *sender);	77	void activated(MQResultSetView *sender);

Return to bug 272234

Lines 659-667 void MGConnectDialog::open_connection_editor() Link Here

(-)a/common/source/linux/MGConnectDialog.cc (-3 / +3 lines)
659	// select back the original item	659	// select back the original item
660	((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);	660	((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);
661		661
662	SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,	662	sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
663	&MGConnectDialog::preferences_closed));	663	&MGConnectDialog::preferences_closed));
664	SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,	664	sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
665	&MGConnectDialog::preferences_changed));	665	&MGConnectDialog::preferences_changed));
666	MGPreferencesEditor::instance()->show(true);	666	MGPreferencesEditor::instance()->show(true);
667	MGPreferencesEditor::instance()->set_modal(true);	667	MGPreferencesEditor::instance()->set_modal(true);
Lines 676-682 void MGConnectDialog::show_connection_failed() Link Here
676	{	676	{
677	Gtk::Button *btn;	677	Gtk::Button *btn;
678	pid_t ping_pid= 0;	678	pid_t ping_pid= 0;
679	SigC::Connection input_handler;	679	sigc::connection input_handler;
680	int rc;	680	int rc;
681	bool pinging= false;	681	bool pinging= false;
682	int myerror= 0;	682	int myerror= 0;

Lines 1488-1494 void MACatalogsPanel::maint_next_page() Link Here

(-)a/administrator/source/linux/MACatalogsPanel.cc (-3 / +3 lines)
1488		1488
1489	_maint_dlg_xml->get_button("next_button")->set_sensitive(false);	1489	_maint_dlg_xml->get_button("next_button")->set_sensitive(false);
1490	_maint_dlg_xml->get_note("note")->set_current_page(4);	1490	_maint_dlg_xml->get_note("note")->set_current_page(4);
1491	SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);	1491	sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
1492		1492
1493	status= (MYX_TABLE_COMMAND_STATUSES*)	1493	status= (MYX_TABLE_COMMAND_STATUSES*)
1494	_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table,	1494	_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table,
Lines 1528-1534 void MACatalogsPanel::maint_next_page() Link Here
1528		1528
1529	_maint_dlg_xml->get_button("next_button")->set_sensitive(false);	1529	_maint_dlg_xml->get_button("next_button")->set_sensitive(false);
1530	_maint_dlg_xml->get_note("note")->set_current_page(4);	1530	_maint_dlg_xml->get_note("note")->set_current_page(4);
1531	SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);	1531	sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
1532		1532
1533	status= (MYX_TABLE_COMMAND_STATUSES*)	1533	status= (MYX_TABLE_COMMAND_STATUSES*)
1534	_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table,	1534	_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table,
Lines 1568-1574 void MACatalogsPanel::maint_next_page() Link Here
1568		1568
1569	_maint_dlg_xml->get_button("next_button")->set_sensitive(false);	1569	_maint_dlg_xml->get_button("next_button")->set_sensitive(false);
1570	_maint_dlg_xml->get_note("note")->set_current_page(4);	1570	_maint_dlg_xml->get_note("note")->set_current_page(4);
1571	SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);	1571	sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
1572		1572
1573	status= (MYX_TABLE_COMMAND_STATUSES*)	1573	status= (MYX_TABLE_COMMAND_STATUSES*)
1574	_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table,	1574	_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table,

Lines 45-51 ObjectShell::ObjectShell(GRTEnvironment *env) Link Here

(-)a/migration-tool/source/linux/ObjectShell.cc (-3 / +3 lines)
45		45
46	tree->set_model(_otree);	46	tree->set_model(_otree);
47		47
48	tree->get_selection()->signal_changed().connect(SigC::slot(*this,&ObjectShell::object_selected));	48	tree->get_selection()->signal_changed().connect(sigc::slot(*this,&ObjectShell::object_selected));
49		49
50		50
51	tree= _xml->get_tree("inspector_tree");	51	tree= _xml->get_tree("inspector_tree");
Lines 57-65 ObjectShell::ObjectShell(GRTEnvironment *env) Link Here
57		57
58	tree->set_model(_ilist);	58	tree->set_model(_ilist);
59		59
60	_xml->get_text("shell_text")->signal_key_press_event().connect(SigC::slot(*this,&ObjectShell::shell_key_press), false);	60	_xml->get_text("shell_text")->signal_key_press_event().connect(sigc::slot(*this,&ObjectShell::shell_key_press), false);
61		61
62	env->set_shell_output_handler(SigC::slot(*this,&ObjectShell::print_shell));	62	env->set_shell_output_handler(sigc::slot(*this,&ObjectShell::print_shell));
63		63
64	put_prompt();	64	put_prompt();
65	}	65	}