From 90952ac5c8a3c3759fc604325ac7c5530a8a36dc Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@t-online.de>
Date: Fri, 16 Nov 2012 21:23:47 +0100
Subject: [PATCH] Fix naming of "user_data" arguments for better introspection

---
 src/core/prefs.c  | 8 ++++----
 src/meta/common.h | 2 +-
 src/meta/prefs.h  | 6 +++---
 src/meta/window.h | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/core/prefs.c b/src/core/prefs.c
index 802d620ea..f21bd4330 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -696,13 +696,13 @@ handle_preference_update_int (GSettings *settings,
  */
 void
 meta_prefs_add_listener (MetaPrefsChangedFunc func,
-                         gpointer             data)
+                         gpointer             user_data)
 {
   MetaPrefsListener *l;
 
   l = g_new (MetaPrefsListener, 1);
   l->func = func;
-  l->data = data;
+  l->data = user_data;
 
   listeners = g_list_prepend (listeners, l);
 }
@@ -713,7 +713,7 @@ meta_prefs_add_listener (MetaPrefsChangedFunc func,
  */
 void
 meta_prefs_remove_listener (MetaPrefsChangedFunc func,
-                            gpointer             data)
+                            gpointer             user_data)
 {
   GList *tmp;
 
@@ -723,7 +723,7 @@ meta_prefs_remove_listener (MetaPrefsChangedFunc func,
       MetaPrefsListener *l = tmp->data;
 
       if (l->func == func &&
-          l->data == data)
+          l->data == user_data)
         {
           g_free (l);
           listeners = g_list_delete_link (listeners, tmp);
diff --git a/src/meta/common.h b/src/meta/common.h
index 7bf92f7cf..80fbb09b2 100644
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -87,7 +87,7 @@ typedef void (* MetaWindowMenuFunc) (MetaWindowMenu *menu,
                                      guint32         timestamp,
                                      MetaMenuOp      op,
                                      int             workspace,
-                                     gpointer        data);
+                                     gpointer        user_data);
 
 /* when changing this enum, there are various switch statements
  * you have to update
diff --git a/src/meta/prefs.h b/src/meta/prefs.h
index ff6984cc2..f480f5892 100644
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -71,12 +71,12 @@ typedef enum
 } MetaPreference;
 
 typedef void (* MetaPrefsChangedFunc) (MetaPreference pref,
-                                       gpointer       data);
+                                       gpointer       user_data);
 
 void meta_prefs_add_listener    (MetaPrefsChangedFunc func,
-                                 gpointer             data);
+                                 gpointer             user_data);
 void meta_prefs_remove_listener (MetaPrefsChangedFunc func,
-                                 gpointer             data);
+                                 gpointer             user_data);
 
 void meta_prefs_init (void);
 
diff --git a/src/meta/window.h b/src/meta/window.h
index 48ce79a3d..f36c033ef 100644
--- a/src/meta/window.h
+++ b/src/meta/window.h
@@ -128,7 +128,7 @@ gboolean meta_window_is_ancestor_of_transient (MetaWindow            *window,
                                                MetaWindow            *transient);
 
 typedef gboolean (*MetaWindowForeachFunc) (MetaWindow *window,
-                                           void       *data);
+                                           void       *user_data);
 
 void     meta_window_foreach_transient        (MetaWindow            *window,
                                                MetaWindowForeachFunc  func,