[Gaim-commits] CVS: gaim ChangeLog,1.573,1.574 Makefile.am,1.36,1.37 gaim.desktop,1.5,1.6

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv28577

Modified Files:
	ChangeLog Makefile.am gaim.desktop 
Log Message:
(12:18:46) Robot101: it switches the .desktop file to the new KDE/GNOME common vfolder format
(12:18:48) Robot101: and location
(12:19:01) Robot101: and it moves a function from util.c to aim.c and makes it static
(12:19:08) Robot101: because it's only used by the main window

and removes a function herman #ifdef 0'ed, and fixes a segfault in the docklet.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -d -r1.573 -r1.574
--- ChangeLog	16 Oct 2002 06:30:45 -0000	1.573
+++ ChangeLog	17 Oct 2002 16:25:49 -0000	1.574
@@ -94,6 +94,8 @@
 	* Option to have AIM over oscar notify you if you have 
 	  unread mail (Thanks, Mark Doliner)
 	* Fix first message in tab not displaying bug (Thanks Etan Reisner)
+	* Switch the .desktop file to the new KDE/GNOME common vfolder 
+	  format (Thanks Robert McQueen).
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile.am	26 Aug 2002 05:29:45 -0000	1.36
+++ Makefile.am	17 Oct 2002 16:25:50 -0000	1.37
@@ -4,7 +4,7 @@
 dist-hook: gaim.spec
 	cp gaim.spec $(distdir)
 
-pixmapdir = $(datadir)/gnome/apps/Internet
+pixmapdir = $(datadir)/applications
 pixmap_DATA = gaim.desktop
 
 SUBDIRS = m4 sounds plugins pixmaps doc po intl src

Index: gaim.desktop
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.desktop,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gaim.desktop	2 Aug 2002 04:46:51 -0000	1.5
+++ gaim.desktop	17 Oct 2002 16:25:51 -0000	1.6
@@ -1,8 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Gaim
-Comment=Multi-protocol Instant Messaging Client 
-Exec=gaim 
+Comment=Multi-protocol Instant Messaging Client
+Exec=gaim
 Icon=gaim.png
-Info=Gaim
-Terminal=0
+Terminal=false
 Type=Application
+Categories=Application;Network;