Mercurial > pidgin

changeset 12816:ff267281e882

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15164] Get rid of a compile warning by changing the definition of (*GaimPrefCallback) to pass a gconstpointer val instead of gpointer committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 11 Jan 2006 04:32:12 +0000
parents a8bffa7fb6ac
children c0fc1e9c6768
files plugins/docklet/docklet.c plugins/gaimrc.c plugins/gestures/gestures.c plugins/history.c plugins/win32/winprefs/winprefs.c src/gtkblist.c src/gtkconv.c src/gtkdebug.c src/gtkprefs.c src/gtksound.c src/gtkstatusbox.c src/log.c src/prefs.h src/protocols/oscar/oscar.c src/proxy.c src/status.c
diffstat 16 files changed, 74 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/docklet/docklet.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/plugins/docklet/docklet.c	Wed Jan 11 04:32:12 2006 +0000
@@ -273,7 +273,7 @@
 
 static void
 docklet_prefs_cb(const char *name, GaimPrefType type,
-				 gpointer val, gpointer data)
+				 gconstpointer val, gpointer data)
 {
 	docklet_update_status();
 }
--- a/plugins/gaimrc.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/plugins/gaimrc.c	Wed Jan 11 04:32:12 2006 +0000
@@ -215,8 +215,8 @@
 }
 
 static void
-gaimrc_pref_changed_cb(const char *name, GaimPrefType type, gpointer value,
-                       gpointer data)
+gaimrc_pref_changed_cb(const char *name, GaimPrefType type,
+                       gconstpointer value, gpointer data)
 {
 	GString *style_string = g_string_new("");
 	char *prefbase = NULL;
--- a/plugins/gestures/gestures.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/plugins/gestures/gestures.c	Wed Jan 11 04:32:12 2006 +0000
@@ -175,7 +175,7 @@
 }
 
 static void
-visual_pref_cb(const char *name, GaimPrefType type, gpointer value,
+visual_pref_cb(const char *name, GaimPrefType type, gconstpointer value,
 			   gpointer data)
 {
 	gstroke_set_draw_strokes((gboolean) GPOINTER_TO_INT(value) );
--- a/plugins/history.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/plugins/history.c	Wed Jan 11 04:32:12 2006 +0000
@@ -150,7 +150,8 @@
 	}
 }
 
-static void history_prefs_cb(const char *name, GaimPrefType type, gpointer val, gpointer data)
+static void history_prefs_cb(const char *name, GaimPrefType type,
+							 gconstpointer val, gpointer data)
 {
 	history_prefs_check((GaimPlugin *)data);
 }
--- a/plugins/win32/winprefs/winprefs.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/plugins/win32/winprefs/winprefs.c	Wed Jan 11 04:32:12 2006 +0000
@@ -219,14 +219,14 @@
 
 static void
 winprefs_set_blist_dockable (const char *pref, GaimPrefType type,
-		gpointer value, gpointer user_data)
+		gconstpointer value, gpointer user_data)
 {
 	blist_set_dockable(GPOINTER_TO_INT(value));
 }
 
 static void
 winprefs_set_blist_ontop (const char *pref, GaimPrefType type,
-		gpointer value, gpointer user_data)
+		gconstpointer value, gpointer user_data)
 {
 	gint setting = gaim_prefs_get_int(PREF_BLIST_ON_TOP);
 	if ((setting == BLIST_TOP_DOCKED && blist_ab && blist_ab->docked)
--- a/src/gtkblist.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/src/gtkblist.c	Wed Jan 11 04:32:12 2006 +0000
@@ -1485,13 +1485,17 @@
 	gaim_prefs_set_bool("/gaim/gtk/sound/mute", GTK_CHECK_MENU_ITEM(item)->active);
 }
 
-static void gaim_gtk_blist_mute_pref_cb(const char *name, GaimPrefType type, gpointer value, gpointer data)
+static void
+gaim_gtk_blist_mute_pref_cb(const char *name, GaimPrefType type,
+							gconstpointer value, gpointer data)
 {
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item(gtkblist->ift,
 						N_("/Tools/Mute Sounds"))),	(gboolean)GPOINTER_TO_INT(value));
 }
 
