X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=panel-plugin%2Fxfce4-hdaps-dialogs.c;fp=panel-plugin%2Fxfce4-hdaps-dialogs.c;h=26f454e4aa146c104bdd80064acc34f673996322;hb=60ffd1d1b7266d9a030b2c864135ff444f0cb917;hp=bacd540e22ae00e6a027879e53a5ecf18b43ac04;hpb=9fb98b3d659e7f19e78a0a561c68e1152cadd3e1;p=xfce4-hdaps.git diff --git a/panel-plugin/xfce4-hdaps-dialogs.c b/panel-plugin/xfce4-hdaps-dialogs.c index bacd540..26f454e 100644 --- a/panel-plugin/xfce4-hdaps-dialogs.c +++ b/panel-plugin/xfce4-hdaps-dialogs.c @@ -48,15 +48,15 @@ static void hdaps_configure_response(GtkWidget *dialog, /* Launch the user's web browser and direct them to the plugin's webpage. */ gboolean spawn_result = g_spawn_command_line_async("exo-open --launch WebBrowser " PLUGIN_WEBSITE, NULL); - + if (G_UNLIKELY(spawn_result == FALSE)) { g_warning(_("Unable to open the following url: %s"), PLUGIN_WEBSITE); } - + return; } - + if (response == GTK_RESPONSE_OK) { /* This corresponds to the "Save" button, so we want to save any settings that may have changed. */ @@ -68,7 +68,7 @@ static void hdaps_configure_response(GtkWidget *dialog, hdaps_reset_timeout(hdaps); } - + /* Since there is already a "save" button, we should ignore any changes that were made if the user presses "cancel" instead. */ @@ -83,16 +83,16 @@ static void hdaps_configure_response(GtkWidget *dialog, void hdaps_configure(XfcePanelPlugin *plugin, HdapsPlugin *hdaps) { - + /* Here comes a bunch of GTK garbage to create the settings dialog. */ - + GtkWidget *dialog; GtkWidget *label; GtkWidget *vbox; GtkWidget *hbox; GtkSizeGroup *sg; - + /* Block the plugin menu while the configuration dialogue is open. Don't forget to unblock it before we close. */ @@ -121,12 +121,12 @@ void hdaps_configure(XfcePanelPlugin *plugin, g_signal_connect(G_OBJECT (dialog), "response", G_CALLBACK(hdaps_configure_response), hdaps); - + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, DEFAULT_BORDER_WIDTH); gtk_container_set_border_width(GTK_CONTAINER(vbox), DEFAULT_BORDER_WIDTH - 2); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0); - + /* Create size group to keep widgets aligned */ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -141,7 +141,7 @@ void hdaps_configure(XfcePanelPlugin *plugin, hdaps->sb_poll_frequency = gtk_spin_button_new_with_range(100, 5000, 100); gtk_spin_button_set_value((GtkSpinButton*)hdaps->sb_poll_frequency, hdaps->poll_frequency); - + gtk_box_pack_start(GTK_BOX(hbox), hdaps->sb_poll_frequency, FALSE, @@ -163,17 +163,17 @@ void hdaps_configure(XfcePanelPlugin *plugin, /* Add the current device name, it should always be available. Oh, and it should be the default, too. */ gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps->device_name); - + /* This function takes an index, and 0 should be the first (only) index at this point. */ gtk_combo_box_set_active((GtkComboBox*)hdaps->cb_device_name, 0); - + /* Now loop through the list of available devices, adding each to the list as we go. */ char hdaps_devices[MAX_HDAPS_DEVICES][FILENAME_MAX]; int found_devices = get_hdaps_device_list(hdaps_devices); int list_idx = 0; - + for (list_idx = 0; list_idx < found_devices; list_idx++) { /* We don't want to add duplicate entries to the combo box. However, at this point, the current device name should be @@ -183,9 +183,9 @@ void hdaps_configure(XfcePanelPlugin *plugin, gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps_devices[list_idx]); } } - + gtk_box_pack_start(GTK_BOX(hbox), hdaps->cb_device_name, FALSE, FALSE, 0); - + /* Show the dialog and all of its widgets. */ gtk_widget_show_all(dialog); }