[polari] data: Rename icons



commit 6b55ac31bdd2c663fc4db1611291d4a627c8e5a4
Author: Florian Müllner <fmuellner gnome org>
Date:   Sat Feb 20 04:08:29 2016 +0100

    data: Rename icons
    
    In the xdg-app powered future, everything we export to the system
    (.desktop/.service files, icons, ...) should be prefixed by the
    application ID to prevent conflicts.

 data/icons/Makefile.am                             |   16 ++++++++--------
 .../apps/{polari.png => org.gnome.Polari.png}      |  Bin 798 -> 798 bytes
 .../apps/{polari.png => org.gnome.Polari.png}      |  Bin 1114 -> 1114 bytes
 .../apps/{polari.png => org.gnome.Polari.png}      |  Bin 1133 -> 1133 bytes
 .../apps/{polari.png => org.gnome.Polari.png}      |  Bin 23767 -> 23767 bytes
 .../apps/{polari.png => org.gnome.Polari.png}      |  Bin 1816 -> 1816 bytes
 .../apps/{polari.png => org.gnome.Polari.png}      |  Bin 2473 -> 2473 bytes
 .../apps/{polari.png => org.gnome.Polari.png}      |  Bin 64258 -> 64258 bytes
 ...-symbolic.svg => org.gnome.Polari-symbolic.svg} |    0
 data/org.gnome.Polari.desktop.in                   |    2 +-
 data/resources/main-window.ui                      |    2 +-
 src/application.js                                 |    2 +-
 src/roomStack.js                                   |    2 +-
 13 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 1102355..23fc73e 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -5,14 +5,14 @@ public_icons_themes = \
 icondir = $(datadir)/icons/
 
 nobase_dist_icon_DATA = \
-       hicolor/16x16/apps/polari.png \
-       hicolor/22x22/apps/polari.png \
-       hicolor/24x24/apps/polari.png \
-       hicolor/32x32/apps/polari.png \
-       hicolor/48x48/apps/polari.png \
-       hicolor/256x256/apps/polari.png \
-       hicolor/512x512/apps/polari.png \
-       hicolor/scalable/apps/polari-symbolic.svg \
+       hicolor/16x16/apps/org.gnome.Polari.png \
+       hicolor/22x22/apps/org.gnome.Polari.png \
+       hicolor/24x24/apps/org.gnome.Polari.png \
+       hicolor/32x32/apps/org.gnome.Polari.png \
+       hicolor/48x48/apps/org.gnome.Polari.png \
+       hicolor/256x256/apps/org.gnome.Polari.png \
+       hicolor/512x512/apps/org.gnome.Polari.png \
+       hicolor/scalable/apps/org.gnome.Polari-symbolic.svg \
        $(NULL)
 
 noinst_DATA = \
diff --git a/data/icons/hicolor/scalable/apps/polari-symbolic.svg 
b/data/icons/hicolor/scalable/apps/org.gnome.Polari-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/polari-symbolic.svg
rename to data/icons/hicolor/scalable/apps/org.gnome.Polari-symbolic.svg
diff --git a/data/org.gnome.Polari.desktop.in b/data/org.gnome.Polari.desktop.in
index b505911..b8fce56 100644
--- a/data/org.gnome.Polari.desktop.in
+++ b/data/org.gnome.Polari.desktop.in
@@ -2,7 +2,7 @@
 _Name=Polari
 _Comment=An Internet Relay Chat Client for GNOME
 Exec=gapplication launch org.gnome.Polari
-Icon=polari
+Icon=org.gnome.Polari
 Type=Application
 StartupNotify=true
 DBusActivatable=true
diff --git a/data/resources/main-window.ui b/data/resources/main-window.ui
index 01dcccd..900f94b 100644
--- a/data/resources/main-window.ui
+++ b/data/resources/main-window.ui
@@ -11,7 +11,7 @@
   </object>
   <template class="Gjs_MainWindow">
     <property name="title" translatable="yes">Polari</property>
-    <property name="icon-name">polari</property>
+    <property name="icon-name">org.gnome.Polari</property>
     <property name="show-menubar">false</property>
     <child type="titlebar">
       <object class="GtkBox">
diff --git a/src/application.js b/src/application.js
index 13fa603..2cb8fcb 100644
--- a/src/application.js
+++ b/src/application.js
@@ -464,7 +464,7 @@ const Application = new Lang.Class({
             comments: _("An Internet Relay Chat Client for GNOME"),
             copyright: 'Copyright © 2013-2015 The Polari authors',
             license_type: Gtk.License.GPL_2_0,
-            logo_icon_name: 'polari',
+            logo_icon_name: 'org.gnome.Polari',
             version: pkg.version,
             website_label: _("Learn more about Polari"),
             website: 'https://wiki.gnome.org/Apps/Polari',
diff --git a/src/roomStack.js b/src/roomStack.js
index 5a49f5e..05b2d38 100644
--- a/src/roomStack.js
+++ b/src/roomStack.js
@@ -85,7 +85,7 @@ const ChatPlaceholder = new Lang.Class({
     _init: function(sizeGroup) {
         this._accountsMonitor = AccountsMonitor.getDefault();
 
-        let image = new Gtk.Image({ icon_name: 'polari-symbolic',
+        let image = new Gtk.Image({ icon_name: 'org.gnome.Polari-symbolic',
                                       pixel_size: 96, halign: Gtk.Align.END,
                                       margin_end: 14 });
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]