-static void gaim_gtk_blist_sound_method_pref_cb(const char *name, GaimPrefType type, gpointer value, gpointer data)
+static void
+gaim_gtk_blist_sound_method_pref_cb(const char *name, GaimPrefType type,
+									gconstpointer value, gpointer data)
 {
 	gboolean sensitive = TRUE;
 
@@ -3418,7 +3422,7 @@
 
 static void
 show_buddy_icons_pref_cb(const char *name, GaimPrefType type,
-						 gpointer val, gpointer data)
+						 gconstpointer val, gpointer data)
 {
 	gaim_gtk_blist_update_columns();
 }
@@ -3455,7 +3459,7 @@
 }
 
 static void _prefs_change_sort_method(const char *pref_name, GaimPrefType type,
-		gpointer val, gpointer data)
+									  gconstpointer val, gpointer data)
 {
 	if(!strcmp(pref_name, "/gaim/gtk/blist/sort_type"))
 		gaim_gtk_blist_sort_method_set(val);
--- a/src/gtkconv.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/src/gtkconv.c	Wed Jan 11 04:32:12 2006 +0000
@@ -2590,7 +2590,8 @@
 }
 
 static void
-sound_method_pref_changed_cb(const char *name, GaimPrefType type, gpointer value, gpointer data)
+sound_method_pref_changed_cb(const char *name, GaimPrefType type,
+							 gconstpointer value, gpointer data)
 {
 	GaimGtkWindow *win = data;
 	const char *method = value;
@@ -2614,7 +2615,8 @@
 }
 
 static void
-show_buddy_icons_pref_changed_cb(const char *name, GaimPrefType type, gpointer value, gpointer data)
+show_buddy_icons_pref_changed_cb(const char *name, GaimPrefType type,
+								 gconstpointer value, gpointer data)
 {
 	GaimGtkWindow *win = data;
 	gboolean show_icons = GPOINTER_TO_INT(value);
@@ -5891,8 +5893,8 @@
 }
 
 static void
-close_on_tabs_pref_cb(const char *name, GaimPrefType type, gpointer value,
-						gpointer data)
+close_on_tabs_pref_cb(const char *name, GaimPrefType type,
+					  gconstpointer value, gpointer data)
 {
 	GList *l;
 	GaimConversation *conv;
@@ -5914,8 +5916,8 @@
 }
 
 static void
-spellcheck_pref_cb(const char *name, GaimPrefType type, gpointer value,
-				   gpointer data)
+spellcheck_pref_cb(const char *name, GaimPrefType type,
+				   gconstpointer value, gpointer data)
 {
 #ifdef USE_GTKSPELL
 	GList *cl;
@@ -5943,8 +5945,8 @@
 }
 
 static void
-tab_side_pref_cb(const char *name, GaimPrefType type, gpointer value,
-				 gpointer data)
+tab_side_pref_cb(const char *name, GaimPrefType type,
+				 gconstpointer value, gpointer data)
 {
 	GList *l;
 	GtkPositionType pos;
@@ -5961,7 +5963,7 @@
 
 static void
 show_timestamps_pref_cb(const char *name, GaimPrefType type,
-								gpointer value, gpointer data)
+						gconstpointer value, gpointer data)
 {
 	GList *l;
 	GaimConversation *conv;
@@ -5989,7 +5991,7 @@
 
 static void
 show_formatting_toolbar_pref_cb(const char *name, GaimPrefType type,
-								gpointer value, gpointer data)
+								gconstpointer value, gpointer data)
 {
 	GList *l;
 	GaimConversation *conv;
@@ -6019,7 +6021,7 @@
 
 static void
 animate_buddy_icons_pref_cb(const char *name, GaimPrefType type,
-							gpointer value, gpointer data)
+							gconstpointer value, gpointer data)
 {
 	GList *l;
 	GaimConversation *conv;
@@ -6045,8 +6047,8 @@
 }
 
 static void
