commit 56885a2439081d03f081678cc6824f18c8d7b039
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Sat Aug 27 12:54:37 2011 +0100
Allow broadcasting of all types of preference
* gtkpod_app_iface.*
* broadcast preference changed function assumed the data type of the value
is gint. Some preferences are strings etc. so need to modify.
libgtkpod/gtkpod_app_iface.c | 3 +--
libgtkpod/gtkpod_app_iface.h | 2 +-
plugins/cover_display/cover_display_preferences.c | 2 +-
plugins/cover_display/display_coverart.c | 2 +-
plugins/playlist_display/display_playlists.c | 4 ++--
plugins/playlist_display/display_playlists.h | 2 +-
.../playlist_display_preferences.c | 4 ++--
plugins/sorttab_display/display_sorttabs.c | 4 ++--
.../sorttab_display/sorttab_display_preferences.c | 2 +-
plugins/track_display/display_tracks.c | 2 +-
plugins/track_display/display_tracks.h | 2 +-
plugins/track_display/track_display_preferences.c | 2 +-
12 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/libgtkpod/gtkpod_app_iface.c b/libgtkpod/gtkpod_app_iface.c
index 85057c1..6c579e1 100644
--- a/libgtkpod/gtkpod_app_iface.c
+++ b/libgtkpod/gtkpod_app_iface.c
@@ -414,8 +414,7 @@ void gtkpod_notify_data_unchanged(iTunesDB *itdb) {
g_signal_emit(gtkpod_app, gtkpod_app_signals[ITDB_DATA_SAVED], 0, itdb);
}
-
-void gtkpod_broadcast_preference_change(gchar *preference_name, gint value) {
+void gtkpod_broadcast_preference_change(gchar *preference_name, gpointer
value) {
g_return_if_fail (GTKPOD_IS_APP(gtkpod_app));
g_return_if_fail (preference_name);
diff --git a/libgtkpod/gtkpod_app_iface.h b/libgtkpod/gtkpod_app_iface.h
index afb67a5..9da414e 100644
--- a/libgtkpod/gtkpod_app_iface.h
+++ b/libgtkpod/gtkpod_app_iface.h
@@ -203,7 +203,7 @@ void gtkpod_track_updated(Track *track);
void gtkpod_set_sort_enablement(gboolean enable);
gboolean gtkpod_get_sort_enablement();
-void gtkpod_broadcast_preference_change(gchar *preference_name, gint value);
+void gtkpod_broadcast_preference_change(gchar *preference_name, gpointer
value);
void gtkpod_register_exporter(Exporter *exporter);
void gtkpod_unregister_exporter();
diff --git a/plugins/cover_display/cover_display_preferences.c
b/plugins/cover_display/cover_display_preferences.c
index bd48df0..d4f817c 100644
--- a/plugins/cover_display/cover_display_preferences.c
+++ b/plugins/cover_display/cover_display_preferences.c
@@ -79,7 +79,7 @@ G_MODULE_EXPORT void on_cad_none_toggled(GtkToggleButton
*togglebutton, gpointer
G_MODULE_EXPORT void on_cad_sort_case_sensitive_toggled(GtkToggleButton
*togglebutton, gpointer user_data) {
gboolean val = gtk_toggle_button_get_active(togglebutton);
prefs_set_int("cad_case_sensitive", val);
- gtkpod_broadcast_preference_change("cad_case_sensitive", val);
+ gtkpod_broadcast_preference_change("cad_case_sensitive", &val);
}
GtkWidget *init_cover_preferences(gchar *gladepath) {
diff --git a/plugins/cover_display/display_coverart.c
b/plugins/cover_display/display_coverart.c
index fe563c9..c797dff 100644
--- a/plugins/cover_display/display_coverart.c
+++ b/plugins/cover_display/display_coverart.c
@@ -603,7 +603,7 @@ void coverart_display_update(gboolean clear_track_list) {
void coverart_display_sort(gint order) {
prefs_set_int("cad_sort", order);
coverart_display_update(TRUE);
- gtkpod_broadcast_preference_change("cad_sort", order);
+ gtkpod_broadcast_preference_change("cad_sort", &order);
}
/**
diff --git a/plugins/playlist_display/display_playlists.c
b/plugins/playlist_display/display_playlists.c
index 6004f3b..951b9da 100644
--- a/plugins/playlist_display/display_playlists.c
+++ b/plugins/playlist_display/display_playlists.c
@@ -2132,10 +2132,10 @@ void playlist_display_playlist_removed_cb(GtkPodApp
*app, gpointer pl, gpointer
pm_remove_playlist(old_playlist, TRUE);
}
-void playlist_display_preference_changed_cb(GtkPodApp *app, gpointer pfname,
gint32 value, gpointer data) {
+void playlist_display_preference_changed_cb(GtkPodApp *app, gpointer pfname,
gpointer value, gpointer data) {
gchar *pref_name = pfname;
if (g_str_equal(pref_name, "pm_sort"))
- pm_sort(value);
+ pm_sort((GtkSortType) value);
else if (g_str_equal(pref_name, "pm_case_sensitive")) {
gint val = prefs_get_int("pm_sort");
pm_sort((GtkSortType) val);
diff --git a/plugins/playlist_display/display_playlists.h
b/plugins/playlist_display/display_playlists.h
index 2bfe5a9..e78f68f 100644
--- a/plugins/playlist_display/display_playlists.h
+++ b/plugins/playlist_display/display_playlists.h
@@ -62,7 +62,7 @@ void playlist_display_select_playlist_cb (GtkPodApp *app,
gpointer pl, gpointer
void playlist_display_playlist_added_cb(GtkPodApp *app, gpointer pl, gint32
pos, gpointer data);
void playlist_display_playlist_removed_cb(GtkPodApp *app, gpointer pl,
gpointer data);
void playlist_display_track_removed_cb(GtkPodApp *app, gpointer tk, gpointer
data);
-void playlist_display_preference_changed_cb(GtkPodApp *app, gpointer pfname,
gint32 value, gpointer data);
+void playlist_display_preference_changed_cb(GtkPodApp *app, gpointer pfname,
gpointer value, gpointer data);
void playlist_display_itdb_data_changed_cb(GtkPodApp *app, gpointer itdb,
gpointer data);
#endif /* __DISPLAY_PLAYLIST_H__ */
diff --git a/plugins/playlist_display/playlist_display_preferences.c
b/plugins/playlist_display/playlist_display_preferences.c
index 913555d..3f69505 100644
--- a/plugins/playlist_display/playlist_display_preferences.c
+++ b/plugins/playlist_display/playlist_display_preferences.c
@@ -38,7 +38,7 @@ static GtkWidget *notebook = NULL;
static void set_pm_sort(gint val) {
prefs_set_int("pm_sort", val);
- gtkpod_broadcast_preference_change("pm_sort", val);
+ gtkpod_broadcast_preference_change("pm_sort", &val);
}
G_MODULE_EXPORT void on_pm_ascend_toggled(GtkToggleButton *togglebutton,
gpointer user_data) {
@@ -59,7 +59,7 @@ G_MODULE_EXPORT void on_pm_none_toggled(GtkToggleButton
*togglebutton, gpointer
G_MODULE_EXPORT void on_pm_sort_case_sensitive_toggled(GtkToggleButton
*togglebutton, gpointer user_data) {
gboolean val = gtk_toggle_button_get_active(togglebutton);
prefs_set_int("pm_case_sensitive", val);
- gtkpod_broadcast_preference_change("pm_case_sensitive", val);
+ gtkpod_broadcast_preference_change("pm_case_sensitive", &val);
}
GtkWidget *init_playlist_display_preferences() {
diff --git a/plugins/sorttab_display/display_sorttabs.c
b/plugins/sorttab_display/display_sorttabs.c
index 66374a9..87ec764 100644
--- a/plugins/sorttab_display/display_sorttabs.c
+++ b/plugins/sorttab_display/display_sorttabs.c
@@ -1059,7 +1059,7 @@ static void st_free_entry_cb(gpointer data, gpointer
user_data) {
void st_remove_all_entries_from_model(guint32 inst) {
SortTab *st = sorttab[inst];
gint column;
- GtkSortType order;
+ enum GtkPodSortTypes order;
if (st) {
if (st->current_entry) {
@@ -1789,7 +1789,7 @@ void st_sort(gint order) {
st_sort_inst(i, order);
prefs_set_int("st_sort", order);
- gtkpod_broadcast_preference_change("st_sort", order);
+ gtkpod_broadcast_preference_change("st_sort", &order);
}
gint st_get_sorttab_page_number(int inst) {
diff --git a/plugins/sorttab_display/sorttab_display_preferences.c
b/plugins/sorttab_display/sorttab_display_preferences.c
index 6810c2e..edbddb7 100644
--- a/plugins/sorttab_display/sorttab_display_preferences.c
+++ b/plugins/sorttab_display/sorttab_display_preferences.c
@@ -72,7 +72,7 @@ G_MODULE_EXPORT void on_st_none_toggled(GtkToggleButton
*togglebutton, gpointer
G_MODULE_EXPORT void on_st_sort_case_sensitive_toggled(GtkToggleButton
*togglebutton, gpointer user_data) {
gboolean val = gtk_toggle_button_get_active(togglebutton);
prefs_set_int("st_case_sensitive", val);
- gtkpod_broadcast_preference_change("st_case_sensitive", val);
+ gtkpod_broadcast_preference_change("st_case_sensitive", &val);
}
GtkWidget *init_sorttab_preferences() {
diff --git a/plugins/track_display/display_tracks.c
b/plugins/track_display/display_tracks.c
index 1945309..5c733be 100644
--- a/plugins/track_display/display_tracks.c
+++ b/plugins/track_display/display_tracks.c
@@ -2417,7 +2417,7 @@ void track_display_track_updated_cb(GtkPodApp *app,
gpointer tk, gpointer data)
tm_track_changed(track);
}
-void track_display_preference_changed_cb(GtkPodApp *app, gpointer pfname,
gint32 value, gpointer data) {
+void track_display_preference_changed_cb(GtkPodApp *app, gpointer pfname,
gpointer value, gpointer data) {
gchar *pref_name = pfname;
if (g_str_equal(pref_name, "tm_sort")) {
tm_sort_counter(-1);
diff --git a/plugins/track_display/display_tracks.h
b/plugins/track_display/display_tracks.h
index 6a65577..37fc212 100644
--- a/plugins/track_display/display_tracks.h
+++ b/plugins/track_display/display_tracks.h
@@ -49,7 +49,7 @@ void track_display_set_playlist_cb(GtkPodApp *app, gpointer
pl, gpointer data);
void track_display_set_sort_enablement(GtkPodApp *app, gboolean flag, gpointer
data);
void track_display_track_removed_cb(GtkPodApp *app, gpointer tk, gint32 pos,
gpointer data);
void track_display_track_updated_cb(GtkPodApp *app, gpointer tk, gpointer
data);
-void track_display_preference_changed_cb(GtkPodApp *app, gpointer pfname,
gint32 value, gpointer data);
+void track_display_preference_changed_cb(GtkPodApp *app, gpointer pfname,
gpointer value, gpointer data);
void track_display_tracks_reordered_cb(GtkPodApp *app, gpointer data);
void on_search_entry_changed(GtkEditable *editable, gpointer user_data);
diff --git a/plugins/track_display/track_display_preferences.c
b/plugins/track_display/track_display_preferences.c
index a754b96..db2f263 100644
--- a/plugins/track_display/track_display_preferences.c
+++ b/plugins/track_display/track_display_preferences.c
@@ -416,7 +416,7 @@ static void populate_track_cmd_combo(GtkComboBox *combo) {
G_MODULE_EXPORT void on_tm_sort_case_sensitive_toggled(GtkToggleButton
*togglebutton, gpointer user_data) {
gboolean val = gtk_toggle_button_get_active(togglebutton);
prefs_set_int("tm_case_sensitive", val);
- gtkpod_broadcast_preference_change("tm_case_sensitive", val);
+ gtkpod_broadcast_preference_change("tm_case_sensitive", &val);
}
GtkWidget *init_track_display_preferences() {
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
