Revision 04ba35fa8d329867d15b2d511189adbdf4a1947c

[rlaager at pidgin.im]

o   -----------------------------------------------------------------
|   Revision: 04ba35fa8d329867d15b2d511189adbdf4a1947c
|   Ancestor: ec4a0a723847537c378e5a1d194a94363fdcb68c
|   Author: rlaager at pidgin.im
|   Date: 2007-03-21T08:56:23
|   Branch: im.pidgin.pidgin
|   
|   Modified files:
|           pidgin/pidginstock.c pidgin/pixmaps/Makefile.am
|   
|   ChangeLog: 
|   
|   Install pixmaps to the right directories and make them load properly.
|   
|   ============================================================
|   --- pidgin/pidginstock.c	116dbc38c889093882c9f76e7d5f210f6641be48
|   +++ pidgin/pidginstock.c	608cfbcd23e991a906eeeaae4eaea068388bad17
|   @@ -1,10 +1,10 @@
|    /**
|   - * @file purplestock.c GTK+ Stock resources
|   + * @file pidginstock.c GTK+ Stock resources
|     * @ingroup gtkui
|     *
|   - * purple
|   + * pidgin
|     *
|   - * Purple is the legal property of its developers, whose names are too numerous
|   + * Pidgin is the legal property of its developers, whose names are too numerous
|     * to list here.  Please refer to the COPYRIGHT file distributed with this
|     * source distribution.
|     *
|   @@ -81,7 +81,7 @@ static struct StockIcon
|    	{ PIDGIN_STOCK_OPEN_MAIL,       NULL,      GTK_STOCK_JUMP_TO          },
|    	{ PIDGIN_STOCK_SIGN_ON,         NULL,      GTK_STOCK_EXECUTE          },
|    	{ PIDGIN_STOCK_SIGN_OFF,        NULL,      GTK_STOCK_CLOSE            },
|   -	{ PIDGIN_STOCK_TYPED,           "purple",    "typed.png"                },
|   +	{ PIDGIN_STOCK_TYPED,           "pidgin",  "typed.png"                },
|    	{ PIDGIN_STOCK_UPLOAD,          NULL,      GTK_STOCK_GO_UP            },
|    };
|    
|   @@ -183,11 +183,11 @@ find_file(const char *dir, const char *b
|    	if (base == NULL)
|    		return NULL;
|    
|   -	if (!strcmp(dir, "purple"))
|   -		filename = g_build_filename(DATADIR, "pixmaps", "purple", base, NULL);
|   +	if (!strcmp(dir, "pidgin"))
|   +		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", base, NULL);
|    	else
|    	{
|   -		filename = g_build_filename(DATADIR, "pixmaps", "purple", dir,
|   +		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", dir,
|    									base, NULL);
|    	}
|    
|   ============================================================
|   --- pidgin/pixmaps/Makefile.am	2a81bf42b50476a099681ce7fb80f497b8b59271
|   +++ pidgin/pixmaps/Makefile.am	bc0a88afc1948aa0183548aa343f94a10a9ac0ea
|   @@ -50,14 +50,14 @@ EXTRA_DIST = \
|    		gaim.ico			
|    
|    
|   -gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons
|   -gaimbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png info.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png
|   +pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
|   +pidginbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png info.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png
|    
|   -gaimiconpixdir = $(datadir)/pixmaps/pidgin/icons
|   -gaimiconpix_DATA = window-icon.png
|   +pidginiconpixdir = $(datadir)/pixmaps/pidgin/icons
|   +pidginiconpix_DATA = window-icon.png
|    
|   -gaimdistpixdir = $(datadir)/pixmaps/gaim
|   -gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png insert-image.png
|   +pidgindistpixdir = $(datadir)/pixmaps/pidgin
|   +pidgindistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png insert-image.png
|    
|    
|    distpixmapdir = $(datadir)/pixmaps

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 04ba35fa8d329867d15b2d511189adbdf4a1947c