-show_buddy_icons_pref_cb(const char *name, GaimPrefType type, gpointer value,
-						 gpointer data)
+show_buddy_icons_pref_cb(const char *name, GaimPrefType type,
+						 gconstpointer value, gpointer data)
 {
 	GList *l;
 
@@ -6060,7 +6062,7 @@
 
 static void
 conv_placement_usetabs_cb(const char *name, GaimPrefType type,
-						gpointer value, gpointer data)
+						  gconstpointer value, gpointer data)
 {
 	gaim_prefs_trigger_callback("/gaim/gtk/conversations/placement");
 }
@@ -6095,8 +6097,8 @@
 }
 
 static void
-hide_new_pref_cb(const char *name, GaimPrefType type, gpointer value,
-				 gpointer data)
+hide_new_pref_cb(const char *name, GaimPrefType type,
+				 gconstpointer value, gpointer data)
 {
 	GList *l;
 	GaimConversation *conv = NULL;
@@ -6130,7 +6132,7 @@
 
 static void
 conv_placement_pref_cb(const char *name, GaimPrefType type,
-					   gpointer value, gpointer data)
+					   gconstpointer value, gpointer data)
 {
 	GaimConvPlacementFunc func;
 
--- a/src/gtkdebug.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/src/gtkdebug.c	Wed Jan 11 04:32:12 2006 +0000
@@ -267,8 +267,8 @@
 }
 
 static void
-timestamps_pref_cb(const char *name, GaimPrefType type, gpointer value,
-				   gpointer data)
+timestamps_pref_cb(const char *name, GaimPrefType type,
+				   gconstpointer value, gpointer data)
 {
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data), GPOINTER_TO_INT(value));
 }
@@ -458,7 +458,7 @@
 
 static void
 regex_pref_filter_cb(const gchar *name, GaimPrefType type,
-					 gpointer val, gpointer data)
+					 gconstpointer val, gpointer data)
 {
 	DebugWindow *win = (DebugWindow *)data;
 	gboolean active = GPOINTER_TO_INT(val), current;
@@ -473,7 +473,7 @@
 
 static void
 regex_pref_expression_cb(const gchar *name, GaimPrefType type,
-						 gpointer val, gpointer data)
+						 gconstpointer val, gpointer data)
 {
 	DebugWindow *win = (DebugWindow *)data;
 	const gchar *exp = (const gchar *)val;
@@ -483,7 +483,7 @@
 
 static void
 regex_pref_invert_cb(const gchar *name, GaimPrefType type,
-					 gpointer val, gpointer data)
+					 gconstpointer val, gpointer data)
 {
 	DebugWindow *win = (DebugWindow *)data;
 	gboolean active = GPOINTER_TO_INT(val);
@@ -496,7 +496,7 @@
 
 static void
 regex_pref_highlight_cb(const gchar *name, GaimPrefType type,
-						gpointer val, gpointer data)
+						gconstpointer val, gpointer data)
 {
 	DebugWindow *win = (DebugWindow *)data;
 	gboolean active = GPOINTER_TO_INT(val);
@@ -789,8 +789,8 @@
 }
 
 static void
-debug_enabled_cb(const char *name, GaimPrefType type, gpointer value,
-				 gpointer data)
+debug_enabled_cb(const char *name, GaimPrefType type,
+				 gconstpointer value, gpointer data)
 {
 	if (value)
 		gaim_gtk_debug_window_show();
--- a/src/gtkprefs.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/src/gtkprefs.c	Wed Jan 11 04:32:12 2006 +0000
@@ -781,8 +781,8 @@
 }
 
 static void
