summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--capplets/default-applications/Makefile.am2
-rw-r--r--capplets/default-applications/icons/16x16/categories/instant-messaging.pngbin0 -> 961 bytes
-rw-r--r--capplets/default-applications/icons/22x22/categories/instant-messaging.pngbin0 -> 1205 bytes
-rw-r--r--capplets/default-applications/icons/24x24/categories/instant-messaging.pngbin0 -> 1206 bytes
-rw-r--r--capplets/default-applications/icons/256x256/categories/instant-messaging.pngbin0 -> 51368 bytes
-rw-r--r--capplets/default-applications/icons/32x32/categories/instant-messaging.pngbin0 -> 2233 bytes
-rw-r--r--capplets/default-applications/icons/48x48/categories/instant-messaging.pngbin0 -> 3753 bytes
-rw-r--r--capplets/default-applications/icons/Makefile.am24
-rw-r--r--capplets/default-applications/mate-da-capplet.c2
-rw-r--r--configure.ac1
10 files changed, 28 insertions, 1 deletions
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index 5a5e2e41..a422d765 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
# This is used in MATECC_CAPPLETS_CFLAGS
cappletname = mate-default-applications-properties
diff --git a/capplets/default-applications/icons/16x16/categories/instant-messaging.png b/capplets/default-applications/icons/16x16/categories/instant-messaging.png
new file mode 100644
index 00000000..97f38196
--- /dev/null
+++ b/capplets/default-applications/icons/16x16/categories/instant-messaging.png
Binary files differ
diff --git a/capplets/default-applications/icons/22x22/categories/instant-messaging.png b/capplets/default-applications/icons/22x22/categories/instant-messaging.png
new file mode 100644
index 00000000..a10bf8f0
--- /dev/null
+++ b/capplets/default-applications/icons/22x22/categories/instant-messaging.png
Binary files differ
diff --git a/capplets/default-applications/icons/24x24/categories/instant-messaging.png b/capplets/default-applications/icons/24x24/categories/instant-messaging.png
new file mode 100644
index 00000000..6906fc02
--- /dev/null
+++ b/capplets/default-applications/icons/24x24/categories/instant-messaging.png
Binary files differ
diff --git a/capplets/default-applications/icons/256x256/categories/instant-messaging.png b/capplets/default-applications/icons/256x256/categories/instant-messaging.png
new file mode 100644
index 00000000..315b3f21
--- /dev/null
+++ b/capplets/default-applications/icons/256x256/categories/instant-messaging.png
Binary files differ
diff --git a/capplets/default-applications/icons/32x32/categories/instant-messaging.png b/capplets/default-applications/icons/32x32/categories/instant-messaging.png
new file mode 100644
index 00000000..d721bb3e
--- /dev/null
+++ b/capplets/default-applications/icons/32x32/categories/instant-messaging.png
Binary files differ
diff --git a/capplets/default-applications/icons/48x48/categories/instant-messaging.png b/capplets/default-applications/icons/48x48/categories/instant-messaging.png
new file mode 100644
index 00000000..37e1834d
--- /dev/null
+++ b/capplets/default-applications/icons/48x48/categories/instant-messaging.png
Binary files differ
diff --git a/capplets/default-applications/icons/Makefile.am b/capplets/default-applications/icons/Makefile.am
new file mode 100644
index 00000000..10b12e63
--- /dev/null
+++ b/capplets/default-applications/icons/Makefile.am
@@ -0,0 +1,24 @@
+iconsdir = $(datadir)/icons/hicolor
+
+nobase_dist_icons_DATA = \
+ 16x16/categories/instant-messaging.png \
+ 22x22/categories/instant-messaging.png \
+ 24x24/categories/instant-messaging.png \
+ 32x32/categories/instant-messaging.png \
+ 48x48/categories/instant-messaging.png \
+ 256x256/categories/instant-messaging.png
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. After install, run this:"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ fi
+
+-include $(top_srcdir)/git.mk
diff --git a/capplets/default-applications/mate-da-capplet.c b/capplets/default-applications/mate-da-capplet.c
index 20c52ced..e29b23c8 100644
--- a/capplets/default-applications/mate-da-capplet.c
+++ b/capplets/default-applications/mate-da-capplet.c
@@ -340,7 +340,7 @@ static struct {
{"media_player_image", "audio-x-generic"},
{"visual_image", "zoom-best-fit"},
{"mobility_image", "preferences-desktop-accessibility"},
- {"messenger_image", "user-idle"},
+ {"messenger_image", "instant-messaging"},
{"filemanager_image", "file-manager"},
{"imageviewer_image", "image-x-generic"},
{"video_image", "video-x-generic"},
diff --git a/configure.ac b/configure.ac
index 4e9f67ef..858b1e16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,6 +300,7 @@ capplets/appearance/data/Makefile
capplets/common/Makefile
capplets/default-applications/Makefile
capplets/default-applications/mate-default-applications.pc
+capplets/default-applications/icons/Makefile
capplets/display/Makefile
capplets/keybindings/Makefile
capplets/keybindings/mate-keybindings.pc