commit a33950ee5629586f631e63dceb984346d8702b85
parent 04865c9e12b9d5ab3507936c554de605c79dc353
Author: TheJackiMonster <thejackimonster@gmail.com>
Date: Fri, 24 Dec 2021 00:18:34 +0100
Updated desktop file and app id
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
Diffstat:
7 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,4 +1,6 @@
+APP_ID = org.gnunet.Messenger
+
RESOURCES_DIR = resources/
SOURCE_DIR = src/
INSTALL_DIR ?= /usr/local/
@@ -96,24 +98,26 @@ mobile: $(BINARY)
.PHONY: install
define install-icon
- install -Dm644 $(addprefix $(APPICON_DIR), full_color_$(1).png) $(addprefix $(INSTALL_DIR), share/icons/hicolor/$(1)x$(1)/apps/$(BINARY).png)
+ install -Dm644 $(addprefix $(APPICON_DIR), full_color_$(1).png) $(addprefix $(INSTALL_DIR), share/icons/hicolor/$(1)x$(1)/apps/$(APP_ID).png)
endef
install:
install -Dm755 $(BINARY) $(addprefix $(INSTALL_DIR), bin/)
$(foreach SIZE,$(ICON_SIZES),$(call install-icon,$(SIZE));)
- install -Dm644 $(addprefix $(RESOURCES_DIR), $(BINARY).desktop) $(addprefix $(INSTALL_DIR), share/applications/)
+ install -Dm644 $(addprefix $(APPICON_DIR), full_color.svg) $(addprefix $(INSTALL_DIR), share/icons/hicolor/scalable/apps/$(APP_ID).svg)
+ desktop-file-install --dir=$(addprefix $(INSTALL_DIR), share/applications/) $(addprefix $(RESOURCES_DIR), $(APP_ID).desktop)
.PHONY: uninstall
define uninstall-icon
- $(GNU_RM) -f $(addprefix $(INSTALL_DIR), share/icons/hicolor/$(1)x$(1)/apps/$(BINARY).png)
+ $(GNU_RM) -f $(addprefix $(INSTALL_DIR), share/icons/hicolor/$(1)x$(1)/apps/$(APP_ID).png)
endef
uninstall:
$(GNU_RM) -f $(addsuffix $(BINARY), $(addprefix $(INSTALL_DIR), bin/))
- $(foreach SIZE,$(ICON_SIZES),$(call uninstall-icon,$(SIZE)))
- $(GNU_RM) -f $(addsuffix $(BINARY).desktop, $(addprefix $(INSTALL_DIR), share/applications/))
+ $(foreach SIZE,$(ICON_SIZES),$(call uninstall-icon,$(SIZE));)
+ $(GNU_RM) -f $(addprefix $(INSTALL_DIR), share/icons/hicolor/scalable/apps/$(APP_ID).svg)
+ $(GNU_RM) -f $(addsuffix $(APP_ID).desktop, $(addprefix $(INSTALL_DIR), share/applications/))
.PHONY: clean
diff --git a/resources/css.gresource.xml b/resources/css.gresource.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
- <gresource prefix="/org/gnunet/Messenger-GTK">
+ <gresource prefix="/org/gnunet/Messenger">
<file>css/style.css</file>
</gresource>
</gresources>
\ No newline at end of file
diff --git a/resources/messenger-gtk.desktop b/resources/messenger-gtk.desktop
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=0.0.1
-Name=Messenger-GTK
-Comment=A GTK based GUI for the Messenger service of GNUnet.
-TryExec=messenger-gtk
-Exec=messenger-gtk
-Icon=messenger-gtk
-Terminal=false
-StartupWMClass=MessengerGTK
-Type=Application
-Categories=Chat;Network;InstantMessaging;GTK;FileSharing;
-MimeType=x-scheme-handler/messenger-gtk;
-Keywords=messenger-gtk;chat;im;messaging;messenger;gtk;
-X-GNOME-UsesNotifications=true
diff --git a/resources/org.gnunet.Messenger.desktop b/resources/org.gnunet.Messenger.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=Messenger-GTK
+Comment=A GTK based GUI for the Messenger service of GNUnet.
+TryExec=messenger-gtk
+Exec=messenger-gtk
+Icon=org.gnunet.Messenger
+Terminal=false
+StartupWMClass=MessengerGTK
+Type=Application
+Categories=Chat;Network;InstantMessaging;GTK;
+MimeType=x-scheme-handler/org.gnunet.Messenger;
+Keywords=messenger-gtk;chat;im;messaging;messenger;gtk;org.gnunet.Messenger;
+X-GNOME-UsesNotifications=true
+X-Purism-FormFactor=Workstation;Mobile;
+\ No newline at end of file
diff --git a/resources/ui.gresource.xml b/resources/ui.gresource.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
- <gresource prefix="/org/gnunet/Messenger-GTK">
+ <gresource prefix="/org/gnunet/Messenger">
<file compressed="true">ui/chat_entry.ui</file>
<file compressed="true">ui/chat.ui</file>
<file compressed="true">ui/contacts.ui</file>
diff --git a/resources/ui/messenger.ui b/resources/ui/messenger.ui
@@ -25,6 +25,8 @@ Author: Tobias Frisch
<requires lib="libhandy" version="1.2"/>
<object class="GtkApplicationWindow" id="main_window">
<property name="can-focus">False</property>
+ <property name="icon-name">org.gnunet.Messenger</property>
+ <property name="startup-id">org.gnunet.Messenger</property>
<child>
<object class="HdyLeaflet" id="leaflet_chat">
<property name="visible">True</property>
diff --git a/src/application.c b/src/application.c
@@ -26,14 +26,14 @@
#include "resources.h"
static void
-_load_ui_stylesheets(void)
+_load_ui_stylesheets(MESSENGER_Application *app)
{
GdkScreen* screen = gdk_screen_get_default();
GtkCssProvider* provider = gtk_css_provider_new();
gtk_css_provider_load_from_resource(
provider,
- "org/gnunet/Messenger-GTK/css/style.css"
+ application_get_resource_path(app, "css/style.css")
);
gtk_style_context_add_provider_for_screen(
@@ -66,7 +66,7 @@ application_init(MESSENGER_Application *app,
hdy_init();
app->application = gtk_application_new(
- "org.gnunet.Messenger-GTK",
+ "org.gnunet.Messenger",
G_APPLICATION_NON_UNIQUE
);
@@ -75,7 +75,7 @@ application_init(MESSENGER_Application *app,
notify_init("Messenger-GTK");
app->notifications = NULL;
- _load_ui_stylesheets();
+ _load_ui_stylesheets(app);
app->chat.status = EXIT_FAILURE;
app->chat.tid = 0;
