diff options
| author | Jens Georg <mail@jensge.org> | 2017-09-08 20:37:32 +0200 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2017-09-09 12:18:59 +0200 |
| commit | 4046b9854429a95d125212a3771fd1cb2424843f (patch) | |
| tree | 7bd3da3295bfa4dc375846876f82652a60fe9801 | |
| parent | 9e1e045fc82449f0c6af526fe7faa2a629fc191f (diff) | |
| download | gupnp-tools-4046b9854429a95d125212a3771fd1cb2424843f.tar.gz | |
universal-cp: Fix about icon
Move init_icons up and actually add the logo to the resources
| -rw-r--r-- | data/org.gupnp.Tools.Common.gresource.xml | 13 | ||||
| -rw-r--r-- | src/network-light/gui.c | 2 | ||||
| -rw-r--r-- | src/universal-cp/gui.c | 3 |
3 files changed, 13 insertions, 5 deletions
diff --git a/data/org.gupnp.Tools.Common.gresource.xml b/data/org.gupnp.Tools.Common.gresource.xml index 6849b66..1f42747 100644 --- a/data/org.gupnp.Tools.Common.gresource.xml +++ b/data/org.gupnp.Tools.Common.gresource.xml @@ -2,11 +2,16 @@ <gresources> <gresource prefix='/org/gupnp/Tools/Common'> <file>pixmaps/av-cp.png</file> + <file>pixmaps/media-renderer.png</file> + <file>pixmaps/network-light-22x22.png</file> + <file>pixmaps/network-light-256x256.png</file> + <file>pixmaps/network-light-off.png</file> + <file>pixmaps/network-light-on.png</file> + <file>pixmaps/universal-cp.png</file> + <file>pixmaps/upnp-action-arg-in.png</file> + <file>pixmaps/upnp-action-arg-out.png</file> <file>pixmaps/upnp-device.png</file> <file>pixmaps/upnp-service.png</file> <file>pixmaps/upnp-state-variable.png</file> - <file>pixmaps/upnp-action-arg-in.png</file> - <file>pixmaps/upnp-action-arg-out.png</file> - <file>pixmaps/media-renderer.png</file> - </gresource> + </gresource> </gresources> diff --git a/src/network-light/gui.c b/src/network-light/gui.c index bb5cc5d..7259801 100644 --- a/src/network-light/gui.c +++ b/src/network-light/gui.c @@ -218,6 +218,7 @@ init_ui (gint *argc, change_all = !exclusive; gtk_init (argc, argv); + init_icons (); builder = gtk_builder_new (); g_assert (builder != NULL); @@ -289,5 +290,6 @@ deinit_ui (void) gtk_widget_destroy (about_dialog); g_object_unref (on_pixbuf); g_object_unref (off_pixbuf); + deinit_icons (); } diff --git a/src/universal-cp/gui.c b/src/universal-cp/gui.c index d56ef9d..d307121 100644 --- a/src/universal-cp/gui.c +++ b/src/universal-cp/gui.c @@ -165,6 +165,8 @@ init_ui (gint *argc, window_height); + init_icons (); + icon_pixbuf = load_pixbuf_file (ICON_FILE); if (icon_pixbuf == NULL) { return FALSE; @@ -181,7 +183,6 @@ init_ui (gint *argc, gtk_builder_connect_signals (builder, NULL); - init_icons (); setup_treeviews (); init_action_dialog (builder); |