Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Sven Wegener (swegener)" <swegener@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/mysql-gui-tools/files: mysql-gui-tools-5.0_p12-libsigc++-2.2.patch
Date: Fri, 11 Apr 2008 18:38:32
Message-Id: E1JkO8r-000332-JR@stork.gentoo.org
1 swegener 08/04/11 18:38:29
2
3 Added: mysql-gui-tools-5.0_p12-libsigc++-2.2.patch
4 Log:
5 Include a compability patch for libsigc++-2.2, bug #206318.
6 (Portage version: 2.1.5_rc2)
7
8 Revision Changes Path
9 1.1 dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-libsigc++-2.2.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-libsigc++-2.2.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/files/mysql-gui-tools-5.0_p12-libsigc++-2.2.patch?rev=1.1&content-type=text/plain
13
14 Index: mysql-gui-tools-5.0_p12-libsigc++-2.2.patch
15 ===================================================================
16 --- old/mysql-administrator/source/linux/MABackupPanel.cc
17 +++ new/mysql-administrator/source/linux/MABackupPanel.cc
18 @@ -1282,7 +1282,7 @@
19
20 if (_inst->check_connection())
21 {
22 - SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
23 + sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
24 (sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata),
25 50);
26 dlg->show();
27 --- old/mysql-administrator/source/linux/MACatalogsPanel.cc
28 +++ new/mysql-administrator/source/linux/MACatalogsPanel.cc
29 @@ -1488,7 +1488,7 @@
30
31 _maint_dlg_xml->get_button("next_button")->set_sensitive(false);
32 _maint_dlg_xml->get_note("note")->set_current_page(4);
33 - SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
34 + sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
35
36 status= (MYX_TABLE_COMMAND_STATUSES*)
37 _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table,
38 @@ -1528,7 +1528,7 @@
39
40 _maint_dlg_xml->get_button("next_button")->set_sensitive(false);
41 _maint_dlg_xml->get_note("note")->set_current_page(4);
42 - SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
43 + sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
44
45 status= (MYX_TABLE_COMMAND_STATUSES*)
46 _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table,
47 @@ -1568,7 +1568,7 @@
48
49 _maint_dlg_xml->get_button("next_button")->set_sensitive(false);
50 _maint_dlg_xml->get_note("note")->set_current_page(4);
51 - SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
52 + sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
53
54 status= (MYX_TABLE_COMMAND_STATUSES*)
55 _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table,
56 --- old/mysql-administrator/source/linux/MAdministrator.h
57 +++ new/mysql-administrator/source/linux/MAdministrator.h
58 @@ -66,7 +66,7 @@
59
60 sigc::signal0<void> _signal_prefs_changed;
61
62 - SigC::Connection _pulse_conn;
63 + sigc::connection _pulse_conn;
64 bool pulse_progress();
65
66 void setup_sidebar();
67 --- old/mysql-administrator/source/linux/MARestorePanel.cc
68 +++ new/mysql-administrator/source/linux/MARestorePanel.cc
69 @@ -728,7 +728,7 @@
70 op_aborted= false;
71
72 {
73 - SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
74 + sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
75 (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
76 50);
77
78 @@ -854,7 +854,7 @@
79 //{
80 MYX_BACKUP_ERROR err;
81
82 - SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
83 + sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
84 (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
85 50);
86
87 --- old/mysql-administrator/source/linux/MAServerConnectionsPanel.h
88 +++ new/mysql-administrator/source/linux/MAServerConnectionsPanel.h
89 @@ -87,7 +87,7 @@
90
91 Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
92
93 - SigC::Connection _timer;
94 + sigc::connection _timer;
95
96 int _current_page;
97
98 Only in new/mysql-gui-common/library/sql-parser/source: sed885efK
99 --- old/mysql-gui-common/source/linux/MGConnectDialog.cc
100 +++ new/mysql-gui-common/source/linux/MGConnectDialog.cc
101 @@ -659,9 +659,9 @@
102 // select back the original item
103 ((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);
104
105 - SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
106 + sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
107 &MGConnectDialog::preferences_closed));
108 - SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
109 + sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
110 &MGConnectDialog::preferences_changed));
111 MGPreferencesEditor::instance()->show(true);
112 MGPreferencesEditor::instance()->set_modal(true);
113 @@ -676,7 +676,7 @@
114 {
115 Gtk::Button *btn;
116 pid_t ping_pid= 0;
117 - SigC::Connection input_handler;
118 + sigc::connection input_handler;
119 int rc;
120 bool pinging= false;
121 int myerror= 0;
122 --- old/mysql-gui-common/source/linux/MGTreeTooltip.h
123 +++ new/mysql-gui-common/source/linux/MGTreeTooltip.h
124 @@ -39,7 +39,7 @@
125
126 WillShowSignal _show_signal;
127
128 - SigC::Connection _timeout;
129 + sigc::connection _timeout;
130
131 void expose_event(GdkEventExpose *event);
132 void leave_event(GdkEventCrossing *event);
133 --- old/mysql-migration-tool/source/linux/GRTEnvironment.cc
134 +++ new/mysql-migration-tool/source/linux/GRTEnvironment.cc
135 @@ -76,7 +76,7 @@
136 }
137
138
139 -void GRTEnvironment::set_shell_output_handler(const SigC::Slot1<void,const Glib::ustring&> &slot)
140 +void GRTEnvironment::set_shell_output_handler(const sigc::slot1<void,const Glib::ustring&> &slot)
141 {
142 _shellOutputHandler= slot;
143
144 --- old/mysql-migration-tool/source/linux/GRTEnvironment.h
145 +++ new/mysql-migration-tool/source/linux/GRTEnvironment.h
146 @@ -28,7 +28,7 @@
147 int _msgOffset;
148 std::vector<Glib::ustring> _sourceObjectNames;
149
150 - SigC::Slot1<void,const Glib::ustring&> _shellOutputHandler;
151 + sigc::slot1<void,const Glib::ustring&> _shellOutputHandler;
152
153 static void process_shell_output(const char *text, void *udata);
154
155 @@ -42,7 +42,7 @@
156 int init_jni(const std::string &classpath);
157 int execute_shell_command(const Glib::ustring &command);
158
159 - void set_shell_output_handler(const SigC::Slot1<void,const Glib::ustring&> &slot);
160 + void set_shell_output_handler(const sigc::slot1<void,const Glib::ustring&> &slot);
161
162 MYX_GRT_OBJ *get_object(const Glib::ustring &name);
163 bool object_implements_interface(MYX_GRT_OBJ *obj, const Glib::ustring &name);
164 --- old/mysql-migration-tool/source/linux/ObjectShell.cc
165 +++ new/mysql-migration-tool/source/linux/ObjectShell.cc
166 @@ -45,7 +45,7 @@
167
168 tree->set_model(_otree);
169
170 - tree->get_selection()->signal_changed().connect(SigC::slot(*this,&ObjectShell::object_selected));
171 + tree->get_selection()->signal_changed().connect(sigc::slot(*this,&ObjectShell::object_selected));
172
173
174 tree= _xml->get_tree("inspector_tree");
175 @@ -57,9 +57,9 @@
176
177 tree->set_model(_ilist);
178
179 - _xml->get_text("shell_text")->signal_key_press_event().connect(SigC::slot(*this,&ObjectShell::shell_key_press), false);
180 + _xml->get_text("shell_text")->signal_key_press_event().connect(sigc::slot(*this,&ObjectShell::shell_key_press), false);
181
182 - env->set_shell_output_handler(SigC::slot(*this,&ObjectShell::print_shell));
183 + env->set_shell_output_handler(sigc::slot(*this,&ObjectShell::print_shell));
184
185 put_prompt();
186 }
187 --- old/mysql-query-browser/source/linux/MQResultTab.h
188 +++ new/mysql-query-browser/source/linux/MQResultTab.h
189 @@ -45,7 +45,7 @@
190
191 Gtk::Paned *paned;
192
193 - SigC::Connection scroll_con;
194 + sigc::connection scroll_con;
195 };
196
197 enum CompareAction {
198 @@ -71,7 +71,7 @@
199
200 bool _vertical;
201
202 - SigC::Connection _sync_con1, _sync_con2;
203 + sigc::connection _sync_con1, _sync_con2;
204
205 void scrolled(MQResultSetView *sender);
206 void activated(MQResultSetView *sender);
207
208
209
210 --
211 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups