rpms/pidgin/devel pidgin.spec, 1.51, 1.52 purple-fedora-prefs.xml, 1.2, 1.3

Stu Tomlinson (nosnilmot) fedora-extras-commits at redhat.com
Tue May 13 17:13:05 UTC 2008


Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12714

Modified Files:
	pidgin.spec purple-fedora-prefs.xml 
Log Message:
- Rebuild for new evolution-data-server
- Clean up default prefs.xml
- Enable nautilus integration plugin by default in prefs.xml (#242289)




Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- pidgin.spec	1 Apr 2008 01:10:35 -0000	1.51
+++ pidgin.spec	13 May 2008 17:12:18 -0000	1.52
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.4.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -41,8 +41,11 @@
 Provides:       gaim = 999:1
 ExcludeArch:    s390 s390x
 
-## Fedora pidgin defaults - Please Regenerate for Each Major Release
-# 1) run pidgin as new user 2) edit preferences 3) close 4) copy .purple/prefs.xml
+## Fedora pidgin defaults
+# Only needs regenerating if Pidgin breaks backwards compatibility with prefs.xml
+# 1) uninstall any non-default pidgin or libpurple plugins
+# 2) run pidgin as new user 3) edit preferences 4) close 5) copy .purple/prefs.xml
+# OR 1) edit manually
 # - enable ExtPlacement plugin
 # - enable History plugin
 # - enable Message Notification plugin
@@ -493,6 +496,11 @@
 
 
 %changelog
+* Tue May 13 2008 Stu Tomlinson <stu at nosnilmot.com> 2.4.1-3
+- Rebuild for new evolution-data-server
+- Clean up default prefs.xml
+- Enable nautilus integration plugin by default in prefs.xml (#242289)
+
 * Mon Mar 31 2008 Stu Tomlinson <stu at nosnilmot.com> 2.4.1-2
 - nss-devel no longer provides mozilla-nss-devel
 


Index: purple-fedora-prefs.xml
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/purple-fedora-prefs.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- purple-fedora-prefs.xml	14 Mar 2008 21:14:48 -0000	1.2
+++ purple-fedora-prefs.xml	13 May 2008 17:12:18 -0000	1.3
@@ -2,162 +2,17 @@
 
 <pref version='1' name='/'>
 	<pref name='purple'>
-		<pref name='away'>
-			<pref name='idle_reporting' type='string' value='system'/>
-			<pref name='away_when_idle' type='bool' value='1'/>
-			<pref name='mins_before_away' type='int' value='5'/>
-			<pref name='auto_reply' type='string' value='awayidle'/>
-		</pref>
-		<pref name='buddies'/>
-		<pref name='contact'>
-			<pref name='last_match' type='bool' value='0'/>
-		</pref>
-		<pref name='debug'>
-			<pref name='timestamps' type='bool' value='0'/>
-		</pref>
-		<pref name='status'>
-			<pref name='scores'>
-				<pref name='offline' type='int' value='-500'/>
-				<pref name='available' type='int' value='100'/>
-				<pref name='invisible' type='int' value='-50'/>
-				<pref name='away' type='int' value='-100'/>
-				<pref name='extended_away' type='int' value='-200'/>
-				<pref name='idle' type='int' value='-10'/>
-				<pref name='offline_msg' type='int' value='10'/>
-			</pref>
-		</pref>
-		<pref name='savedstatus'>
-			<pref name='default' type='int' value='1178290503'/>
-			<pref name='startup' type='int' value='0'/>
-			<pref name='startup_current_status' type='bool' value='1'/>
-			<pref name='idleaway' type='int' value='1178290561'/>
-			<pref name='isidleaway' type='bool' value='0'/>
-		</pref>
-		<pref name='conversations'>
-			<pref name='chat'>
-				<pref name='show_nick_change' type='bool' value='1'/>
-			</pref>
-			<pref name='im'>
-				<pref name='send_typing' type='bool' value='1'/>
-			</pref>
-		</pref>
 		<pref name='logging'>
 			<pref name='log_ims' type='bool' value='1'/>
-			<pref name='log_chats' type='bool' value='0'/>
-			<pref name='log_system' type='bool' value='0'/>
 			<pref name='format' type='string' value='html'/>
 		</pref>
-		<pref name='network'>
-			<pref name='auto_ip' type='bool' value='1'/>
-			<pref name='public_ip' type='string' value='127.0.0.1'/>
-			<pref name='ports_range_use' type='bool' value='0'/>
-			<pref name='ports_range_start' type='int' value='1024'/>
-			<pref name='ports_range_end' type='int' value='2048'/>
-			<pref name='stun_server' type='string' value=''/>
-		</pref>
-		<pref name='proxy'>
-			<pref name='type' type='string' value='none'/>
-			<pref name='host' type='string' value=''/>
-			<pref name='port' type='int' value='0'/>
-			<pref name='username' type='string' value=''/>
-			<pref name='password' type='string' value=''/>
-		</pref>
-		<pref name='sound'>
-			<pref name='while_status' type='int' value='1'/>
-		</pref>
 	</pref>
 	<pref name='plugins'>
-		<pref name='core'>
-			<pref name='joinpart'>
-				<pref name='delay' type='int' value='10'/>
-				<pref name='threshold' type='int' value='20'/>
-			</pref>
-			<pref name='log_reader'>
-				<pref name='fast_sizes' type='bool' value='0'/>
-				<pref name='use_name_heuristics' type='bool' value='1'/>
-				<pref name='adium'>
-					<pref name='log_directory' type='string' value='/home/pidgin/Library/Application Support/Adium 2.0/Users/Default/Logs'/>
-				</pref>
-				<pref name='fire'>
-					<pref name='log_directory' type='string' value='/home/pidgin/Library/Application Support/Fire/Sessions'/>
-				</pref>
-				<pref name='messenger_plus'>
-					<pref name='log_directory' type='string' value='/mnt/windows/Documents and Settings/pidgin/My Documents/My Chat Logs'/>
-				</pref>
-				<pref name='msn'>
-					<pref name='log_directory' type='string' value='/mnt/windows/Documents and Settings/pidgin/My Documents/My Received Files'/>
-				</pref>
-				<pref name='trillian'>
-					<pref name='log_directory' type='string' value='/mnt/windows/Program Files/Trillian/users/default/logs'/>
-				</pref>
-			</pref>
-			<pref name='core-plugin_pack-autoaccept'>
-				<pref name='path' type='string' value='/home/pidgin/.purple/autoaccept'/>
-				<pref name='reject_stranger' type='bool' value='1'/>
-				<pref name='notify' type='bool' value='1'/>
-			</pref>
-			<pref name='core-plugin_pack-offlinemsg'>
-				<pref name='always' type='bool' value='0'/>
-			</pref>
-			<pref name='statenotify'>
-				<pref name='notify_away' type='bool' value='1'/>
-				<pref name='notify_idle' type='bool' value='1'/>
-				<pref name='notify_signon' type='bool' value='1'/>
-			</pref>
-			<pref name='psychic'>
-				<pref name='buddies_only' type='bool' value='0'/>
-				<pref name='show_notice' type='bool' value='1'/>
-				<pref name='activate_online' type='bool' value='1'/>
-			</pref>
-		</pref>
-		<pref name='lopl'/>
-		<pref name='prpl'>
-			<pref name='oscar'>
-				<pref name='recent_buddies' type='bool' value='0'/>
-				<pref name='show_idle' type='bool' value='0'/>
-			</pref>
-			<pref name='meanwhile'>
-				<pref name='blist_action' type='int' value='4'/>
-			</pref>
-			<pref name='qq'>
-				<pref name='show_status_by_icon' type='bool' value='1'/>
-				<pref name='show_fake_video' type='bool' value='0'/>
-				<pref name='prompt_group_msg_on_recv' type='bool' value='1'/>
-				<pref name='prompt_for_missing_packet' type='bool' value='1'/>
-			</pref>
-			<pref name='silc'>
-				<pref name='sign_im' type='bool' value='0'/>
-				<pref name='verify_im' type='bool' value='0'/>
-				<pref name='sign_chat' type='bool' value='0'/>
-				<pref name='verify_chat' type='bool' value='0'/>
-				<pref name='vcard' type='string' value=''/>
-			</pref>
-			<pref name='msn'>
-				<pref name='conv_close_notice' type='bool' value='1'/>
-				<pref name='conv_timeout_notice' type='bool' value='1'/>
-			</pref>
-			<pref name='jabber'>
-				<pref name='hide_os' type='bool' value='0'/>
-			</pref>
-		</pref>
 		<pref name='gtk'>
 			<pref name='extplacement'>
 				<pref name='placement_number' type='int' value='4'/>
 				<pref name='placement_number_separate' type='bool' value='0'/>
 			</pref>
-			<pref name='musicmessaging'>
-				<pref name='editor_path' type='string' value='/usr/local/bin/gscore'/>
-			</pref>
-			<pref name='timestamp'>
-				<pref name='interval' type='int' value='300000'/>
-			</pref>
-			<pref name='timestamp_format'>
-				<pref name='force_24hr' type='bool' value='1'/>
-				<pref name='use_dates'>
-					<pref name='conversation' type='string' value='automatic'/>
-					<pref name='log' type='string' value='automatic'/>
-				</pref>
-			</pref>
 			<pref name='X11'>
 				<pref name='notify'>
 					<pref name='type_im' type='bool' value='1'/>
@@ -176,101 +31,6 @@
 					<pref name='notify_send' type='bool' value='1'/>
 					<pref name='notify_switch' type='bool' value='1'/>
 				</pref>
-				<pref name='gestures'>
-					<pref name='visual' type='bool' value='0'/>
-				</pref>
-			</pref>
-			<pref name='purplerc'>
-				<pref name='set'>
-					<pref name='gtk-font-name' type='bool' value='0'/>
-					<pref name='gtk-key-theme-name' type='bool' value='0'/>
-					<pref name='color'>
-						<pref name='GtkWidget::cursor-color' type='bool' value='0'/>
-						<pref name='GtkWidget::secondary-cursor-color' type='bool' value='0'/>
-						<pref name='GtkIMHtml::hyperlink-color' type='bool' value='0'/>
-					</pref>
-					<pref name='size'>
-						<pref name='GtkTreeView::expander_size' type='bool' value='0'/>
-						<pref name='GtkTreeView::horizontal_separator' type='bool' value='0'/>
-					</pref>
-					<pref name='font'>
-						<pref name='*pidgin_conv_entry' type='bool' value='0'/>
-						<pref name='*pidgin_conv_imhtml' type='bool' value='0'/>
-						<pref name='*pidginlog_imhtml' type='bool' value='0'/>
-						<pref name='*pidginrequest_imhtml' type='bool' value='0'/>
-						<pref name='*pidginnotify_imhtml' type='bool' value='0'/>
-					</pref>
-					<pref name='bool'>
-						<pref name='GtkTreeView::indent_expanders' type='bool' value='0'/>
-					</pref>
-				</pref>
-				<pref name='gtk-font-name' type='string' value=''/>
-				<pref name='gtk-key-theme-name' type='string' value=''/>
-				<pref name='color'>
-					<pref name='GtkWidget::cursor-color' type='string' value=''/>
-					<pref name='GtkWidget::secondary-cursor-color' type='string' value=''/>
-					<pref name='GtkIMHtml::hyperlink-color' type='string' value=''/>
-				</pref>
-				<pref name='size'>
-					<pref name='GtkTreeView::expander_size' type='int' value='0'/>
-					<pref name='GtkTreeView::horizontal_separator' type='int' value='0'/>
-				</pref>
-				<pref name='font'>
-					<pref name='*pidgin_conv_entry' type='string' value=''/>
-					<pref name='*pidgin_conv_imhtml' type='string' value=''/>
-					<pref name='*pidginlog_imhtml' type='string' value=''/>
-					<pref name='*pidginrequest_imhtml' type='string' value=''/>
-					<pref name='*pidginnotify_imhtml' type='string' value=''/>
-				</pref>
-				<pref name='bool'>
-					<pref name='GtkTreeView::indent_expanders' type='bool' value='1'/>
-				</pref>
-			</pref>
-			<pref name='cap'>
-				<pref name='max_seen_difference' type='int' value='1'/>
-				<pref name='max_msg_difference' type='int' value='10'/>
-				<pref name='threshold' type='int' value='5'/>
-			</pref>
-			<pref name='gtk-plugin_pack-markerline'>
-				<pref name='ims' type='bool' value='0'/>
-				<pref name='chats' type='bool' value='1'/>
-			</pref>
-			<pref name='gtk-plugin_pack-convcolors'>
-				<pref name='ignore_incoming' type='bool' value='1'/>
-				<pref name='chats' type='bool' value='1'/>
-				<pref name='ims' type='bool' value='1'/>
-				<pref name='send'>
-					<pref name='color' type='string' value='#909090'/>
-					<pref name='format' type='int' value='0'/>
-				</pref>
-				<pref name='recv'>
-					<pref name='color' type='string' value='#000000'/>
-					<pref name='format' type='int' value='0'/>
-				</pref>
-				<pref name='system'>
-					<pref name='color' type='string' value='#50a050'/>
-					<pref name='format' type='int' value='2'/>
-				</pref>
-				<pref name='error'>
-					<pref name='color' type='string' value='#ff0000'/>
-					<pref name='format' type='int' value='5'/>
-				</pref>
-				<pref name='nick'>
-					<pref name='color' type='string' value='#0000dd'/>
-					<pref name='format' type='int' value='1'/>
-				</pref>
-			</pref>
-		</pref>
-		<pref name='gnt'>
-			<pref name='gntgf'>
-				<pref name='events'>
-					<pref name='signonf' type='bool' value='1'/>
-					<pref name='immsg' type='bool' value='1'/>
-					<pref name='chatmsg' type='bool' value='1'/>
-					<pref name='chatnick' type='bool' value='1'/>
-				</pref>
-				<pref name='beep' type='bool' value='1'/>
-				<pref name='urgent' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>
@@ -285,146 +45,11 @@
 				<item value='/usr/lib/pidgin/extplacement.so'/>
 				<item value='/usr/lib/pidgin/history.so'/>
 				<item value='/usr/lib/pidgin/notify.so'/>
+				<item value='/usr/lib/pidgin/nautilus.so'/>
 			</pref>
 		</pref>
-		<pref name='filelocations'>
-			<pref name='last_save_folder' type='path' value=''/>
-			<pref name='last_open_folder' type='path' value=''/>
-			<pref name='last_icon_folder' type='path' value=''/>
-		</pref>
-		<pref name='smileys'>
-			<pref name='theme' type='string' value='Default'/>
-		</pref>
-		<pref name='debug'>
-			<pref name='enabled' type='bool' value='0'/>
-			<pref name='filterlevel' type='int' value='0'/>
-			<pref name='style' type='int' value='3'/>
-			<pref name='toolbar' type='bool' value='1'/>
-			<pref name='width' type='int' value='450'/>
-			<pref name='height' type='int' value='250'/>
-			<pref name='regex' type='string' value=''/>
-			<pref name='filter' type='bool' value='0'/>
-			<pref name='invert' type='bool' value='0'/>
-			<pref name='case_insensitive' type='bool' value='0'/>
-			<pref name='highlight' type='bool' value='0'/>
-		</pref>
-		<pref name='sound'>
-			<pref name='enabled'>
-				<pref name='login' type='bool' value='1'/>
-				<pref name='logout' type='bool' value='1'/>
-				<pref name='im_recv' type='bool' value='1'/>
-				<pref name='first_im_recv' type='bool' value='0'/>
-				<pref name='send_im' type='bool' value='1'/>
-				<pref name='join_chat' type='bool' value='0'/>
-				<pref name='left_chat' type='bool' value='0'/>
-				<pref name='send_chat_msg' type='bool' value='0'/>
-				<pref name='chat_msg_recv' type='bool' value='0'/>
-				<pref name='nick_said' type='bool' value='0'/>
-				<pref name='pounce_default' type='bool' value='1'/>
-			</pref>
-			<pref name='file'>
-				<pref name='login' type='path' value=''/>
-				<pref name='logout' type='path' value=''/>
-				<pref name='im_recv' type='path' value=''/>
-				<pref name='first_im_recv' type='path' value=''/>
-				<pref name='send_im' type='path' value=''/>
-				<pref name='join_chat' type='path' value=''/>
-				<pref name='left_chat' type='path' value=''/>
-				<pref name='send_chat_msg' type='path' value=''/>
-				<pref name='chat_msg_recv' type='path' value=''/>
-				<pref name='nick_said' type='path' value=''/>
-				<pref name='pounce_default' type='path' value=''/>
-			</pref>
-			<pref name='conv_focus' type='bool' value='1'/>
-			<pref name='mute' type='bool' value='0'/>
-			<pref name='command' type='path' value=''/>
-			<pref name='method' type='string' value='automatic'/>
-			<pref name='volume' type='int' value='50'/>
-		</pref>
-		<pref name='accounts'>
-			<pref name='dialog'>
-				<pref name='width' type='int' value='550'/>
-				<pref name='height' type='int' value='250'/>
-			</pref>
-			<pref name='buddyicon' type='path' value=''/>
-		</pref>
 		<pref name='blist'>
 			<pref name='show_buddy_icons' type='bool' value='0'/>
-			<pref name='show_empty_groups' type='bool' value='0'/>
-			<pref name='show_idle_time' type='bool' value='1'/>
-			<pref name='show_offline_buddies' type='bool' value='0'/>
-			<pref name='list_visible' type='bool' value='1'/>
-			<pref name='list_maximized' type='bool' value='0'/>
-			<pref name='sort_type' type='string' value='alphabetical'/>
-			<pref name='x' type='int' value='778'/>
-			<pref name='y' type='int' value='25'/>
-			<pref name='width' type='int' value='309'/>
-			<pref name='height' type='int' value='500'/>
-			<pref name='tooltip_delay' type='int' value='500'/>
-		</pref>
-		<pref name='status'>
-			<pref name='dialog'>
-				<pref name='width' type='int' value='550'/>
-				<pref name='height' type='int' value='250'/>
-			</pref>
-		</pref>
-		<pref name='conversations'>
-			<pref name='use_smooth_scrolling' type='bool' value='1'/>
-			<pref name='close_on_tabs' type='bool' value='1'/>
-			<pref name='send_bold' type='bool' value='0'/>
-			<pref name='send_italic' type='bool' value='0'/>
-			<pref name='send_underline' type='bool' value='0'/>
-			<pref name='spellcheck' type='bool' value='1'/>
-			<pref name='show_incoming_formatting' type='bool' value='1'/>
-			<pref name='show_timestamps' type='bool' value='1'/>
-			<pref name='show_formatting_toolbar' type='bool' value='1'/>
-			<pref name='placement' type='string' value='last'/>
-			<pref name='placement_number' type='int' value='1'/>
-			<pref name='bgcolor' type='string' value=''/>
-			<pref name='fgcolor' type='string' value=''/>
-			<pref name='font_face' type='string' value=''/>
-			<pref name='font_size' type='int' value='3'/>
-			<pref name='tabs' type='bool' value='1'/>
-			<pref name='tab_side' type='int' value='2'/>
-			<pref name='scrollback_lines' type='int' value='4000'/>
-			<pref name='chat'>
-				<pref name='default_width' type='int' value='410'/>
-				<pref name='default_height' type='int' value='160'/>
-				<pref name='entry_height' type='int' value='50'/>
-				<pref name='userlist_width' type='int' value='80'/>
-			</pref>
-			<pref name='im'>
-				<pref name='animate_buddy_icons' type='bool' value='1'/>
-				<pref name='default_width' type='int' value='410'/>
-				<pref name='default_height' type='int' value='160'/>
-				<pref name='entry_height' type='int' value='50'/>
-				<pref name='show_buddy_icons' type='bool' value='1'/>
-				<pref name='hide_new' type='string' value='never'/>
-			</pref>
-		</pref>
-		<pref name='pounces'>
-			<pref name='default_actions'>
-				<pref name='open-window' type='bool' value='0'/>
-				<pref name='popup-notify' type='bool' value='0'/>
-				<pref name='send-message' type='bool' value='1'/>
-				<pref name='execute-command' type='bool' value='0'/>
-				<pref name='play-sound' type='bool' value='0'/>
-			</pref>
-			<pref name='dialog'>
-				<pref name='width' type='int' value='520'/>
-				<pref name='height' type='int' value='321'/>
-			</pref>
-		</pref>
-		<pref name='filetransfer'>
-			<pref name='clear_finished' type='bool' value='1'/>
-			<pref name='keep_open' type='bool' value='0'/>
-		</pref>
-		<pref name='docklet'>
-			<pref name='blink' type='bool' value='1'/>
-			<pref name='show' type='string' value='always'/>
-			<pref name='x11'>
-				<pref name='embedded' type='bool' value='0'/>
-			</pref>
 		</pref>
 	</pref>
 </pref>




More information about the fedora-extras-commits mailing list