diff options
author | Arx Cruz <arxcruz@redhat.com> | 2017-04-07 14:00:42 +0200 |
---|---|---|
committer | Arx Cruz <arxcruz@redhat.com> | 2017-04-07 14:00:42 +0200 |
commit | 4eddb202cafdcabc254aa941ad1348ff09372627 (patch) | |
tree | 693615e41338546f87d791fbc1cbe9a47738e7e6 /src/password.c | |
parent | Adding clang-format script (diff) | |
download | zenity-4eddb202cafdcabc254aa941ad1348ff09372627.tar.gz zenity-4eddb202cafdcabc254aa941ad1348ff09372627.tar.bz2 zenity-4eddb202cafdcabc254aa941ad1348ff09372627.zip |
Fix style
Fixing style in all zenity code, removing useless spaces,
empty lines, all code in 80 columns, etc.
Diffstat (limited to 'src/password.c')
-rw-r--r-- | src/password.c | 298 |
1 files changed, 141 insertions, 157 deletions
diff --git a/src/password.c b/src/password.c index d8f492f6..44a2a204 100644 --- a/src/password.c +++ b/src/password.c @@ -22,168 +22,152 @@ */ #include "config.h" -#include <string.h> -#include "zenity.h" #include "util.h" +#include "zenity.h" +#include <string.h> static ZenityData *zen_data; -static void zenity_password_dialog_response (GtkWidget *widget, int response, gpointer data); - -void zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data) -{ - GtkWidget *dialog; - GtkWidget *image; - GtkWidget *hbox; - GtkWidget *vbox_labels; - GtkWidget *vbox_entries; - GtkWidget *label; - - zen_data = data; - - dialog = gtk_dialog_new (); - - if (data->extra_label) { - gint i=0; - while(data->extra_label[i]!=NULL){ - gtk_dialog_add_button (GTK_DIALOG (dialog), data->extra_label[i], i); - i++; - } - } - - gtk_dialog_add_button(GTK_DIALOG(dialog), - data->cancel_label != NULL ? data->cancel_label : _("_Cancel"), - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button(GTK_DIALOG(dialog), - data->ok_label != NULL ? data->ok_label : _("_OK"), - GTK_RESPONSE_OK); - - image = gtk_image_new_from_icon_name("dialog-password", - GTK_ICON_SIZE_DIALOG); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), - GTK_RESPONSE_OK); - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5); - gtk_box_pack_start(GTK_BOX(hbox), - image, - FALSE, - FALSE, - 12); - - /* Checks if username has been passed as a parameter */ - gchar *title_text = N_("Type your password"); - - if(password_data->username) - title_text = N_("Type your username and password"); - - label = gtk_label_new(title_text); - - gtk_box_pack_start(GTK_BOX(hbox), - label, - FALSE, - FALSE, - 12); - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), - hbox, - FALSE, - TRUE, - 5); - - vbox_labels = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5); - vbox_entries = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5); - - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5); - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), - hbox, - FALSE, - TRUE, - 5); - - gtk_box_pack_start(GTK_BOX(hbox), - vbox_labels, - FALSE, - TRUE, - 12); - gtk_box_pack_start(GTK_BOX(hbox), - vbox_entries, - TRUE, - TRUE, - 12); - - if(password_data->username) { - label = gtk_label_new(_("Username:")); - gtk_box_pack_start(GTK_BOX(vbox_labels), - label, - TRUE, - FALSE, - 12); - password_data->entry_username = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(vbox_entries), - password_data->entry_username, - TRUE, - TRUE, - 12); - } - - label = gtk_label_new(_("Password:")); - gtk_box_pack_start(GTK_BOX(vbox_labels), - label, - TRUE, - FALSE, - 12); - password_data->entry_password = gtk_entry_new(); - gtk_entry_set_visibility(GTK_ENTRY(password_data->entry_password), - FALSE); - gtk_entry_set_activates_default (GTK_ENTRY(password_data->entry_password), - TRUE); - gtk_box_pack_start(GTK_BOX(vbox_entries), - password_data->entry_password, - TRUE, - TRUE, - 12); - - if (data->dialog_title) - gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title); - - if (data->modal) - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - - g_signal_connect (G_OBJECT (dialog), "response", - G_CALLBACK (zenity_password_dialog_response), - password_data); - gtk_widget_show_all(GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dialog)))); - zenity_util_show_dialog (dialog, data->attach); - - if (data->timeout_delay > 0) { - g_timeout_add_seconds (data->timeout_delay, - (GSourceFunc) zenity_util_timeout_handle, - dialog); - } - gtk_main(); +static void zenity_password_dialog_response ( + GtkWidget *widget, int response, gpointer data); + +void +zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data) { + GtkWidget *dialog; + GtkWidget *image; + GtkWidget *hbox; + GtkWidget *vbox_labels; + GtkWidget *vbox_entries; + GtkWidget *label; + + zen_data = data; + + dialog = gtk_dialog_new (); + + if (data->extra_label) { + gint i = 0; + while (data->extra_label[i] != NULL) { + gtk_dialog_add_button ( + GTK_DIALOG (dialog), data->extra_label[i], i); + i++; + } + } + + gtk_dialog_add_button (GTK_DIALOG (dialog), + data->cancel_label != NULL ? data->cancel_label : _ ("_Cancel"), + GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (GTK_DIALOG (dialog), + data->ok_label != NULL ? data->ok_label : _ ("_OK"), + GTK_RESPONSE_OK); + + image = + gtk_image_new_from_icon_name ("dialog-password", GTK_ICON_SIZE_DIALOG); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 12); + + /* Checks if username has been passed as a parameter */ + gchar *title_text = N_ ("Type your password"); + + if (password_data->username) + title_text = N_ ("Type your username and password"); + + label = gtk_label_new (title_text); + + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 12); + gtk_box_pack_start ( + GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, + FALSE, + TRUE, + 5); + + vbox_labels = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); + vbox_entries = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); + + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_pack_start ( + GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, + FALSE, + TRUE, + 5); + + gtk_box_pack_start (GTK_BOX (hbox), vbox_labels, FALSE, TRUE, 12); + gtk_box_pack_start (GTK_BOX (hbox), vbox_entries, TRUE, TRUE, 12); + + if (password_data->username) { + label = gtk_label_new (_ ("Username:")); + gtk_box_pack_start (GTK_BOX (vbox_labels), label, TRUE, FALSE, 12); + password_data->entry_username = gtk_entry_new (); + gtk_box_pack_start (GTK_BOX (vbox_entries), + password_data->entry_username, + TRUE, + TRUE, + 12); + } + + label = gtk_label_new (_ ("Password:")); + gtk_box_pack_start (GTK_BOX (vbox_labels), label, TRUE, FALSE, 12); + password_data->entry_password = gtk_entry_new (); + gtk_entry_set_visibility (GTK_ENTRY (password_data->entry_password), FALSE); + gtk_entry_set_activates_default ( + GTK_ENTRY (password_data->entry_password), TRUE); + gtk_box_pack_start ( + GTK_BOX (vbox_entries), password_data->entry_password, TRUE, TRUE, 12); + + if (data->dialog_title) + gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title); + + if (data->modal) + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + + g_signal_connect (G_OBJECT (dialog), + "response", + G_CALLBACK (zenity_password_dialog_response), + password_data); + gtk_widget_show_all ( + GTK_WIDGET (gtk_dialog_get_content_area (GTK_DIALOG (dialog)))); + zenity_util_show_dialog (dialog, data->attach); + + if (data->timeout_delay > 0) { + g_timeout_add_seconds (data->timeout_delay, + (GSourceFunc) zenity_util_timeout_handle, + dialog); + } + gtk_main (); } static void -zenity_password_dialog_response (GtkWidget *widget, int response, gpointer data) -{ - ZenityPasswordData *password_data = (ZenityPasswordData *) data; - switch (response) { - case GTK_RESPONSE_OK: - zenity_util_exit_code_with_data(ZENITY_OK, zen_data); - if (password_data->username) - g_print("%s|%s\n", gtk_entry_get_text (GTK_ENTRY(password_data->entry_username)), gtk_entry_get_text (GTK_ENTRY(password_data->entry_password))); - else - g_print ("%s\n", gtk_entry_get_text (GTK_ENTRY(password_data->entry_password))); - break; - - case GTK_RESPONSE_CANCEL: - zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL); - break; - - default: - if (zen_data->extra_label && response < g_strv_length(zen_data->extra_label)) - printf("%s\n",zen_data->extra_label[response]); - zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC); - break; - } - - gtk_main_quit (); +zenity_password_dialog_response ( + GtkWidget *widget, int response, gpointer data) { + ZenityPasswordData *password_data = (ZenityPasswordData *) data; + switch (response) { + case GTK_RESPONSE_OK: + zenity_util_exit_code_with_data (ZENITY_OK, zen_data); + if (password_data->username) + g_print ("%s|%s\n", + gtk_entry_get_text ( + GTK_ENTRY (password_data->entry_username)), + gtk_entry_get_text ( + GTK_ENTRY (password_data->entry_password))); + else + g_print ("%s\n", + gtk_entry_get_text ( + GTK_ENTRY (password_data->entry_password))); + break; + + case GTK_RESPONSE_CANCEL: + zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL); + break; + + default: + if (zen_data->extra_label && + response < g_strv_length (zen_data->extra_label)) + printf ("%s\n", zen_data->extra_label[response]); + zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC); + break; + } + + gtk_main_quit (); } |