X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=panel-plugin%2Fxfce4-hdaps-dialogs.c;h=5ac786051e2dfde205f0fc1b9b56e6a8ed8a2fb5;hb=e12029299b67c2f2391d12e0aa1b7ae2eb660b0f;hp=26f454e4aa146c104bdd80064acc34f673996322;hpb=60ffd1d1b7266d9a030b2c864135ff444f0cb917;p=xfce4-hdaps.git diff --git a/panel-plugin/xfce4-hdaps-dialogs.c b/panel-plugin/xfce4-hdaps-dialogs.c index 26f454e..5ac7860 100644 --- a/panel-plugin/xfce4-hdaps-dialogs.c +++ b/panel-plugin/xfce4-hdaps-dialogs.c @@ -41,13 +41,12 @@ static void hdaps_configure_response(GtkWidget *dialog, - gint response, - HdapsPlugin *hdaps) { + gint response, + HdapsPlugin *hdaps) { if (response == GTK_RESPONSE_HELP) { - /* 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); + /* Launch the user's web browser and direct them to the plugin webpage. */ + gboolean spawn_result = g_spawn_command_line_async("xdg-open " PLUGIN_WEBSITE, NULL); if (G_UNLIKELY(spawn_result == FALSE)) { g_warning(_("Unable to open the following url: %s"), PLUGIN_WEBSITE); @@ -63,7 +62,10 @@ static void hdaps_configure_response(GtkWidget *dialog, g_object_set_data(G_OBJECT(hdaps->plugin), "dialog", NULL); hdaps->poll_frequency = gtk_spin_button_get_value_as_int((GtkSpinButton*)hdaps->sb_poll_frequency); hdaps->device_name = gtk_combo_box_text_get_active_text((GtkComboBoxText*)hdaps->cb_device_name); - snprintf(hdaps->sysfs_file, FILENAME_MAX, UNLOAD_HEADS_FMT, hdaps->device_name); + snprintf(hdaps->sysfs_file, + FILENAME_MAX, + UNLOAD_HEADS_FMT, + hdaps->device_name); hdaps_save(hdaps->plugin, hdaps); hdaps_reset_timeout(hdaps); } @@ -82,7 +84,7 @@ static void hdaps_configure_response(GtkWidget *dialog, void hdaps_configure(XfcePanelPlugin *plugin, - HdapsPlugin *hdaps) { + HdapsPlugin *hdaps) { /* Here comes a bunch of GTK garbage to create the settings dialog. */ @@ -99,13 +101,14 @@ void hdaps_configure(XfcePanelPlugin *plugin, xfce_panel_plugin_block_menu(plugin); /* Create the dialog */ - dialog = xfce_titled_dialog_new_with_buttons(_("Hdaps Plugin"), - GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), - GTK_DIALOG_DESTROY_WITH_PARENT, - "gtk-help", GTK_RESPONSE_HELP, - "gtk-save", GTK_RESPONSE_OK, - "gtk-cancel", GTK_RESPONSE_CANCEL, - NULL); + dialog = xfce_titled_dialog_new_with_buttons( + _("Hdaps Plugin"), + GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(plugin))), + GTK_DIALOG_DESTROY_WITH_PARENT, + "gtk-help", GTK_RESPONSE_HELP, + "gtk-save", GTK_RESPONSE_OK, + "gtk-cancel", GTK_RESPONSE_CANCEL, + NULL); /* Center the dialog on screen. */ gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); @@ -119,13 +122,13 @@ void hdaps_configure(XfcePanelPlugin *plugin, /* Connect the reponse signal to the dialog. */ g_signal_connect(G_OBJECT (dialog), "response", - G_CALLBACK(hdaps_configure_response), hdaps); + 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); + vbox, TRUE, TRUE, 0); /* Create size group to keep widgets aligned */ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -140,13 +143,14 @@ void hdaps_configure(XfcePanelPlugin *plugin, gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); 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_spin_button_set_value((GtkSpinButton*)hdaps->sb_poll_frequency, + hdaps->poll_frequency); gtk_box_pack_start(GTK_BOX(hbox), - hdaps->sb_poll_frequency, - FALSE, - FALSE, - 0); + hdaps->sb_poll_frequency, + FALSE, + FALSE, + 0); /* Create the device name dropdown. */ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, DEFAULT_BORDER_WIDTH); @@ -162,7 +166,8 @@ 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); + 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. */ @@ -180,7 +185,8 @@ void hdaps_configure(XfcePanelPlugin *plugin, the only entry. Therefore, to avoid duplicates, we only have to avoid adding the current device name a second time. */ if (strcmp(hdaps_devices[list_idx], hdaps->device_name) != 0) { - gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps_devices[list_idx]); + gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, + hdaps_devices[list_idx]); } } @@ -195,43 +201,42 @@ void hdaps_configure(XfcePanelPlugin *plugin, /* URI (http(s):// and mailto://) handler used on the About dialog. */ static void hdaps_uri_handler(GtkAboutDialog *about, - const gchar *uri, - gpointer data) { - gchar *cmd; + const gchar *uri, + gpointer data) { - cmd = g_strdup_printf("%s %s","xdg-open", uri); + gchar *cmd = g_strdup_printf("%s %s","xdg-open", uri); + gboolean spawn_result = g_spawn_command_line_async(cmd, NULL); - if (!g_spawn_command_line_async(cmd, NULL)) { - g_free(cmd); - cmd = g_strdup_printf("%s %s","xdg-open", uri); - g_spawn_command_line_async(cmd, NULL); + if (G_UNLIKELY(spawn_result == FALSE)) { + g_warning(_("Unable to open the following uri: %s"), uri); } + g_free(cmd); } void hdaps_about(XfcePanelPlugin *plugin) { const gchar *authors[] = { "Michael Orlitzky ", NULL }; - const gchar *copyright = "Copyright \302\251 2012 Michael Orlitzky"; + const gchar *copyright = "Copyright \302\251 2019 Michael Orlitzky"; /* Use a custom URI handler for http(s):// and mailto:// URIs. The default behavior apparently needs gio/gvfs to work, and I don't have those installed. */ g_signal_connect(plugin, - "activate-link", - G_CALLBACK(hdaps_uri_handler), - NULL); + "activate-link", + G_CALLBACK(hdaps_uri_handler), + NULL); gtk_show_about_dialog(NULL, - "authors", authors, - "copyright", copyright, - "destroy-with-parent", TRUE, - "license", LICENSE_AGPL3, - "logo-icon-name", PACKAGE_NAME, - "icon-name", PACKAGE_NAME, - "program-name", PACKAGE_NAME, - "version", PACKAGE_VERSION, - "website", PLUGIN_WEBSITE, - "website-label", "xfce4-hdaps homepage", - NULL); + "authors", authors, + "copyright", copyright, + "destroy-with-parent", TRUE, + "license", LICENSE_AGPL3, + "logo-icon-name", PACKAGE_NAME, + "icon-name", PACKAGE_NAME, + "program-name", PACKAGE_NAME, + "version", PACKAGE_VERSION, + "website", PLUGIN_WEBSITE, + "website-label", "xfce4-hdaps homepage", + NULL); }