From b99ca6c484e6dca2474b6243251698faffd3d543 Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Mon, 1 Mar 2010 17:10:47 +0100
Subject: icons repackaging

---
 src/Applet/Makefile.am | 2 +-
 src/Gui/Makefile.am    | 2 +-
 src/Gui/ccgui.glade    | 6 +++---
 src/Gui/settings.glade | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am
index 900ec01..3084462 100644
--- a/src/Applet/Makefile.am
+++ b/src/Applet/Makefile.am
@@ -15,7 +15,7 @@ abrt_applet_CPPFLAGS = \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
-    -DICON_DIR=\"${datadir}/icons/hicolor/48x48/apps\" \
+    -DICON_DIR=\"${datadir}/abrt/icons/hicolor/48x48/status\" \
     $(GTK_CFLAGS) \
     $(DBUS_CFLAGS) \
     -D_GNU_SOURCE
diff --git a/src/Gui/Makefile.am b/src/Gui/Makefile.am
index 3cac1ee..04f1292 100644
--- a/src/Gui/Makefile.am
+++ b/src/Gui/Makefile.am
@@ -17,7 +17,7 @@ applicationsdir = $(datadir)/applications
 applications_DATA = abrt.desktop
 pkgdata_PYTHON = $(PYTHON_FILES)
 pkgdata_DATA = $(GLADE_FILES)
-pixmapdir = $(datadir)/pixmaps
+pixmapdir = $(datadir)/icons/hicolor/48x48/apps/
 pixmap_DATA = abrt.png
 
 CLEANFILES := $(notdir $(wildcard *~)) $(notdir $(wildcard *\#)) $(notdir $(wildcard \.\#*)) $(notdir $(wildcard *.pyc))
diff --git a/src/Gui/ccgui.glade b/src/Gui/ccgui.glade
index 3050d65..2291ee6 100644
--- a/src/Gui/ccgui.glade
+++ b/src/Gui/ccgui.glade
@@ -9,7 +9,7 @@
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">470</property>
-    <property name="icon">/usr/share/pixmaps/abrt.png</property>
+    <property name="icon_name">abrt</property>
     <property name="transient_for">main_window3</property>
     <child>
       <widget class="GtkVBox" id="vbox1">
@@ -77,7 +77,7 @@
     <property name="title" translatable="yes">About ABRT</property>
     <property name="resizable">False</property>
     <property name="window_position">center-on-parent</property>
-    <property name="icon">/usr/share/pixmaps/abrt.png</property>
+    <property name="icon_name">abrt</property>
     <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <property name="program_name">ABRT</property>
@@ -122,7 +122,7 @@ Patrick Connelly &lt;pcon@fedoraproject.org&gt;</property>
   <widget class="GtkWindow" id="main_window3">
     <property name="title" translatable="yes">Automatic Bug Reporting Tool</property>
     <property name="window_position">center</property>
-    <property name="icon">/usr/share/pixmaps/abrt.png</property>
+    <property name="icon_name">abrt</property>
     <child>
       <widget class="GtkVBox" id="vbox4">
         <property name="visible">True</property>
diff --git a/src/Gui/settings.glade b/src/Gui/settings.glade
index a9a14f4..41a0749 100644
--- a/src/Gui/settings.glade
+++ b/src/Gui/settings.glade
@@ -8,7 +8,7 @@
     <property name="window_position">center-on-parent</property>
     <property name="default_width">450</property>
     <property name="default_height">400</property>
-    <property name="icon">/usr/share/pixmaps/abrt.png</property>
+    <property name="icon_name">abrt</property>
     <child>
       <object class="GtkVBox" id="vboxabc1">
         <property name="visible">True</property>
@@ -260,7 +260,7 @@
     <property name="window_position">center-on-parent</property>
     <property name="default_width">450</property>
     <property name="default_height">400</property>
-    <property name="icon">/usr/share/pixmaps/abrt.png</property>
+    <property name="icon_name">abrt</property>
     <child>
       <object class="GtkVBox" id="gsvbox1">
         <property name="visible">True</property>
@@ -755,7 +755,7 @@
     <property name="window_position">center-on-parent</property>
     <property name="default_width">400</property>
     <property name="default_height">400</property>
-    <property name="icon">/usr/share/pixmaps/abrt.png</property>
+    <property name="icon_name">abrt</property>
     <property name="transient_for">wGlobalSettings</property>
     <child>
       <object class="GtkVBox" id="gpgkeys_vbox">
-- 
cgit