N0VA/BeamMeUp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[refactor] change app id to com.frac-tion.teleport"

Browse Source 
This reverts commit 33b9c9ac1a.
This commit is contained in:
Julian Sparber
2017-09-26 11:39:16 +02:00
parent 26d5bfb5c9
commit a54a19d69a
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/meson.build
View File

@@ -1,4 +1,4 @@
desktop = 'com.frac-tion.teleport.desktop' desktop = 'org.gtk.teleportapp.desktop'
i18n.merge_file( i18n.merge_file(
desktop, desktop,
@@ -24,7 +24,7 @@ i18n.merge_file(
#) #)
install_data( install_data(
'com.frac-tion.teleport.gschema.xml', 'org.gtk.teleportapp.gschema.xml',
install_dir: teleportapp_schemadir install_dir: teleportapp_schemadir
) )

2
data/com.frac-tion.teleport.dektop.in → data/org.gtk.teleportapp.desktop.in
View File

@@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Teleport Name=Teleport
Exec=teleportapp Exec=teleportapp
Icon=com.frac-tion.teleport Icon=org.gtk.teleportapp
Type=Application Type=Application
Categories=GTK;GNOME;Utility; Categories=GTK;GNOME;Utility;

2
data/com.frac-tion.teleport.gschema.xml → data/org.gtk.teleportapp.gschema.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<schemalist> <schemalist>
<schema path="/com/frac-tion/teleport/" id="com.frac-tion.teleport"> <schema path="/org/gtk/teleportapp/" id="org.gtk.teleportapp">
<key name="font" type="s"> <key name="font" type="s">
<default>'Monospace 12'</default> <default>'Monospace 12'</default>
<summary>Font</summary> <summary>Font</summary>

2
data/teleportapp.gresource.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<gresources> <gresources>
<gresource prefix="/com/frac-tion/teleport"> <gresource prefix="/org/gtk/teleportapp">
<file preprocess="xml-stripblanks">window.ui</file> <file preprocess="xml-stripblanks">window.ui</file>
<file preprocess="xml-stripblanks">settings.ui</file> <file preprocess="xml-stripblanks">settings.ui</file>
<file preprocess="xml-stripblanks">remote_list.ui</file> <file preprocess="xml-stripblanks">remote_list.ui</file>

2
src/teleportapp.c
View File

@@ -214,7 +214,7 @@ teleport_app_class_init (TeleportAppClass *class)
teleport_app_new (void) teleport_app_new (void)
{ {
return g_object_new (TELEPORT_APP_TYPE, return g_object_new (TELEPORT_APP_TYPE,
"application-id", "com.frac-tion.teleport", "application-id", "org.gtk.teleportapp",
"flags", G_APPLICATION_HANDLES_OPEN, "flags", G_APPLICATION_HANDLES_OPEN,
NULL); NULL);
} }

8
src/teleportappwin.c
View File

@@ -38,7 +38,7 @@ teleport_app_window_init (TeleportAppWindow *win)
gtk_widget_init_template (GTK_WIDGET (win)); gtk_widget_init_template (GTK_WIDGET (win));
builder = gtk_builder_new_from_resource ("/com/frac-tion/teleport/settings.ui"); builder = gtk_builder_new_from_resource ("/org/gtk/teleportapp/settings.ui");
menu = GTK_WIDGET (gtk_builder_get_object (builder, "settings")); menu = GTK_WIDGET (gtk_builder_get_object (builder, "settings"));
downloadDir = GTK_ENTRY (gtk_builder_get_object (builder, "settings_download_directory")); downloadDir = GTK_ENTRY (gtk_builder_get_object (builder, "settings_download_directory"));
@@ -60,7 +60,7 @@ open_file_picker(GtkButton *btn, Peer *device) {
gint res; gint res;
g_print("Open file chooser for submitting a file to %s with Address %s\n", device->name, device->ip); g_print("Open file chooser for submitting a file to %s with Address %s\n", device->name, device->ip);
dialog = ("Open File", dialog = gtk_file_chooser_dialog_new ("Open File",
GTK_WINDOW(mainWin), GTK_WINDOW(mainWin),
action, action,
("_Cancel"), ("_Cancel"),
@@ -96,7 +96,7 @@ void update_remote_device_list(TeleportAppWindow *win, Peer *device) {
priv = teleport_app_window_get_instance_private (win); priv = teleport_app_window_get_instance_private (win);
builder_remote_list = gtk_builder_new_from_resource ("/com/frac-tion/teleport/remote_list.ui"); builder_remote_list = gtk_builder_new_from_resource ("/org/gtk/teleportapp/remote_list.ui");
row = GTK_WIDGET (gtk_builder_get_object (builder_remote_list, "remote_device_row")); row = GTK_WIDGET (gtk_builder_get_object (builder_remote_list, "remote_device_row"));
name_label = GTK_LABEL (gtk_builder_get_object (builder_remote_list, "device_name")); name_label = GTK_LABEL (gtk_builder_get_object (builder_remote_list, "device_name"));
@@ -180,7 +180,7 @@ teleport_app_window_class_init (TeleportAppWindowClass *class)
G_OBJECT_CLASS (class)->dispose = teleport_app_window_dispose; G_OBJECT_CLASS (class)->dispose = teleport_app_window_dispose;
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class), gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/com/frac-tion/teleport/window.ui"); "/org/gtk/teleportapp/window.ui");
gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), TeleportAppWindow, gears); gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), TeleportAppWindow, gears);
gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), TeleportAppWindow, this_device_name_label); gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), TeleportAppWindow, this_device_name_label);