Merge branch 'main' into ccook/spelling-fixes

This commit is contained in:
Cam Cook 2022-11-27 06:30:04 -05:00
commit ccfe889ba9
2 changed files with 10 additions and 11 deletions

View File

@ -89,7 +89,7 @@ open_response_cb (GObject *source,
GFile *file;
GError *error = NULL;
file = gtk_file_dialog_save_finish (dialog, result, &error);
file = gtk_file_dialog_open_finish (dialog, result, &error);
if (file)
{
char *contents;
@ -99,15 +99,16 @@ open_response_cb (GObject *source,
create_window (app, contents);
g_free (contents);
}
else
{
GtkAlertDialog *alert;
}
alert = gtk_alert_dialog_new ("Error loading file: \"%s\"", error->message);
gtk_alert_dialog_show (alert, NULL);
g_object_unref (alert);
g_error_free (error);
}
if (error)
{
GtkAlertDialog *alert;
alert = gtk_alert_dialog_new ("Error loading file: \"%s\"", error->message);
gtk_alert_dialog_show (alert, NULL);
g_object_unref (alert);
g_error_free (error);
}
g_object_unref (app);

View File

@ -65,8 +65,6 @@ open_file (GtkButton *picker,
g_object_unref (dialog);
}
#define COLOR(r,g,b) { r/255., g/255., b/255., 1.0 }
GtkWidget *
do_pickers (GtkWidget *do_widget)
{