-conversation_usetabs_cb(const char *name, GaimPrefType type, gpointer value,
-                          gpointer data)
+conversation_usetabs_cb(const char *name, GaimPrefType type,
+						gconstpointer value, gpointer data)
 {
 	gboolean usetabs = GPOINTER_TO_INT(value);
 
@@ -928,8 +928,8 @@
 }
 
 static void
-proxy_changed_cb(const char *name, GaimPrefType type, gpointer value,
-		gpointer data)
+proxy_changed_cb(const char *name, GaimPrefType type,
+				 gconstpointer value, gpointer data)
 {
 	GtkWidget *frame = data;
 	const char *proxy = value;
@@ -1180,8 +1180,8 @@
 }
 
 static void
-browser_changed1_cb(const char *name, GaimPrefType type, gpointer value,
-				   gpointer data)
+browser_changed1_cb(const char *name, GaimPrefType type,
+					gconstpointer value, gpointer data)
 {
 	GtkWidget *hbox = data;
 	const char *browser = value;
@@ -1190,8 +1190,8 @@
 }
 
 static void
-browser_changed2_cb(const char *name, GaimPrefType type, gpointer value,
-				   gpointer data)
+browser_changed2_cb(const char *name, GaimPrefType type,
+					gconstpointer value, gpointer data)
 {
 	GtkWidget *hbox = data;
 	const char *browser = value;
@@ -1310,8 +1310,8 @@
 }
 
 static void
-sound_changed1_cb(const char *name, GaimPrefType type, gpointer value,
-				   gpointer data)
+sound_changed1_cb(const char *name, GaimPrefType type,
+				  gconstpointer value, gpointer data)
 {
 	GtkWidget *hbox = data;
 	const char *method = value;
@@ -1320,8 +1320,8 @@
 }
 
 static void
-sound_changed2_cb(const char *name, GaimPrefType type, gpointer value,
-				   gpointer data)
+sound_changed2_cb(const char *name, GaimPrefType type,
+				  gconstpointer value, gpointer data)
 {
 	GtkWidget *vbox = data;
 	const char *method = value;
@@ -1330,8 +1330,8 @@
 }
 
 static void
-sound_changed3_cb(const char *name, GaimPrefType type, gpointer value,
-				   gpointer data)
+sound_changed3_cb(const char *name, GaimPrefType type,
+				  gconstpointer value, gpointer data)
 {
 	GtkWidget *hbox = data;
 	const char *method = value;
@@ -1907,8 +1907,8 @@
 }
 
 static void
