/dev/tomkiewicz/new-smileys: 02bb71f502fc: Some smiley fixes; we...

[Tomasz Wasilczyk]

Changeset: 02bb71f502fc9169b67b98a5271fc7a11ecb31f7
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-01 04:15 +0200
Branch:	 default
URL: https://hg.pidgin.im/dev/tomkiewicz/new-smileys/rev/02bb71f502fc

Description:

Some smiley fixes; we don't need none theme anymore

diffstat:

 configure.ac                              |   1 -
 pidgin/pixmaps/Makefile.am                |   3 +--
 pidgin/pixmaps/emotes/none/Makefile.am    |  17 -----------------
 pidgin/pixmaps/emotes/none/Makefile.mingw |  27 ---------------------------
 pidgin/pixmaps/emotes/none/none.theme.in  |   3 ---
 pidgin/plugins/perl/common/gtkmodule.h    |   1 -
 6 files changed, 1 insertions(+), 51 deletions(-)

diffs (101 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2914,7 +2914,6 @@ AC_CONFIG_FILES([Makefile
 		   pidgin/pidgin-3-uninstalled.pc
 		   pidgin/pixmaps/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
-		   pidgin/pixmaps/emotes/none/Makefile
 		   pidgin/pixmaps/emotes/small/16/Makefile
 		   pidgin/plugins/Makefile
 		   pidgin/plugins/cap/Makefile
diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am
+++ b/pidgin/pixmaps/Makefile.am
@@ -1,12 +1,11 @@
 pidginpixmapdir = $(datadir)/pixmaps/pidgin
 pidginiconsdir = $(datadir)
 
-SUBDIRS = emotes/default/24 emotes/none emotes/small/16
+SUBDIRS = emotes/default/24 emotes/small/16
 
 if INSTALL_PIXMAPS
 MAKEFILE_MINGW = \
 		emotes/default/24/Makefile.mingw \
-		emotes/none/Makefile.mingw \
 		emotes/small/16/Makefile.mingw
 
 ANIMATIONS_16 = \
diff --git a/pidgin/pixmaps/emotes/none/Makefile.am b/pidgin/pixmaps/emotes/none/Makefile.am
deleted file mode 100644
--- a/pidgin/pixmaps/emotes/none/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-pidginsmileypix_in_files = none.theme.in
-
-if INSTALL_PIXMAPS
-pidginsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/none
-pidginsmileypix_DATA = theme
-
-theme: none.theme.in
-	$(AM_V_GEN) sed -e 's/^_Name=/Name=/' \
-	    -e 's/^_Description=/Description=/' \
-	    -e 's/^_Author=/Author=/' \
-	$< > $@
-endif
-
-EXTRA_DIST = \
-	$(pidginsmileypix_in_files) \
-	Makefile.mingw \
-	theme
diff --git a/pidgin/pixmaps/emotes/none/Makefile.mingw b/pidgin/pixmaps/emotes/none/Makefile.mingw
deleted file mode 100644
--- a/pidgin/pixmaps/emotes/none/Makefile.mingw
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-PIDGIN_TREE_TOP := ../../../..
-include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-
-datadir = $(PIDGIN_INSTALL_DIR)
--include ./Makefile.am.mingw
-
-.PHONY: install clean
-
-install: ./Makefile.am.mingw theme
-	if test '$(pidginsmileypix_DATA)'; then \
-	  mkdir -p $(pidginsmileypixdir); \
-	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
-	fi;
-
-clean:
-	rm -f theme ./Makefile.am.mingw
-
-./Makefile.am.mingw: ./Makefile.am
-	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
-        include $@
-
diff --git a/pidgin/pixmaps/emotes/none/none.theme.in b/pidgin/pixmaps/emotes/none/none.theme.in
deleted file mode 100644
--- a/pidgin/pixmaps/emotes/none/none.theme.in
+++ /dev/null
@@ -1,3 +0,0 @@
-_Name=none
-_Description=Selecting this disables graphical emoticons.
-_Author=Penguin Pimps
diff --git a/pidgin/plugins/perl/common/gtkmodule.h b/pidgin/plugins/perl/common/gtkmodule.h
--- a/pidgin/plugins/perl/common/gtkmodule.h
+++ b/pidgin/plugins/perl/common/gtkmodule.h
@@ -43,7 +43,6 @@ typedef struct group *Pidgin__Group;
 #include "gtksession.h"
 #include "gtksound.h"
 #include "gtkstatusbox.h"
-#include "gtkthemes.h"
 #include "gtkutils.h"
 
 /* gtkaccount.h */