aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryids <yids@140774ce-b5e7-0310-ab8b-a85725594a96>2014-01-31 13:45:30 +0000
committeryids <yids@140774ce-b5e7-0310-ab8b-a85725594a96>2014-01-31 13:45:30 +0000
commitb4eda7172773de027b9d9cb32a6ad1b169865d2e (patch)
tree6ce0195601a4c1945b3bbc1b1270f27d7f3c15dc
parent31549f80fa3f93c7fb858b3998831c232ca5b261 (diff)
downloadgnunet-gtk-b4eda7172773de027b9d9cb32a6ad1b169865d2e.tar.gz
gnunet-gtk-b4eda7172773de027b9d9cb32a6ad1b169865d2e.zip
- style changes
Diffstat
-rw-r--r--contrib/gnunet_conversation_gtk_main_window.glade1033
-rw-r--r--src/conversation/gnunet-conversation-gtk.c31
2 files changed, 571 insertions, 493 deletions
diff --git a/contrib/gnunet_conversation_gtk_main_window.glade b/contrib/gnunet_conversation_gtk_main_window.glade
index 6611c99b..47a3af0d 100644
--- a/contrib/gnunet_conversation_gtk_main_window.glade
+++ b/contrib/gnunet_conversation_gtk_main_window.glade
@@ -8,9 +8,10 @@
8 <property name="icon_name">contact-new</property> 8 <property name="icon_name">contact-new</property>
9 <signal name="delete-event" handler="GNUNET_GTK_conversation_quit_cb" swapped="no"/> 9 <signal name="delete-event" handler="GNUNET_GTK_conversation_quit_cb" swapped="no"/>
10 <child> 10 <child>
11 <object class="GtkVBox" id="GNUNET_GTK_conversationvbox"> 11 <object class="GtkBox" id="box1">
12 <property name="visible">True</property> 12 <property name="visible">True</property>
13 <property name="can_focus">False</property> 13 <property name="can_focus">False</property>
14 <property name="orientation">vertical</property>
14 <child> 15 <child>
15 <object class="GtkMenuBar" id="GNUNET_GTK_conversation_menubar"> 16 <object class="GtkMenuBar" id="GNUNET_GTK_conversation_menubar">
16 <property name="visible">True</property> 17 <property name="visible">True</property>
@@ -75,137 +76,350 @@
75 </packing> 76 </packing>
76 </child> 77 </child>
77 <child> 78 <child>
78 <placeholder/> 79 <object class="GtkGrid" id="grid1">
79 </child>
80 <child>
81 <object class="GtkGrid" id="grid4">
82 <property name="visible">True</property> 80 <property name="visible">True</property>
83 <property name="can_focus">False</property> 81 <property name="can_focus">False</property>
84 <child> 82 <child>
85 <object class="GtkBox" id="contacts_toplevel_box"> 83 <object class="GtkGrid" id="grid4">
86 <property name="visible">True</property> 84 <property name="visible">True</property>
87 <property name="can_focus">False</property> 85 <property name="can_focus">False</property>
88 <property name="orientation">vertical</property>
89 <child>
90 <object class="GtkLabel" id="contacts_label">
91 <property name="visible">True</property>
92 <property name="can_focus">False</property>
93 <property name="label" translatable="yes">Contacts</property>
94 <attributes>
95 <attribute name="style" value="oblique"/>
96 </attributes>
97 </object>
98 <packing>
99 <property name="expand">False</property>
100 <property name="fill">True</property>
101 <property name="position">0</property>
102 </packing>
103 </child>
104 <child> 86 <child>
105 <object class="GtkGrid" id="contacts_buttons_grid"> 87 <object class="GtkBox" id="log_box">
106 <property name="visible">True</property> 88 <property name="visible">True</property>
107 <property name="can_focus">False</property> 89 <property name="can_focus">False</property>
90 <property name="orientation">vertical</property>
91 <property name="spacing">1</property>
108 <child> 92 <child>
109 <object class="GtkButton" id="GNUNET_GTK_conversation_add_contact_button"> 93 <object class="GtkLabel" id="log_label">
110 <property name="label" translatable="yes">Add contact</property>
111 <property name="use_action_appearance">False</property>
112 <property name="visible">True</property> 94 <property name="visible">True</property>
113 <property name="can_focus">True</property> 95 <property name="can_focus">False</property>
114 <property name="receives_default">True</property> 96 <property name="label" translatable="yes">Debug Log</property>
115 <property name="use_action_appearance">False</property>
116 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_add_clicked" swapped="no"/>
117 </object> 97 </object>
118 <packing> 98 <packing>
119 <property name="left_attach">0</property> 99 <property name="expand">False</property>
120 <property name="top_attach">0</property> 100 <property name="fill">True</property>
121 <property name="width">1</property> 101 <property name="position">0</property>
122 <property name="height">1</property>
123 </packing> 102 </packing>
124 </child> 103 </child>
125 <child> 104 <child>
126 <object class="GtkButton" id="GNUNET_GTK_conversation_remove_contact_button"> 105 <object class="GtkButtonBox" id="log_buttonbox">
127 <property name="label" translatable="yes">Remove contact</property>
128 <property name="use_action_appearance">False</property>
129 <property name="visible">True</property> 106 <property name="visible">True</property>
130 <property name="can_focus">True</property> 107 <property name="can_focus">False</property>
131 <property name="receives_default">True</property> 108 <property name="layout_style">start</property>
132 <property name="use_action_appearance">False</property> 109 <child>
133 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_remove_clicked" swapped="no"/> 110 <object class="GtkButton" id="gnunet-contact-test">
111 <property name="label" translatable="yes">test_button</property>
112 <property name="use_action_appearance">False</property>
113 <property name="visible">True</property>
114 <property name="can_focus">True</property>
115 <property name="receives_default">True</property>
116 <property name="use_action_appearance">False</property>
117 <signal name="clicked" handler="GNUNET_contact_test" swapped="no"/>
118 </object>
119 <packing>
120 <property name="expand">False</property>
121 <property name="fill">True</property>
122 <property name="position">0</property>
123 </packing>
124 </child>
125 <child>
126 <object class="GtkButton" id="GNUNET_GTK_conversation_status_button">
127 <property name="label" translatable="yes">test_update_status</property>
128 <property name="use_action_appearance">False</property>
129 <property name="visible">True</property>
130 <property name="can_focus">True</property>
131 <property name="receives_default">True</property>
132 <property name="use_action_appearance">False</property>
133 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_status_clicked" swapped="no"/>
134 </object>
135 <packing>
136 <property name="expand">False</property>
137 <property name="fill">True</property>
138 <property name="position">1</property>
139 </packing>
140 </child>
141 <child>
142 <placeholder/>
143 </child>
144 <child>
145 <placeholder/>
146 </child>
134 </object> 147 </object>
135 <packing> 148 <packing>
136 <property name="left_attach">1</property> 149 <property name="expand">False</property>
137 <property name="top_attach">0</property> 150 <property name="fill">True</property>
138 <property name="width">1</property> 151 <property name="position">1</property>
139 <property name="height">1</property>
140 </packing> 152 </packing>
141 </child> 153 </child>
142 <child> 154 <child>
143 <object class="GtkComboBox" id="gnunet_conversation_gtk_contacts_zone_combobox"> 155 <object class="GtkScrolledWindow" id="GNUNET_GTK_conversation_log_scroll">
144 <property name="visible">True</property> 156 <property name="visible">True</property>
145 <property name="can_focus">False</property> 157 <property name="can_focus">True</property>
146 <property name="model">gnunet_conversation_gtk_contacts_zone_liststore</property> 158 <property name="hscrollbar_policy">always</property>
147 <property name="tearoff_title">Phonebook:</property> 159 <property name="shadow_type">in</property>
148 <child> 160 <child>
149 <object class="GtkCellRendererText" id="gnunet_conversation_gtk_contacts_zone_ego_name_cellrenderertext"/> 161 <object class="GtkTextView" id="GNUNET_GTK_conversation_log">
150 <attributes> 162 <property name="visible">True</property>
151 <attribute name="text">0</attribute> 163 <property name="can_focus">True</property>
152 </attributes> 164 <property name="editable">False</property>
165 <property name="left_margin">1</property>
166 <property name="right_margin">1</property>
167 <property name="indent">1</property>
168 </object>
153 </child> 169 </child>
154 </object> 170 </object>
155 <packing> 171 <packing>
156 <property name="left_attach">3</property> 172 <property name="expand">True</property>
157 <property name="top_attach">0</property> 173 <property name="fill">True</property>
158 <property name="width">1</property> 174 <property name="position">2</property>
159 <property name="height">1</property>
160 </packing> 175 </packing>
161 </child> 176 </child>
177 </object>
178 <packing>
179 <property name="left_attach">0</property>
180 <property name="top_attach">4</property>
181 <property name="width">1</property>
182 <property name="height">1</property>
183 </packing>
184 </child>
185 <child>
186 <object class="GtkBox" id="call_toplevel_box">
187 <property name="visible">True</property>
188 <property name="can_focus">False</property>
189 <property name="orientation">vertical</property>
162 <child> 190 <child>
163 <object class="GtkLabel" id="contacts_zone_chooser_label"> 191 <object class="GtkLabel" id="call_label">
164 <property name="visible">True</property> 192 <property name="visible">True</property>
165 <property name="can_focus">False</property> 193 <property name="can_focus">False</property>
166 <property name="label" translatable="yes">Zone:</property> 194 <property name="label" translatable="yes">Phone Controls</property>
195 <attributes>
196 <attribute name="style" value="oblique"/>
197 </attributes>
167 </object> 198 </object>
168 <packing> 199 <packing>
169 <property name="left_attach">2</property> 200 <property name="expand">False</property>
170 <property name="top_attach">0</property> 201 <property name="fill">True</property>
171 <property name="width">1</property> 202 <property name="position">0</property>
172 <property name="height">1</property>
173 </packing> 203 </packing>
174 </child> 204 </child>
175 <child> 205 <child>
176 <placeholder/> 206 <object class="GtkBox" id="outgoing_ego_chooser_box">
177 </child>
178 <child>
179 <object class="GtkEntry" id="GNUNET_GTK_conversation_nameAdd">
180 <property name="visible">True</property> 207 <property name="visible">True</property>
181 <property name="can_focus">True</property> 208 <property name="can_focus">False</property>
182 <property name="invisible_char">•</property> 209 <child>
183 <property name="text" translatable="yes">Name of contact</property> 210 <object class="GtkLabel" id="ego_label">
211 <property name="visible">True</property>
212 <property name="can_focus">False</property>
213 <property name="label" translatable="yes">Ego:</property>
214 </object>
215 <packing>
216 <property name="expand">False</property>
217 <property name="fill">True</property>
218 <property name="position">0</property>
219 </packing>
220 </child>
221 <child>
222 <object class="GtkComboBox" id="gnunet_conversation_gtk_outgoing_zone_combobox">
223 <property name="visible">True</property>
224 <property name="can_focus">False</property>
225 <property name="model">gnunet_conversation_gtk_outgoing_zone_liststore</property>
226 <child>
227 <object class="GtkCellRendererText" id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/>
228 <attributes>
229 <attribute name="text">0</attribute>
230 </attributes>
231 </child>
232 </object>
233 <packing>
234 <property name="expand">True</property>
235 <property name="fill">True</property>
236 <property name="position">1</property>
237 </packing>
238 </child>
184 </object> 239 </object>
185 <packing> 240 <packing>
186 <property name="left_attach">0</property> 241 <property name="expand">False</property>
187 <property name="top_attach">1</property> 242 <property name="fill">True</property>
188 <property name="width">1</property> 243 <property name="position">1</property>
189 <property name="height">1</property>
190 </packing> 244 </packing>
191 </child> 245 </child>
192 <child> 246 <child>
193 <object class="GtkEntry" id="GNUNET_GTK_conversation_addressAdd"> 247 <object class="GtkBox" id="call_hbox">
194 <property name="visible">True</property> 248 <property name="visible">True</property>
195 <property name="can_focus">True</property> 249 <property name="can_focus">False</property>
196 <property name="invisible_char">•</property> 250 <child>
197 <property name="text" translatable="yes">Address of contact</property> 251 <object class="GtkBox" id="address_active_calls_box">
252 <property name="visible">True</property>
253 <property name="can_focus">False</property>
254 <property name="orientation">vertical</property>
255 <child>
256 <object class="GtkEntry" id="GNUNET_GTK_conversation_address">
257 <property name="visible">True</property>
258 <property name="can_focus">True</property>
259 <property name="invisible_char">•</property>
260 <property name="text" translatable="yes">Address</property>
261 <property name="invisible_char_set">True</property>
262 </object>
263 <packing>
264 <property name="expand">False</property>
265 <property name="fill">True</property>
266 <property name="position">0</property>
267 </packing>
268 </child>
269 <child>
270 <object class="GtkScrolledWindow" id="active_calls_scrolledwindow">
271 <property name="visible">True</property>
272 <property name="can_focus">True</property>
273 <property name="shadow_type">in</property>
274 <child>
275 <object class="GtkTreeView" id="gnunet_conversation_gtk_active_calls_treeview">
276 <property name="visible">True</property>
277 <property name="can_focus">True</property>
278 <property name="model">gnunet_conversation_gtk_active_calls_liststore</property>
279 <property name="headers_clickable">False</property>
280 <property name="enable_search">False</property>
281 <property name="search_column">0</property>
282 <child internal-child="selection">
283 <object class="GtkTreeSelection" id="treeview-selection2"/>
284 </child>
285 <child>
286 <object class="GtkTreeViewColumn" id="caller_numColumn">
287 <property name="title" translatable="yes">#</property>
288 <child>
289 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_num">
290 <property name="background_gdk">#000000000000</property>
291 <property name="font">Normal</property>
292 <property name="foreground_gdk">#000000000000</property>
293 <property name="background_rgba">rgba(0,0,0,0)</property>
294 <property name="foreground_rgba">rgba(0,0,0,0)</property>
295 </object>
296 <attributes>
297 <attribute name="text">2</attribute>
298 </attributes>
299 </child>
300 </object>
301 </child>
302 <child>
303 <object class="GtkTreeViewColumn" id="caller_idColumn">
304 <property name="title" translatable="yes">Caller ID</property>
305 <child>
306 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_event_window_renderer1"/>
307 <attributes>
308 <attribute name="text">0</attribute>
309 </attributes>
310 </child>
311 </object>
312 </child>
313 </object>
314 </child>
315 </object>
316 <packing>
317 <property name="expand">True</property>
318 <property name="fill">True</property>
319 <property name="position">1</property>
320 </packing>
321 </child>
322 </object>
323 <packing>
324 <property name="expand">True</property>
325 <property name="fill">True</property>
326 <property name="position">0</property>
327 </packing>
328 </child>
329 <child>
330 <object class="GtkButtonBox" id="GNUNET_GTK_conversation_buttons">
331 <property name="visible">True</property>
332 <property name="can_focus">False</property>
333 <property name="orientation">vertical</property>
334 <property name="layout_style">start</property>
335 <child>
336 <object class="GtkImage" id="GNUNET_GTK_status_icon">
337 <property name="visible">True</property>
338 <property name="can_focus">False</property>
339 <property name="tooltip_text" translatable="yes">Status indicator</property>
340 <property name="icon_name">bluefish</property>
341 </object>
342 <packing>
343 <property name="expand">False</property>
344 <property name="fill">True</property>
345 <property name="position">0</property>
346 </packing>
347 </child>
348 <child>
349 <object class="GtkButton" id="GNUNET_GTK_conversation_call_button">
350 <property name="label" translatable="yes">call</property>
351 <property name="use_action_appearance">False</property>
352 <property name="visible">True</property>
353 <property name="can_focus">True</property>
354 <property name="receives_default">True</property>
355 <property name="use_action_appearance">False</property>
356 <property name="use_underline">True</property>
357 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_call_clicked" swapped="no"/>
358 </object>
359 <packing>
360 <property name="expand">False</property>
361 <property name="fill">True</property>
362 <property name="position">1</property>
363 </packing>
364 </child>
365 <child>
366 <object class="GtkButton" id="GNUNET_GTK_conversation_hangup_button">
367 <property name="label" translatable="yes">hangup</property>
368 <property name="use_action_appearance">False</property>
369 <property name="visible">True</property>
370 <property name="can_focus">True</property>
371 <property name="receives_default">True</property>
372 <property name="use_action_appearance">False</property>
373 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_hangup_clicked" swapped="no"/>
374 </object>
375 <packing>
376 <property name="expand">False</property>
377 <property name="fill">True</property>
378 <property name="position">2</property>
379 </packing>
380 </child>
381 <child>
382 <object class="GtkButton" id="GNUNET_GTK_conversation_pause_button">
383 <property name="label" translatable="yes">pause call</property>
384 <property name="use_action_appearance">False</property>
385 <property name="visible">True</property>
386 <property name="can_focus">True</property>
387 <property name="receives_default">True</property>
388 <property name="use_action_appearance">False</property>
389 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_pause_clicked" swapped="no"/>
390 </object>
391 <packing>
392 <property name="expand">False</property>
393 <property name="fill">True</property>
394 <property name="position">4</property>
395 </packing>
396 </child>
397 <child>
398 <placeholder/>
399 </child>
400 <child>
401 <placeholder/>
402 </child>
403 </object>
404 <packing>
405 <property name="expand">False</property>
406 <property name="fill">True</property>
407 <property name="position">1</property>
408 </packing>
409 </child>
410 <child>
411 <placeholder/>
412 </child>
198 </object> 413 </object>
199 <packing> 414 <packing>
200 <property name="left_attach">1</property> 415 <property name="expand">False</property>
201 <property name="top_attach">1</property> 416 <property name="fill">True</property>
202 <property name="width">1</property> 417 <property name="position">2</property>
203 <property name="height">1</property>
204 </packing> 418 </packing>
205 </child> 419 </child>
206 <child> 420 <child>
207 <object class="GtkButton" id="GNUNET_GTK_conversation_use_current_button"> 421 <object class="GtkButton" id="GNUNET_GTK_conversation_use_current_button">
208 <property name="label" translatable="yes">Use address of current call</property> 422 <property name="label" translatable="yes">Add address of currently selected call</property>
209 <property name="use_action_appearance">False</property> 423 <property name="use_action_appearance">False</property>
210 <property name="visible">True</property> 424 <property name="visible">True</property>
211 <property name="can_focus">True</property> 425 <property name="can_focus">True</property>
@@ -214,106 +428,32 @@
214 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_current_clicked" swapped="no"/> 428 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_current_clicked" swapped="no"/>
215 </object> 429 </object>
216 <packing> 430 <packing>
217 <property name="left_attach">2</property> 431 <property name="expand">False</property>
218 <property name="top_attach">1</property> 432 <property name="fill">True</property>
219 <property name="width">1</property> 433 <property name="position">3</property>
220 <property name="height">1</property>
221 </packing> 434 </packing>
222 </child> 435 </child>
223 </object> 436 </object>
224 <packing> 437 <packing>
225 <property name="expand">False</property> 438 <property name="left_attach">0</property>
226 <property name="fill">True</property> 439 <property name="top_attach">0</property>
227 <property name="position">1</property> 440 <property name="width">1</property>
228 </packing> 441 <property name="height">1</property>
229 </child>
230 <child>
231 <object class="GtkScrolledWindow" id="contacts_scrolledwindow">
232 <property name="visible">True</property>
233 <property name="can_focus">True</property>
234 <property name="shadow_type">in</property>
235 <child>
236 <object class="GtkTreeView" id="gnunet_conversation_gtk_treeview">
237 <property name="visible">True</property>
238 <property name="can_focus">True</property>
239 <property name="model">gnunet_conversation_gtk_contacts_liststore</property>
240 <property name="headers_clickable">False</property>
241 <property name="search_column">0</property>
242 <signal name="row-activated" handler="GNUNET_CONVERSATION_GTK_row_activated" swapped="no"/>
243 <child internal-child="selection">
244 <object class="GtkTreeSelection" id="treeview-selection"/>
245 </child>
246 <child>
247 <object class="GtkTreeViewColumn" id="contactName">
248 <property name="title" translatable="yes">Type</property>
249 <child>
250 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_type_window_name_renderer"/>
251 <attributes>
252 <attribute name="text">1</attribute>
253 </attributes>
254 </child>
255 </object>
256 </child>
257 <child>
258 <object class="GtkTreeViewColumn" id="contactType">
259 <property name="title" translatable="yes">Contact</property>
260 <child>
261 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_main_window_name_renderer"/>
262 <attributes>
263 <attribute name="text">0</attribute>
264 </attributes>
265 </child>
266 </object>
267 </child>
268 </object>
269 </child>
270 </object>
271 <packing>
272 <property name="expand">True</property>
273 <property name="fill">True</property>
274 <property name="position">2</property>
275 </packing>
276 </child>
277 </object>
278 <packing>
279 <property name="left_attach">0</property>
280 <property name="top_attach">1</property>
281 <property name="width">1</property>
282 <property name="height">1</property>
283 </packing>
284 </child>
285 <child>
286 <object class="GtkBox" id="log_box">
287 <property name="visible">True</property>
288 <property name="can_focus">False</property>
289 <property name="orientation">vertical</property>
290 <property name="spacing">1</property>
291 <child>
292 <object class="GtkLabel" id="log_label">
293 <property name="visible">True</property>
294 <property name="can_focus">False</property>
295 <property name="label" translatable="yes">Debug Log</property>
296 </object>
297 <packing>
298 <property name="expand">False</property>
299 <property name="fill">True</property>
300 <property name="position">0</property>
301 </packing> 442 </packing>
302 </child> 443 </child>
303 <child> 444 <child>
304 <object class="GtkButtonBox" id="log_buttonbox"> 445 <object class="GtkBox" id="call_history_toplevel_box">
305 <property name="visible">True</property> 446 <property name="visible">True</property>
306 <property name="can_focus">False</property> 447 <property name="can_focus">False</property>
307 <property name="layout_style">start</property> 448 <property name="orientation">vertical</property>
308 <child> 449 <child>
309 <object class="GtkButton" id="gnunet-contact-test"> 450 <object class="GtkLabel" id="call_history_label">
310 <property name="label" translatable="yes">test_button</property>
311 <property name="use_action_appearance">False</property>
312 <property name="visible">True</property> 451 <property name="visible">True</property>
313 <property name="can_focus">True</property> 452 <property name="can_focus">False</property>
314 <property name="receives_default">True</property> 453 <property name="label" translatable="yes">Call History</property>
315 <property name="use_action_appearance">False</property> 454 <attributes>
316 <signal name="clicked" handler="GNUNET_contact_test" swapped="no"/> 455 <attribute name="style" value="oblique"/>
456 </attributes>
317 </object> 457 </object>
318 <packing> 458 <packing>
319 <property name="expand">False</property> 459 <property name="expand">False</property>
@@ -322,94 +462,102 @@
322 </packing> 462 </packing>
323 </child> 463 </child>
324 <child> 464 <child>
325 <object class="GtkButton" id="GNUNET_GTK_conversation_status_button"> 465 <object class="GtkScrolledWindow" id="call_history_scrolledwindow">
326 <property name="label" translatable="yes">test_update_status</property>
327 <property name="use_action_appearance">False</property>
328 <property name="visible">True</property> 466 <property name="visible">True</property>
329 <property name="can_focus">True</property> 467 <property name="can_focus">True</property>
330 <property name="receives_default">True</property> 468 <property name="shadow_type">in</property>
331 <property name="use_action_appearance">False</property> 469 <child>
332 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_status_clicked" swapped="no"/> 470 <object class="GtkTreeView" id="gnunet_conversation_gtk_history_treeview">
471 <property name="visible">True</property>
472 <property name="can_focus">True</property>
473 <property name="model">gnunet_conversation_gtk_history_liststore</property>
474 <property name="headers_clickable">False</property>
475 <property name="search_column">0</property>
476 <child internal-child="selection">
477 <object class="GtkTreeSelection" id="treeview-selection4"/>
478 </child>
479 <child>
480 <object class="GtkTreeViewColumn" id="timeColumn">
481 <property name="title" translatable="yes">Time</property>
482 <child>
483 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_time_window_renderer"/>
484 <attributes>
485 <attribute name="text">0</attribute>
486 </attributes>
487 </child>
488 </object>
489 </child>
490 <child>
491 <object class="GtkTreeViewColumn" id="eventColumn">
492 <property name="title" translatable="yes">Event</property>
493 <child>
494 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_event_window_renderer"/>
495 <attributes>
496 <attribute name="text">1</attribute>
497 </attributes>
498 </child>
499 </object>
500 </child>
501 <child>
502 <object class="GtkTreeViewColumn" id="contactColumn">
503 <property name="title" translatable="yes">Contact</property>
504 <child>
505 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_contact_window_renderer"/>
506 <attributes>
507 <attribute name="text">2</attribute>
508 </attributes>
509 </child>
510 </object>
511 </child>
512 </object>
513 </child>
333 </object> 514 </object>
334 <packing> 515 <packing>
335 <property name="expand">False</property> 516 <property name="expand">True</property>
336 <property name="fill">True</property> 517 <property name="fill">True</property>
337 <property name="position">1</property> 518 <property name="position">1</property>
338 </packing> 519 </packing>
339 </child> 520 </child>
340 <child>
341 <placeholder/>
342 </child>
343 <child>
344 <placeholder/>
345 </child>
346 </object> 521 </object>
347 <packing> 522 <packing>
348 <property name="expand">False</property> 523 <property name="left_attach">0</property>
349 <property name="fill">True</property> 524 <property name="top_attach">2</property>
350 <property name="position">1</property> 525 <property name="width">1</property>
526 <property name="height">1</property>
351 </packing> 527 </packing>
352 </child> 528 </child>
353 <child> 529 <child>
354 <object class="GtkScrolledWindow" id="GNUNET_GTK_conversation_log_scroll"> 530 <placeholder/>
355 <property name="visible">True</property> 531 </child>
356 <property name="can_focus">True</property> 532 <child>
357 <property name="hscrollbar_policy">always</property> 533 <placeholder/>
358 <property name="shadow_type">in</property>
359 <child>
360 <object class="GtkTextView" id="GNUNET_GTK_conversation_log">
361 <property name="visible">True</property>
362 <property name="can_focus">True</property>
363 <property name="editable">False</property>
364 <property name="left_margin">1</property>
365 <property name="right_margin">1</property>
366 <property name="indent">1</property>
367 </object>
368 </child>
369 </object>
370 <packing>
371 <property name="expand">True</property>
372 <property name="fill">True</property>
373 <property name="position">2</property>
374 </packing>
375 </child> 534 </child>
376 </object> 535 </object>
377 <packing> 536 <packing>
378 <property name="left_attach">0</property> 537 <property name="left_attach">0</property>
379 <property name="top_attach">4</property> 538 <property name="top_attach">0</property>
380 <property name="width">1</property> 539 <property name="width">1</property>
381 <property name="height">1</property> 540 <property name="height">1</property>
382 </packing> 541 </packing>
383 </child> 542 </child>
384 <child> 543 <child>
385 <object class="GtkBox" id="call_toplevel_box"> 544 <object class="GtkBox" id="box2">
386 <property name="visible">True</property> 545 <property name="visible">True</property>
387 <property name="can_focus">False</property> 546 <property name="can_focus">False</property>
388 <property name="orientation">vertical</property> 547 <property name="orientation">vertical</property>
389 <child> 548 <child>
390 <object class="GtkLabel" id="call_label"> 549 <object class="GtkBox" id="contacts_toplevel_box">
391 <property name="visible">True</property>
392 <property name="can_focus">False</property>
393 <property name="label" translatable="yes">Phone Controls</property>
394 <attributes>
395 <attribute name="style" value="oblique"/>
396 </attributes>
397 </object>
398 <packing>
399 <property name="expand">False</property>
400 <property name="fill">True</property>
401 <property name="position">0</property>
402 </packing>
403 </child>
404 <child>
405 <object class="GtkBox" id="outgoing_ego_chooser_box">
406 <property name="visible">True</property> 550 <property name="visible">True</property>
407 <property name="can_focus">False</property> 551 <property name="can_focus">False</property>
552 <property name="orientation">vertical</property>
408 <child> 553 <child>
409 <object class="GtkLabel" id="ego_label"> 554 <object class="GtkLabel" id="contacts_label">
410 <property name="visible">True</property> 555 <property name="visible">True</property>
411 <property name="can_focus">False</property> 556 <property name="can_focus">False</property>
412 <property name="label" translatable="yes">Ego:</property> 557 <property name="label" translatable="yes">Contacts</property>
558 <attributes>
559 <attribute name="style" value="oblique"/>
560 </attributes>
413 </object> 561 </object>
414 <packing> 562 <packing>
415 <property name="expand">False</property> 563 <property name="expand">False</property>
@@ -418,240 +566,187 @@
418 </packing> 566 </packing>
419 </child> 567 </child>
420 <child> 568 <child>
421 <object class="GtkComboBox" id="gnunet_conversation_gtk_outgoing_zone_combobox"> 569 <object class="GtkGrid" id="contacts_buttons_grid">
422 <property name="visible">True</property> 570 <property name="visible">True</property>
423 <property name="can_focus">False</property> 571 <property name="can_focus">False</property>
424 <property name="model">gnunet_conversation_gtk_outgoing_zone_liststore</property>
425 <child> 572 <child>
426 <object class="GtkCellRendererText" id="gnunet_conversation_gtk_outgoing_zone_ego_name_cellrenderertext"/> 573 <object class="GtkLabel" id="contacts_zone_chooser_label">
427 <attributes> 574 <property name="visible">True</property>
428 <attribute name="text">0</attribute> 575 <property name="can_focus">False</property>
429 </attributes> 576 <property name="label" translatable="yes">Zone:</property>
577 </object>
578 <packing>
579 <property name="left_attach">1</property>
580 <property name="top_attach">0</property>
581 <property name="width">1</property>
582 <property name="height">1</property>
583 </packing>
584 </child>
585 <child>
586 <object class="GtkComboBox" id="gnunet_conversation_gtk_contacts_zone_combobox">
587 <property name="visible">True</property>
588 <property name="can_focus">False</property>
589 <property name="model">gnunet_conversation_gtk_contacts_zone_liststore</property>
590 <property name="tearoff_title">Phonebook:</property>
591 <child>
592 <object class="GtkCellRendererText" id="gnunet_conversation_gtk_contacts_zone_ego_name_cellrenderertext"/>
593 <attributes>
594 <attribute name="text">0</attribute>
595 </attributes>
596 </child>
597 </object>
598 <packing>
599 <property name="left_attach">2</property>
600 <property name="top_attach">0</property>
601 <property name="width">1</property>
602 <property name="height">1</property>
603 </packing>
604 </child>
605 <child>
606 <placeholder/>
607 </child>
608 <child>
609 <placeholder/>
610 </child>
611 <child>
612 <placeholder/>
613 </child>
614 <child>
615 <placeholder/>
616 </child>
617 <child>
618 <placeholder/>
619 </child>
620 <child>
621 <placeholder/>
430 </child> 622 </child>
431 </object> 623 </object>
432 <packing> 624 <packing>
433 <property name="expand">True</property> 625 <property name="expand">False</property>
434 <property name="fill">True</property> 626 <property name="fill">True</property>
435 <property name="position">1</property> 627 <property name="position">1</property>
436 </packing> 628 </packing>
437 </child> 629 </child>
438 </object>
439 <packing>
440 <property name="expand">False</property>
441 <property name="fill">True</property>
442 <property name="position">1</property>
443 </packing>
444 </child>
445 <child>
446 <object class="GtkBox" id="call_hbox">
447 <property name="visible">True</property>
448 <property name="can_focus">False</property>
449 <child> 630 <child>
450 <object class="GtkBox" id="address_active_calls_box"> 631 <object class="GtkScrolledWindow" id="contacts_scrolledwindow">
451 <property name="visible">True</property> 632 <property name="visible">True</property>
452 <property name="can_focus">False</property> 633 <property name="can_focus">True</property>
453 <property name="orientation">vertical</property> 634 <property name="shadow_type">in</property>
454 <child>
455 <object class="GtkEntry" id="GNUNET_GTK_conversation_address">
456 <property name="visible">True</property>
457 <property name="can_focus">True</property>
458 <property name="invisible_char">•</property>
459 <property name="text" translatable="yes">Address</property>
460 <property name="invisible_char_set">True</property>
461 </object>
462 <packing>
463 <property name="expand">False</property>
464 <property name="fill">True</property>
465 <property name="position">0</property>
466 </packing>
467 </child>
468 <child> 635 <child>
469 <object class="GtkScrolledWindow" id="active_calls_scrolledwindow"> 636 <object class="GtkTreeView" id="gnunet_conversation_gtk_treeview">
470 <property name="visible">True</property> 637 <property name="visible">True</property>
471 <property name="can_focus">True</property> 638 <property name="can_focus">True</property>
472 <property name="shadow_type">in</property> 639 <property name="model">gnunet_conversation_gtk_contacts_liststore</property>
640 <property name="headers_clickable">False</property>
641 <property name="search_column">0</property>
642 <signal name="row-activated" handler="GNUNET_CONVERSATION_GTK_row_activated" swapped="no"/>
643 <child internal-child="selection">
644 <object class="GtkTreeSelection" id="treeview-selection"/>
645 </child>
473 <child> 646 <child>
474 <object class="GtkTreeView" id="gnunet_conversation_gtk_active_calls_treeview"> 647 <object class="GtkTreeViewColumn" id="contactName">
475 <property name="visible">True</property> 648 <property name="title" translatable="yes">Type</property>
476 <property name="can_focus">True</property>
477 <property name="model">gnunet_conversation_gtk_active_calls_liststore</property>
478 <property name="headers_clickable">False</property>
479 <property name="enable_search">False</property>
480 <property name="search_column">0</property>
481 <child internal-child="selection">
482 <object class="GtkTreeSelection" id="treeview-selection4"/>
483 </child>
484 <child> 649 <child>
485 <object class="GtkTreeViewColumn" id="caller_numColumn"> 650 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_type_window_name_renderer"/>
486 <property name="title" translatable="yes">#</property> 651 <attributes>
487 <child> 652 <attribute name="text">1</attribute>
488 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_active_calls_num"> 653 </attributes>
489 <property name="background_gdk">#000000000000</property>
490 <property name="font">Normal</property>
491 <property name="foreground_gdk">#000000000000</property>
492 <property name="background_rgba">rgba(0,0,0,0)</property>
493 <property name="foreground_rgba">rgba(0,0,0,0)</property>
494 </object>
495 <attributes>
496 <attribute name="text">2</attribute>
497 </attributes>
498 </child>
499 </object>
500 </child> 654 </child>
655 </object>
656 </child>
657 <child>
658 <object class="GtkTreeViewColumn" id="contactType">
659 <property name="title" translatable="yes">Contact</property>
501 <child> 660 <child>
502 <object class="GtkTreeViewColumn" id="caller_idColumn"> 661 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_main_window_name_renderer"/>
503 <property name="title" translatable="yes">Caller ID</property> 662 <attributes>
504 <child> 663 <attribute name="text">0</attribute>
505 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_event_window_renderer1"/> 664 </attributes>
506 <attributes>
507 <attribute name="text">0</attribute>
508 </attributes>
509 </child>
510 </object>
511 </child> 665 </child>
512 </object> 666 </object>
513 </child> 667 </child>
514 </object> 668 </object>
515 <packing>
516 <property name="expand">False</property>
517 <property name="fill">True</property>
518 <property name="position">1</property>
519 </packing>
520 </child> 669 </child>
521 </object> 670 </object>
522 <packing> 671 <packing>
523 <property name="expand">True</property> 672 <property name="expand">True</property>
524 <property name="fill">True</property> 673 <property name="fill">True</property>
525 <property name="position">0</property> 674 <property name="position">2</property>
675 </packing>
676 </child>
677 <child>
678 <object class="GtkEntry" id="GNUNET_GTK_conversation_nameAdd">
679 <property name="visible">True</property>
680 <property name="can_focus">True</property>
681 <property name="invisible_char">•</property>
682 <property name="text" translatable="yes">Name of contact</property>
683 <property name="invisible_char_set">True</property>
684 </object>
685 <packing>
686 <property name="expand">False</property>
687 <property name="fill">True</property>
688 <property name="position">3</property>
689 </packing>
690 </child>
691 <child>
692 <object class="GtkEntry" id="GNUNET_GTK_conversation_addressAdd">
693 <property name="visible">True</property>
694 <property name="can_focus">True</property>
695 <property name="invisible_char">•</property>
696 <property name="text" translatable="yes">Address of contact</property>
697 <property name="invisible_char_set">True</property>
698 </object>
699 <packing>
700 <property name="expand">False</property>
701 <property name="fill">True</property>
702 <property name="position">4</property>
526 </packing> 703 </packing>
527 </child> 704 </child>
528 <child> 705 <child>
529 <object class="GtkButtonBox" id="GNUNET_GTK_conversation_buttons"> 706 <object class="GtkGrid" id="grid2">
530 <property name="visible">True</property> 707 <property name="visible">True</property>
531 <property name="can_focus">False</property> 708 <property name="can_focus">False</property>
532 <property name="orientation">vertical</property>
533 <property name="layout_style">start</property>
534 <child>
535 <object class="GtkImage" id="GNUNET_GTK_status_icon">
536 <property name="visible">True</property>
537 <property name="can_focus">False</property>
538 <property name="tooltip_text" translatable="yes">Status indicator</property>
539 <property name="icon_name">bluefish</property>
540 </object>
541 <packing>
542 <property name="expand">False</property>
543 <property name="fill">True</property>
544 <property name="position">0</property>
545 </packing>
546 </child>
547 <child>
548 <object class="GtkButton" id="GNUNET_GTK_conversation_call_button">
549 <property name="label" translatable="yes">call</property>
550 <property name="use_action_appearance">False</property>
551 <property name="visible">True</property>
552 <property name="can_focus">True</property>
553 <property name="receives_default">True</property>
554 <property name="use_action_appearance">False</property>
555 <property name="use_underline">True</property>
556 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_call_clicked" swapped="no"/>
557 </object>
558 <packing>
559 <property name="expand">False</property>
560 <property name="fill">True</property>
561 <property name="position">1</property>
562 </packing>
563 </child>
564 <child>
565 <object class="GtkButton" id="GNUNET_GTK_conversation_hangup_button">
566 <property name="label" translatable="yes">hangup</property>
567 <property name="use_action_appearance">False</property>
568 <property name="visible">True</property>
569 <property name="can_focus">True</property>
570 <property name="receives_default">True</property>
571 <property name="use_action_appearance">False</property>
572 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_hangup_clicked" swapped="no"/>
573 </object>
574 <packing>
575 <property name="expand">False</property>
576 <property name="fill">True</property>
577 <property name="position">2</property>
578 </packing>
579 </child>
580 <child> 709 <child>
581 <object class="GtkButton" id="GNUNET_GTK_conversation_pause_button"> 710 <object class="GtkButton" id="GNUNET_GTK_conversation_add_contact_button">
582 <property name="label" translatable="yes">pause call</property> 711 <property name="label" translatable="yes">Add contact</property>
583 <property name="use_action_appearance">False</property> 712 <property name="use_action_appearance">False</property>
584 <property name="visible">True</property> 713 <property name="visible">True</property>
585 <property name="can_focus">True</property> 714 <property name="can_focus">True</property>
586 <property name="receives_default">True</property> 715 <property name="receives_default">True</property>
587 <property name="use_action_appearance">False</property> 716 <property name="use_action_appearance">False</property>
588 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_pause_clicked" swapped="no"/> 717 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_add_clicked" swapped="no"/>
589 </object> 718 </object>
590 <packing> 719 <packing>
591 <property name="expand">False</property> 720 <property name="left_attach">0</property>
592 <property name="fill">True</property> 721 <property name="top_attach">0</property>
593 <property name="position">4</property> 722 <property name="width">1</property>
723 <property name="height">1</property>
594 </packing> 724 </packing>
595 </child> 725 </child>
596 <child> 726 <child>
597 <object class="GtkButton" id="GNUNET_GTK_add_active_call_to_contacts"> 727 <object class="GtkButton" id="GNUNET_GTK_conversation_remove_contact_button">
598 <property name="label" translatable="yes">Create contact</property> 728 <property name="label" translatable="yes">Remove contact</property>
599 <property name="use_action_appearance">False</property> 729 <property name="use_action_appearance">False</property>
600 <property name="visible">True</property> 730 <property name="visible">True</property>
601 <property name="can_focus">True</property> 731 <property name="can_focus">True</property>
602 <property name="receives_default">True</property> 732 <property name="receives_default">True</property>
603 <property name="use_action_appearance">False</property> 733 <property name="use_action_appearance">False</property>
734 <signal name="clicked" handler="GNUNET_CONVERSATION_GTK_on_remove_clicked" swapped="no"/>
604 </object> 735 </object>
605 <packing> 736 <packing>
606 <property name="expand">False</property> 737 <property name="left_attach">1</property>
607 <property name="fill">True</property> 738 <property name="top_attach">0</property>
608 <property name="position">4</property> 739 <property name="width">1</property>
740 <property name="height">1</property>
609 </packing> 741 </packing>
610 </child> 742 </child>
611 <child>
612 <placeholder/>
613 </child>
614 </object> 743 </object>
615 <packing> 744 <packing>
616 <property name="expand">False</property> 745 <property name="expand">False</property>
617 <property name="fill">True</property> 746 <property name="fill">True</property>
618 <property name="position">1</property> 747 <property name="position">5</property>
619 </packing> 748 </packing>
620 </child> 749 </child>
621 <child>
622 <placeholder/>
623 </child>
624 </object>
625 <packing>
626 <property name="expand">False</property>
627 <property name="fill">True</property>
628 <property name="position">2</property>
629 </packing>
630 </child>
631 <child>
632 <placeholder/>
633 </child>
634 </object>
635 <packing>
636 <property name="left_attach">0</property>
637 <property name="top_attach">0</property>
638 <property name="width">1</property>
639 <property name="height">1</property>
640 </packing>
641 </child>
642 <child>
643 <object class="GtkBox" id="call_history_toplevel_box">
644 <property name="visible">True</property>
645 <property name="can_focus">False</property>
646 <property name="orientation">vertical</property>
647 <child>
648 <object class="GtkLabel" id="call_history_label">
649 <property name="visible">True</property>
650 <property name="can_focus">False</property>
651 <property name="label" translatable="yes">Call History</property>
652 <attributes>
653 <attribute name="style" value="oblique"/>
654 </attributes>
655 </object> 750 </object>
656 <packing> 751 <packing>
657 <property name="expand">False</property> 752 <property name="expand">False</property>
@@ -659,93 +754,19 @@
659 <property name="position">0</property> 754 <property name="position">0</property>
660 </packing> 755 </packing>
661 </child> 756 </child>
662 <child>
663 <object class="GtkScrolledWindow" id="call_history_scrolledwindow">
664 <property name="visible">True</property>
665 <property name="can_focus">True</property>
666 <property name="shadow_type">in</property>
667 <child>
668 <object class="GtkTreeView" id="gnunet_conversation_gtk_history_treeview">
669 <property name="visible">True</property>
670 <property name="can_focus">True</property>
671 <property name="model">gnunet_conversation_gtk_history_liststore</property>
672 <property name="headers_clickable">False</property>
673 <property name="search_column">0</property>
674 <child internal-child="selection">
675 <object class="GtkTreeSelection" id="treeview-selection2"/>
676 </child>
677 <child>
678 <object class="GtkTreeViewColumn" id="timeColumn">
679 <property name="title" translatable="yes">Time</property>
680 <child>
681 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_time_window_renderer"/>
682 <attributes>
683 <attribute name="text">0</attribute>
684 </attributes>
685 </child>
686 </object>
687 </child>
688 <child>
689 <object class="GtkTreeViewColumn" id="eventColumn">
690 <property name="title" translatable="yes">Event</property>
691 <child>
692 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_event_window_renderer"/>
693 <attributes>
694 <attribute name="text">1</attribute>
695 </attributes>
696 </child>
697 </object>
698 </child>
699 <child>
700 <object class="GtkTreeViewColumn" id="contactColumn">
701 <property name="title" translatable="yes">Contact</property>
702 <child>
703 <object class="GtkCellRendererText" id="GNUNET_CONVERSATION_GTK_contact_window_renderer"/>
704 <attributes>
705 <attribute name="text">2</attribute>
706 </attributes>
707 </child>
708 </object>
709 </child>
710 </object>
711 </child>
712 </object>
713 <packing>
714 <property name="expand">False</property>
715 <property name="fill">True</property>
716 <property name="position">1</property>
717 </packing>
718 </child>
719 </object> 757 </object>
720 <packing> 758 <packing>
721 <property name="left_attach">0</property> 759 <property name="left_attach">1</property>
722 <property name="top_attach">2</property> 760 <property name="top_attach">0</property>
723 <property name="width">1</property> 761 <property name="width">1</property>
724 <property name="height">1</property> 762 <property name="height">1</property>
725 </packing> 763 </packing>
726 </child> 764 </child>
727 <child>
728 <placeholder/>
729 </child>
730 </object>
731 <packing>
732 <property name="expand">True</property>
733 <property name="fill">True</property>
734 <property name="position">2</property>
735 </packing>
736 </child>
737 <child>
738 <object class="GtkStatusbar" id="GNUNET_GTK_conversation_statusbar">
739 <property name="visible">True</property>
740 <property name="can_focus">False</property>
741 <property name="orientation">vertical</property>
742 <property name="spacing">8</property>
743 </object> 765 </object>
744 <packing> 766 <packing>
745 <property name="expand">False</property> 767 <property name="expand">False</property>
746 <property name="fill">True</property> 768 <property name="fill">True</property>
747 <property name="pack_type">end</property> 769 <property name="position">1</property>
748 <property name="position">3</property>
749 </packing> 770 </packing>
750 </child> 771 </child>
751 </object> 772 </object>
@@ -788,6 +809,16 @@
788 </row> 809 </row>
789 </data> 810 </data>
790 </object> 811 </object>
812 <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore">
813 <columns>
814 <!-- column-name logTime -->
815 <column type="gchararray"/>
816 <!-- column-name logEvent -->
817 <column type="gchararray"/>
818 <!-- column-name logContact -->
819 <column type="gchararray"/>
820 </columns>
821 </object>
791 <object class="GtkTreeStore" id="gnunet_conversation_gtk_history_treestore"/> 822 <object class="GtkTreeStore" id="gnunet_conversation_gtk_history_treestore"/>
792 <object class="GtkListStore" id="gnunet_conversation_gtk_outgoing_zone_liststore"> 823 <object class="GtkListStore" id="gnunet_conversation_gtk_outgoing_zone_liststore">
793 <columns> 824 <columns>
@@ -802,14 +833,36 @@
802 </row> 833 </row>
803 </data> 834 </data>
804 </object> 835 </object>
805 <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore"> 836 <object class="GtkWindow" id="window1">
806 <columns> 837 <property name="can_focus">False</property>
807 <!-- column-name logTime --> 838 <child>
808 <column type="gchararray"/> 839 <object class="GtkVBox" id="GNUNET_GTK_conversationvbox">
809 <!-- column-name logEvent --> 840 <property name="visible">True</property>
810 <column type="gchararray"/> 841 <property name="can_focus">False</property>
811 <!-- column-name logContact --> 842 <child>
812 <column type="gchararray"/> 843 <placeholder/>
813 </columns> 844 </child>
845 <child>
846 <placeholder/>
847 </child>
848 <child>
849 <placeholder/>
850 </child>
851 <child>
852 <object class="GtkStatusbar" id="GNUNET_GTK_conversation_statusbar">
853 <property name="visible">True</property>
854 <property name="can_focus">False</property>
855 <property name="orientation">vertical</property>
856 <property name="spacing">8</property>
857 </object>
858 <packing>
859 <property name="expand">False</property>
860 <property name="fill">True</property>
861 <property name="pack_type">end</property>
862 <property name="position">3</property>
863 </packing>
864 </child>
865 </object>
866 </child>
814 </object> 867 </object>
815</interface> 868</interface>
diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 094b41b2..a475a964 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -804,15 +804,18 @@ do_reject (const char *args)
804 peer_name = GNUNET_strdup (cl->caller_id); 804 peer_name = GNUNET_strdup (cl->caller_id);
805 GNUNET_free (cl->caller_id); 805 GNUNET_free (cl->caller_id);
806 GNUNET_free (cl); 806 GNUNET_free (cl);
807// caller_num_gen--;
807 break; 808 break;
808 case PS_ACCEPTED: 809 case PS_ACCEPTED:
809 /* expected state, do rejection logic */ 810 /* expected state, do rejection logic */
810 history_add (CH_REJECTED, peer_name); 811 history_add (CH_REJECTED, peer_name);
811 GNUNET_assert (NULL != cl_active); 812 GNUNET_assert (NULL != cl_active);
812 GNUNET_CONVERSATION_caller_hang_up (cl_active->caller); 813 GNUNET_CONVERSATION_caller_hang_up (cl_active->caller);
814 GNUNET_free (cl_active->caller_id);
813 GNUNET_free (cl_active); 815 GNUNET_free (cl_active);
814 816 GNUNET_assert (caller_num_gen > 0);
815// cl_active = NULL; 817// caller_num_gen--;
818 cl_active = NULL;
816 phone_state = PS_LISTEN; 819 phone_state = PS_LISTEN;
817 break; 820 break;
818 } 821 }
@@ -1140,7 +1143,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
1140 main_window = 1143 main_window =
1141 GTK_WIDGET (GNUNET_GTK_plug_me 1144 GTK_WIDGET (GNUNET_GTK_plug_me
1142 ("GNUNET_CONVERSATION_GTK_PLUG", GTK_WIDGET (main_window))); 1145 ("GNUNET_CONVERSATION_GTK_PLUG", GTK_WIDGET (main_window)));
1143 gtk_window_set_default_size (main_window, 300, 700); 1146 gtk_window_set_default_size (main_window, 700, 700);
1144 1147
1145 // active calls 1148 // active calls
1146 active_liststore = 1149 active_liststore =
@@ -1431,6 +1434,7 @@ add_contact (const gchar * name, const gchar * address)
1431 static size_t data_size; 1434 static size_t data_size;
1432 struct GNUNET_CRYPTO_EcdsaPublicKey pkey; 1435 struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
1433 1436
1437
1434 GNUNET_CRYPTO_ecdsa_public_key_from_string (address, strlen (address), &pkey); 1438 GNUNET_CRYPTO_ecdsa_public_key_from_string (address, strlen (address), &pkey);
1435 rde = &rd; 1439 rde = &rd;
1436 zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id); 1440 zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
@@ -1652,3 +1656,24 @@ GNUNET_contact_test ()
1652 1656
1653 1657
1654} 1658}
1659
1660void
1661test_button_clicked()
1662{
1663 FPRINTF(stderr,"testbt click \n");
1664 GtkTreeIter iter;
1665 char *caller_id = "testje";
1666 int caller_num = 10;
1667
1668 /*
1669 * active_liststore:
1670 * 0: *gchar caller_id
1671 * 1: pointer caller
1672 * 2: gint caller_num
1673 */
1674
1675 gtk_list_store_append (active_liststore, &iter);
1676
1677 gtk_list_store_set (active_liststore, &iter, 2, caller_num, 0, caller_id, -1);
1678
1679}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-13 06:50:47 +0000