-smiley_theme_pref_cb(const char *name, GaimPrefType type, gpointer value,
-					 gpointer data)
+smiley_theme_pref_cb(const char *name, GaimPrefType type,
+					 gconstpointer value, gpointer data)
 {
 	const char *themename = value;
 	GSList *themes;
--- a/src/gtksound.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/src/gtksound.c	Wed Jan 11 04:32:12 2006 +0000
@@ -230,7 +230,8 @@
 
 static void
 _pref_sound_method_changed(const char *name, GaimPrefType type,
-		gpointer val, gpointer data) {
+						   gconstpointer val, gpointer data)
+{
 	if(type != GAIM_PREF_STRING || strcmp(name, "/gaim/gtk/sound/method"))
 		return;
 
--- a/src/gtkstatusbox.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/src/gtkstatusbox.c	Wed Jan 11 04:32:12 2006 +0000
@@ -621,7 +621,7 @@
 
 static void
 current_status_pref_changed_cb(const char *name, GaimPrefType type,
-							   gpointer val, gpointer data)
+							   gconstpointer val, gpointer data)
 {
 	GtkGaimStatusBox *box = data;
 
@@ -637,7 +637,7 @@
 
 static void
 buddy_list_details_pref_changed_cb(const char *name, GaimPrefType type,
-							   gpointer val, gpointer data)
+								   gconstpointer val, gpointer data)
 {
 	GtkGaimStatusBox *status_box = (GtkGaimStatusBox *)data;
 
@@ -648,7 +648,7 @@
 
 static void
 spellcheck_prefs_cb(const char *name, GaimPrefType type,
-					 gpointer value, gpointer data)
+					gconstpointer value, gpointer data)
 {
 #ifdef USE_GTKSPELL
 	GtkGaimStatusBox *status_box = (GtkGaimStatusBox *)data;
--- a/src/log.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/src/log.c	Wed Jan 11 04:32:12 2006 +0000
@@ -241,7 +241,7 @@
 static GaimLogLogger *current_logger = NULL;
 
 static void logger_pref_cb(const char *name, GaimPrefType type,
-			   gpointer value, gpointer data)
+						   gconstpointer value, gpointer data)
 {
 	GaimLogLogger *logger;
 	GSList *l = loggers;
--- a/src/prefs.h	Wed Jan 11 03:42:22 2006 +0000
+++ b/src/prefs.h	Wed Jan 11 04:32:12 2006 +0000
@@ -56,7 +56,7 @@
  */
 
 typedef void (*GaimPrefCallback) (const char *name, GaimPrefType type,
-		gpointer val, gpointer data);
+		gconstpointer val, gpointer data);
 
 #ifdef __cplusplus
 extern "C" {
--- a/src/protocols/oscar/oscar.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/src/protocols/oscar/oscar.c	Wed Jan 11 04:32:12 2006 +0000
@@ -307,7 +307,7 @@
 static void oscar_xfer_init_send(GaimXfer *xfer);
 
 static void oscar_direct_im_initiate(GaimConnection *gc, const char *who, const guchar *cookie);
-static void recent_buddies_cb(const char *name, GaimPrefType type, gpointer value, gpointer data);
+static void recent_buddies_cb(const char *name, GaimPrefType type, gconstpointer value, gpointer data);
 static void oscar_set_info(GaimConnection *gc, const char *info);
 static void oscar_set_info_and_status(GaimAccount *account, gboolean setinfo, const char *rawinfo, gboolean setstatus, GaimStatus *status);
 static void oscar_set_extendedstatus(GaimConnection *gc);
@@ -8478,7 +8478,8 @@
 }
 
 static void
-recent_buddies_cb(const char *name, GaimPrefType type, gpointer value, gpointer data)
+recent_buddies_cb(const char *name, GaimPrefType type,
+				  gconstpointer value, gpointer data)
 {
 	GaimConnection *gc = data;
 	OscarData *od = gc->proto_data;
--- a/src/proxy.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/src/proxy.c	Wed Jan 11 04:32:12 2006 +0000
@@ -2065,14 +2065,14 @@
 
 
 static void
-proxy_pref_cb(const char *name, GaimPrefType type, gpointer value,
-			  gpointer data)
+proxy_pref_cb(const char *name, GaimPrefType type,
+			  gconstpointer value, gpointer data)
 {
 	GaimProxyInfo *info = gaim_global_proxy_get_info();
 
 	if (!strcmp(name, "/core/proxy/type")) {
 		int proxytype;
-		char *type = value;
+		const char *type = value;
 
 		if (!strcmp(type, "none"))
 			proxytype = GAIM_PROXY_NONE;
--- a/src/status.c	Wed Jan 11 03:42:22 2006 +0000
+++ b/src/status.c	Wed Jan 11 04:32:12 2006 +0000
@@ -1638,8 +1638,8 @@
 * Status subsystem
 **************************************************************************/
 static void
-score_pref_changed_cb(const char *name, GaimPrefType type, gpointer value,
-		gpointer data)
+score_pref_changed_cb(const char *name, GaimPrefType type,
+					  gconstpointer value, gpointer data)
 {
 	int index = GPOINTER_TO_INT(data);