Merge pull request #15 from soyersoyer/idfix

Flatpak fixes
tsmetana · Jan 28, 2024 · c52bc9f · c52bc9f
2 parents 82ef686 + 90b687e
commit c52bc9f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/...com.github.tsmetana.mpk3-settings.desktop → pkg/io.github.tsmetana.mpk3-settings.desktop b/...com.github.tsmetana.mpk3-settings.desktop → pkg/io.github.tsmetana.mpk3-settings.desktop
@@ -4,6 +4,6 @@ Version=1.0
 Name=MPK3 Settings
 Comment=AKAI MPK Mini MK3 settings
 Exec=mpk3-settings
-Icon=com.github.tsmetana.mpk3-settings
+Icon=io.github.tsmetana.mpk3-settings
 Terminal=false
 Categories=Settings;
diff --git a/...ithub.tsmetana.mpk3-settings.metainfo.xml → ...ithub.tsmetana.mpk3-settings.metainfo.xml b/...ithub.tsmetana.mpk3-settings.metainfo.xml → ...ithub.tsmetana.mpk3-settings.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-    <id>com.github.tsmetana.mpk3-settings</id>
-    <launchable type="desktop-id">com.github.tsmetana.mpk3-settings</launchable>
+    <id>io.github.tsmetana.mpk3-settings</id>
+    <launchable type="desktop-id">io.github.tsmetana.mpk3-settings.desktop</launchable>
     <name>MPK3 Settings</name>
     <summary>AKAI MPK Mini MK3 settings</summary>
     <description>
@@ -24,7 +24,7 @@
     <url type="bugtracker">https://github.com/tsmetana/mpk3-settings/issues</url>
     <screenshots>
         <screenshot type="default">
-            <image>https://github.com/tsmetana/mpk3-settings/raw/main/pkg/gui_screen_1.png</image>
+            <image>https://github.com/tsmetana/mpk3-settings/raw/master/pkg/gui_screen_1.png</image>
         </screenshot>
     </screenshots>
     <releases>

diff --git a/pkg/com.github.tsmetana.mpk3-settings.svg → pkg/io.github.tsmetana.mpk3-settings.svg b/pkg/com.github.tsmetana.mpk3-settings.svg → pkg/io.github.tsmetana.mpk3-settings.svg
diff --git a/src/app_win.c b/src/app_win.c
@@ -60,7 +60,7 @@ typedef enum _file_dialog_e file_dialog_t;
 
 static gchar *file_choose_dialog(GtkWidget *app_win, file_dialog_t dlg_type)
 {
-	GtkWidget *dialog;
+	GtkFileChooserNative *dialog;
 	GtkFileChooserAction action;
 	const gchar *title;
 	const gchar *btn_label;
@@ -77,8 +77,8 @@ static gchar *file_choose_dialog(GtkWidget *app_win, file_dialog_t dlg_type)
 		title = "Save File";
 		btn_label = "Save";
 	}
-	dialog = gtk_file_chooser_dialog_new(title, GTK_WINDOW(app_win), action,
-			"Cancel", GTK_RESPONSE_CANCEL, btn_label, GTK_RESPONSE_ACCEPT, NULL);
+	dialog = gtk_file_chooser_native_new(title, GTK_WINDOW(app_win), action,
+			btn_label, "Cancel");
 	if (dlg_type == FILE_SAVE_DIALOG)
 		gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE);
 	else
@@ -91,9 +91,9 @@ static gchar *file_choose_dialog(GtkWidget *app_win, file_dialog_t dlg_type)
 	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter_mpk);
 	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter_all);
 
-	if ((gtk_dialog_run(GTK_DIALOG (dialog))) == GTK_RESPONSE_ACCEPT)
+	if ((gtk_native_dialog_run(GTK_NATIVE_DIALOG(dialog))) == GTK_RESPONSE_ACCEPT)
 		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-	gtk_widget_destroy(dialog);
+	g_object_unref(dialog);
 
 	return filename;
 }

diff --git a/src/main.c b/src/main.c
@@ -46,7 +46,7 @@ int main(int argc, char ** argv)
 		show_error();
 		return -1;
 	}
-	app = gtk_application_new("com.github.tsmetana.mpk3-settings", G_APPLICATION_DEFAULT_FLAGS);
+	app = gtk_application_new("io.github.tsmetana.mpk3-settings", G_APPLICATION_DEFAULT_FLAGS);
 	g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);
 	status = g_application_run(G_APPLICATION(app), argc, argv);
 	g_object_unref(app);