diff options
| author | Alfred E. Heggestad <aeh@db.org> | 2015-07-07 19:17:09 +0200 |
|---|---|---|
| committer | Alfred E. Heggestad <aeh@db.org> | 2015-07-07 19:17:09 +0200 |
| commit | efe5804871d465c5ad5ade414a399fb37d5658a8 (patch) | |
| tree | 27f73abee400af3d77cbdd5e3efde8fda049134d /modules | |
| parent | c96f478125d885acc3e567dc04ce95364b89d8b6 (diff) | |
gtk: minor cleanups and formatting
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gtk/call_window.c | 8 | ||||
| -rw-r--r-- | modules/gtk/transfer_dialog.c | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/modules/gtk/call_window.c b/modules/gtk/call_window.c index 11677ff..4e3797d 100644 --- a/modules/gtk/call_window.c +++ b/modules/gtk/call_window.c @@ -12,7 +12,10 @@ struct call_window { struct gtk_mod *mod; struct call *call; - struct mqueue *mq; /* for communicating from gtk thread to main thread */ + + /** for communicating from gtk thread to main thread */ + struct mqueue *mq; + struct { struct vumeter_dec *dec; struct vumeter_enc *enc; @@ -449,7 +452,8 @@ void call_window_closed(struct call_window *win, const char *reason) if (reason && reason[0]) { re_snprintf(buf, sizeof buf, "closed: %s", reason); status = buf; - } else { + } + else { status = "closed"; } call_window_set_status(win, status); diff --git a/modules/gtk/transfer_dialog.c b/modules/gtk/transfer_dialog.c index 165c1c2..2bd199f 100644 --- a/modules/gtk/transfer_dialog.c +++ b/modules/gtk/transfer_dialog.c @@ -25,7 +25,8 @@ static void set_status(struct transfer_dialog *td, const char *status) gtk_widget_show(td->spinner); gtk_spinner_start(GTK_SPINNER(td->spinner)); gtk_label_set_text(td->status_label, NULL); - } else { + } + else { gtk_widget_hide(td->spinner); gtk_spinner_stop(GTK_SPINNER(td->spinner)); gtk_label_set_text(td->status_label, status); @@ -42,7 +43,8 @@ static void on_dialog_response(GtkDialog *dialog, gint response_id, uri = (char *)uri_combo_box_get_text(win->uri_combobox); set_status(win, status_progress); call_window_transfer(win->call_win, uri); - } else { + } + else { set_status(win, NULL); gtk_widget_hide(GTK_WIDGET(dialog)); } @@ -90,9 +92,10 @@ struct transfer_dialog *transfer_dialog_alloc(struct call_window *call_win) uri_combobox = uri_combo_box_new(); gtk_box_pack_start(GTK_BOX(content), uri_combobox, FALSE, FALSE, 5); - g_signal_connect(dialog, "response", G_CALLBACK(on_dialog_response), win); + g_signal_connect(dialog, "response", + G_CALLBACK(on_dialog_response), win); g_signal_connect(dialog, "delete-event", - G_CALLBACK(gtk_widget_hide_on_delete), win); + G_CALLBACK(gtk_widget_hide_on_delete), win); /* Spinner and status */ hbox = gtk_hbox_new(FALSE, 0); |