[rhythmbox] audioscrobbler: remove namespace prefixes for static method names
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] audioscrobbler: remove namespace prefixes for static method names
- Date: Tue, 21 Sep 2010 10:52:47 +0000 (UTC)
commit 612fb5ef528d663f1452c7a768ddb663f533759d
Author: Jamie Nicol <jamie thenicols net>
Date: Mon Jul 19 14:25:46 2010 +0100
audioscrobbler: remove namespace prefixes for static method names
plugins/audioscrobbler/audioscrobbler-profile.ui | 16 +-
plugins/audioscrobbler/rb-audioscrobbler-account.c | 66 ++--
.../rb-audioscrobbler-profile-source.c | 403 ++++++++++----------
.../rb-audioscrobbler-radio-source.c | 103 +++---
plugins/audioscrobbler/rb-audioscrobbler-user.c | 360 +++++++++---------
5 files changed, 470 insertions(+), 478 deletions(-)
---
diff --git a/plugins/audioscrobbler/audioscrobbler-profile.ui b/plugins/audioscrobbler/audioscrobbler-profile.ui
index 6243cb0..050d07e 100644
--- a/plugins/audioscrobbler/audioscrobbler-profile.ui
+++ b/plugins/audioscrobbler/audioscrobbler-profile.ui
@@ -75,7 +75,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">half</property>
- <signal name="clicked" handler="rb_audioscrobbler_profile_source_logout_button_clicked_cb"/>
+ <signal name="clicked" handler="logout_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
@@ -143,7 +143,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="rb_audioscrobbler_profile_source_scrobbling_enabled_check_toggled_cb"/>
+ <signal name="toggled" handler="scrobbling_enabled_check_toggled_cb"/>
</object>
</child>
</object>
@@ -384,7 +384,7 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <signal name="clicked" handler="rb_audioscrobbler_profile_source_station_creator_button_clicked_cb"/>
+ <signal name="clicked" handler="station_creator_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
@@ -441,7 +441,7 @@
<property name="visible">True</property>
<property name="width">0</property>
<property name="height">0</property>
- <signal name="size_allocate" handler="rb_audioscrobbler_profile_source_list_layout_size_allocate_cb"/>
+ <signal name="size_allocate" handler="list_layout_size_allocate_cb"/>
<child>
<object class="GtkTable" id="recent_tracks_table">
<property name="visible">True</property>
@@ -522,7 +522,7 @@
<property name="visible">True</property>
<property name="width">0</property>
<property name="height">0</property>
- <signal name="size_allocate" handler="rb_audioscrobbler_profile_source_list_layout_size_allocate_cb"/>
+ <signal name="size_allocate" handler="list_layout_size_allocate_cb"/>
<child>
<object class="GtkTable" id="top_artists_table">
<property name="visible">True</property>
@@ -603,7 +603,7 @@
<property name="visible">True</property>
<property name="width">0</property>
<property name="height">0</property>
- <signal name="size_allocate" handler="rb_audioscrobbler_profile_source_list_layout_size_allocate_cb"/>
+ <signal name="size_allocate" handler="list_layout_size_allocate_cb"/>
<child>
<object class="GtkTable" id="recommended_artists_table">
<property name="visible">True</property>
@@ -684,7 +684,7 @@
<property name="visible">True</property>
<property name="width">0</property>
<property name="height">0</property>
- <signal name="size_allocate" handler="rb_audioscrobbler_profile_source_list_layout_size_allocate_cb"/>
+ <signal name="size_allocate" handler="list_layout_size_allocate_cb"/>
<child>
<object class="GtkTable" id="top_tracks_table">
<property name="visible">True</property>
@@ -765,7 +765,7 @@
<property name="visible">True</property>
<property name="width">0</property>
<property name="height">0</property>
- <signal name="size_allocate" handler="rb_audioscrobbler_profile_source_list_layout_size_allocate_cb"/>
+ <signal name="size_allocate" handler="list_layout_size_allocate_cb"/>
<child>
<object class="GtkTable" id="loved_tracks_table">
<property name="visible">True</property>
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-account.c b/plugins/audioscrobbler/rb-audioscrobbler-account.c
index 719661a..24929d4 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-account.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-account.c
@@ -81,19 +81,19 @@ static void rb_audioscrobbler_account_set_property (GObject *object,
GParamSpec *pspec);
/* load/save session to file to avoid having to reauthenticate */
-static void rb_audioscrobbler_account_load_session_settings (RBAudioscrobblerAccount *account);
-static void rb_audioscrobbler_account_save_session_settings (RBAudioscrobblerAccount *account);
+static void load_session_settings (RBAudioscrobblerAccount *account);
+static void save_session_settings (RBAudioscrobblerAccount *account);
/* private functions used in authentication process */
-static void rb_audioscrobbler_account_cancel_session (RBAudioscrobblerAccount *account);
-static void rb_audioscrobbler_account_request_token (RBAudioscrobblerAccount *account);
-static void rb_audioscrobbler_account_got_token_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
-static gboolean rb_audioscrobbler_account_request_session_key_timeout_cb (gpointer user_data);
-static void rb_audioscrobbler_account_got_session_key_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
+static void cancel_session (RBAudioscrobblerAccount *account);
+static void request_token (RBAudioscrobblerAccount *account);
+static void got_token_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
+static gboolean request_session_key_timeout_cb (gpointer user_data);
+static void got_session_key_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
enum
{
PROP_0,
@@ -208,7 +208,7 @@ rb_audioscrobbler_account_constructed (GObject *object)
RB_CHAIN_GOBJECT_METHOD (rb_audioscrobbler_account_parent_class, constructed, object);
account = RB_AUDIOSCROBBLER_ACCOUNT (object);
- rb_audioscrobbler_account_load_session_settings (account);
+ load_session_settings (account);
}
static void
@@ -307,7 +307,7 @@ rb_audioscrobbler_account_get_login_status (RBAudioscrobblerAccount *account)
}
static void
-rb_audioscrobbler_account_load_session_settings (RBAudioscrobblerAccount *account)
+load_session_settings (RBAudioscrobblerAccount *account)
{
/* Attempt to load the saved session */
const char *rb_data_dir;
@@ -359,7 +359,7 @@ rb_audioscrobbler_account_load_session_settings (RBAudioscrobblerAccount *accoun
}
static void
-rb_audioscrobbler_account_save_session_settings (RBAudioscrobblerAccount *account)
+save_session_settings (RBAudioscrobblerAccount *account)
{
/* Save the current session */
const char *rb_data_dir;
@@ -425,14 +425,14 @@ rb_audioscrobbler_account_authenticate (RBAudioscrobblerAccount *account)
}
/* request an authentication token */
- rb_audioscrobbler_account_request_token (account);
+ request_token (account);
}
void
rb_audioscrobbler_account_logout (RBAudioscrobblerAccount *account)
{
- rb_audioscrobbler_account_cancel_session (account);
- rb_audioscrobbler_account_save_session_settings (account);
+ cancel_session (account);
+ save_session_settings (account);
account->priv->login_status = RB_AUDIOSCROBBLER_ACCOUNT_LOGIN_STATUS_LOGGED_OUT;
g_signal_emit (account, rb_audioscrobbler_account_signals[LOGIN_STATUS_CHANGED],
@@ -447,8 +447,8 @@ rb_audioscrobbler_account_notify_of_auth_error (RBAudioscrobblerAccount *account
* radio, etc) to notify us when there is an authentication error
*/
- rb_audioscrobbler_account_cancel_session (account);
- rb_audioscrobbler_account_save_session_settings (account);
+ cancel_session (account);
+ save_session_settings (account);
account->priv->login_status = RB_AUDIOSCROBBLER_ACCOUNT_LOGIN_STATUS_AUTH_ERROR;
g_signal_emit (account, rb_audioscrobbler_account_signals[LOGIN_STATUS_CHANGED],
@@ -456,7 +456,7 @@ rb_audioscrobbler_account_notify_of_auth_error (RBAudioscrobblerAccount *account
}
static void
-rb_audioscrobbler_account_cancel_session (RBAudioscrobblerAccount *account)
+cancel_session (RBAudioscrobblerAccount *account)
{
/* cancels the current session, freeing the username,
* session key, auth token. removing timeout callbacks etc.
@@ -479,7 +479,7 @@ rb_audioscrobbler_account_cancel_session (RBAudioscrobblerAccount *account)
}
static void
-rb_audioscrobbler_account_request_token (RBAudioscrobblerAccount *account)
+request_token (RBAudioscrobblerAccount *account)
{
/* requests an authentication token
* first stage of the authentication process
@@ -521,7 +521,7 @@ rb_audioscrobbler_account_request_token (RBAudioscrobblerAccount *account)
rb_debug ("requesting authorisation token");
soup_session_queue_message (account->priv->soup_session,
msg,
- rb_audioscrobbler_account_got_token_cb,
+ got_token_cb,
account);
/* update status */
@@ -538,9 +538,7 @@ rb_audioscrobbler_account_request_token (RBAudioscrobblerAccount *account)
}
static void
-rb_audioscrobbler_account_got_token_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+got_token_cb (SoupSession *session, SoupMessage *msg, gpointer user_data)
{
/* parses the authentication token from the response
*/
@@ -577,7 +575,7 @@ rb_audioscrobbler_account_got_token_cb (SoupSession *session,
/* add timeout which will ask for session key */
account->priv->session_key_timeout_id =
g_timeout_add_seconds (SESSION_KEY_REQUEST_TIMEOUT,
- rb_audioscrobbler_account_request_session_key_timeout_cb,
+ request_session_key_timeout_cb,
account);
g_strfreev (pre_split);
@@ -589,7 +587,7 @@ rb_audioscrobbler_account_got_token_cb (SoupSession *session,
/* failed. report connection error */
rb_debug ("connection error attempting to retrieve auth token");
- rb_audioscrobbler_account_cancel_session (account);
+ cancel_session (account);
account->priv->login_status = RB_AUDIOSCROBBLER_ACCOUNT_LOGIN_STATUS_CONNECTION_ERROR;
g_signal_emit (account, rb_audioscrobbler_account_signals[LOGIN_STATUS_CHANGED],
@@ -598,7 +596,7 @@ rb_audioscrobbler_account_got_token_cb (SoupSession *session,
}
static gboolean
-rb_audioscrobbler_account_request_session_key_timeout_cb (gpointer user_data)
+request_session_key_timeout_cb (gpointer user_data)
{
/* Periodically sends a request for the session key */
RBAudioscrobblerAccount *account;
@@ -638,7 +636,7 @@ rb_audioscrobbler_account_request_session_key_timeout_cb (gpointer user_data)
rb_debug ("requesting session key");
soup_session_queue_message (account->priv->soup_session,
msg,
- rb_audioscrobbler_account_got_session_key_cb,
+ got_session_key_cb,
account);
g_free (api_url);
@@ -652,9 +650,7 @@ rb_audioscrobbler_account_request_session_key_timeout_cb (gpointer user_data)
}
static void
-rb_audioscrobbler_account_got_session_key_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+got_session_key_cb (SoupSession *session, SoupMessage *msg, gpointer user_data)
{
/* parses the session details from the response.
* if successful then authentication is complete.
@@ -672,7 +668,7 @@ rb_audioscrobbler_account_got_session_key_cb (SoupSession *session,
char **post_split;
/* cancel the old session (and remove timeout) */
- rb_audioscrobbler_account_cancel_session (account);
+ cancel_session (account);
/* parse the username */
pre_split = g_strsplit (msg->response_body->data, "<name>", -1);
@@ -692,7 +688,7 @@ rb_audioscrobbler_account_got_session_key_cb (SoupSession *session,
rb_debug ("granted session key \"%s\" for user \"%s",
account->priv->session_key,
account->priv->username);
- rb_audioscrobbler_account_save_session_settings (account);
+ save_session_settings (account);
/* update status */
account->priv->login_status = RB_AUDIOSCROBBLER_ACCOUNT_LOGIN_STATUS_LOGGED_IN;
@@ -726,7 +722,7 @@ rb_audioscrobbler_account_got_session_key_cb (SoupSession *session,
/* connection error */
rb_debug ("connection error attempting to retrieve session key");
- rb_audioscrobbler_account_cancel_session (account);
+ cancel_session (account);
account->priv->login_status = RB_AUDIOSCROBBLER_ACCOUNT_LOGIN_STATUS_CONNECTION_ERROR;
g_signal_emit (account, rb_audioscrobbler_account_signals[LOGIN_STATUS_CHANGED],
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-profile-source.c b/plugins/audioscrobbler/rb-audioscrobbler-profile-source.c
index 7c6cbf1..84c3269 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-profile-source.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-profile-source.c
@@ -125,101 +125,97 @@ static void rb_audioscrobbler_profile_source_set_property (GObject *object,
GParamSpec *pspec);
/* UI initialisation functions */
-static void rb_audioscrobbler_profile_source_init_login_ui (RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_init_profile_ui (RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_init_actions (RBAudioscrobblerProfileSource *source);
+static void init_login_ui (RBAudioscrobblerProfileSource *source);
+static void init_profile_ui (RBAudioscrobblerProfileSource *source);
+static void init_actions (RBAudioscrobblerProfileSource *source);
/* login related callbacks */
-static void rb_audioscrobbler_profile_source_login_bar_response (GtkInfoBar *info_bar,
- gint response_id,
- RBAudioscrobblerProfileSource *source);
-void rb_audioscrobbler_profile_source_logout_button_clicked_cb (GtkButton *button,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_login_status_change_cb (RBAudioscrobblerAccount *account,
- RBAudioscrobblerAccountLoginStatus status,
- RBAudioscrobblerProfileSource *source);
+static void login_bar_response_cb (GtkInfoBar *info_bar,
+ gint response_id,
+ RBAudioscrobblerProfileSource *source);
+void logout_button_clicked_cb (GtkButton *button, RBAudioscrobblerProfileSource *source);
+static void login_status_change_cb (RBAudioscrobblerAccount *account,
+ RBAudioscrobblerAccountLoginStatus status,
+ RBAudioscrobblerProfileSource *source);
/* scrobbling enabled preference */
-void rb_audioscrobbler_profile_source_scrobbling_enabled_check_toggled_cb (GtkToggleButton *togglebutton,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_scrobbling_enabled_changed_cb (GConfClient *client,
- guint cnxn_id,
- GConfEntry *entry,
- RBAudioscrobblerProfileSource *source);
+void scrobbling_enabled_check_toggled_cb (GtkToggleButton *togglebutton,
+ RBAudioscrobblerProfileSource *source);
+static void scrobbling_enabled_changed_cb (GConfClient *client,
+ guint cnxn_id,
+ GConfEntry *entry,
+ RBAudioscrobblerProfileSource *source);
/* callbacks from scrobbler object */
-static void rb_audioscrobbler_profile_source_scrobbler_authentication_error_cb (RBAudioscrobbler *audioscrobbler,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_scrobbler_statistics_changed_cb (RBAudioscrobbler *audioscrobbler,
- const char *status_msg,
- guint queue_count,
- guint submit_count,
- const char *submit_time,
- RBAudioscrobblerProfileSource *source);
-
-static void rb_audioscrobbler_profile_source_playing_song_changed_cb (RBShellPlayer *player,
- RhythmDBEntry *entry,
- RBAudioscrobblerProfileSource *source);
+static void scrobbler_authentication_error_cb (RBAudioscrobbler *audioscrobbler,
+ RBAudioscrobblerProfileSource *source);
+static void scrobbler_statistics_changed_cb (RBAudioscrobbler *audioscrobbler,
+ const char *status_msg,
+ guint queue_count,
+ guint submit_count,
+ const char *submit_time,
+ RBAudioscrobblerProfileSource *source);
+
+static void playing_song_changed_cb (RBShellPlayer *player,
+ RhythmDBEntry *entry,
+ RBAudioscrobblerProfileSource *source);
/* GtkAction callbacks */
-static void rb_audioscrobbler_profile_source_love_track_action_cb (GtkAction *action,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_ban_track_action_cb (GtkAction *action,
- RBAudioscrobblerProfileSource *source);
+static void love_track_action_cb (GtkAction *action, RBAudioscrobblerProfileSource *source);
+static void ban_track_action_cb (GtkAction *action, RBAudioscrobblerProfileSource *source);
/* radio station creation/deletion */
-void rb_audioscrobbler_profile_source_station_creator_button_clicked_cb (GtkButton *button,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_load_radio_stations (RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_save_radio_stations (RBAudioscrobblerProfileSource *source);
-static RBSource *rb_audioscrobbler_profile_source_add_radio_station (RBAudioscrobblerProfileSource *source,
- const char *url,
- const char *name);
-static void rb_audioscrobbler_profile_source_radio_station_name_changed_cb (RBAudioscrobblerRadioSource *radio,
- GParamSpec *spec,
- RBAudioscrobblerProfileSource *source);
+void station_creator_button_clicked_cb (GtkButton *button, RBAudioscrobblerProfileSource *source);
+static void load_radio_stations (RBAudioscrobblerProfileSource *source);
+static void save_radio_stations (RBAudioscrobblerProfileSource *source);
+static RBSource *add_radio_station (RBAudioscrobblerProfileSource *source,
+ const char *url,
+ const char *name);
+static void radio_station_name_changed_cb (RBAudioscrobblerRadioSource *radio,
+ GParamSpec *spec,
+ RBAudioscrobblerProfileSource *source);
/* callbacks from user profile data requests */
-static void rb_audioscrobbler_profile_source_user_info_updated_cb (RBAudioscrobblerUser *user,
- RBAudioscrobblerUserData *info,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_recent_tracks_updated_cb (RBAudioscrobblerUser *user,
- GPtrArray *recent_tracks,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_top_tracks_updated_cb (RBAudioscrobblerUser *user,
- GPtrArray *top_tracks,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_loved_tracks_updated_cb (RBAudioscrobblerUser *user,
- GPtrArray *loved_tracks,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_top_artists_updated_cb (RBAudioscrobblerUser *user,
- GPtrArray *top_artists,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_recommended_artists_updated_cb (RBAudioscrobblerUser *user,
- GPtrArray *recommended_artists,
- RBAudioscrobblerProfileSource *source);
+static void user_info_updated_cb (RBAudioscrobblerUser *user,
+ RBAudioscrobblerUserData *info,
+ RBAudioscrobblerProfileSource *source);
+static void recent_tracks_updated_cb (RBAudioscrobblerUser *user,
+ GPtrArray *recent_tracks,
+ RBAudioscrobblerProfileSource *source);
+static void top_tracks_updated_cb (RBAudioscrobblerUser *user,
+ GPtrArray *top_tracks,
+ RBAudioscrobblerProfileSource *source);
+static void loved_tracks_updated_cb (RBAudioscrobblerUser *user,
+ GPtrArray *loved_tracks,
+ RBAudioscrobblerProfileSource *source);
+static void top_artists_updated_cb (RBAudioscrobblerUser *user,
+ GPtrArray *top_artists,
+ RBAudioscrobblerProfileSource *source);
+static void recommended_artists_updated_cb (RBAudioscrobblerUser *user,
+ GPtrArray *recommended_artists,
+ RBAudioscrobblerProfileSource *source);
/* UI creation for profile data lists, eg top artists, loved tracks */
-static void rb_audioscrobbler_profile_source_set_user_list (RBAudioscrobblerProfileSource *source,
- GtkWidget *list_table,
- GPtrArray *list_data);
-static GtkWidget *rb_audioscrobbler_profile_source_create_list_button (RBAudioscrobblerProfileSource *source,
- RBAudioscrobblerUserData *data);
-static GtkWidget *rb_audioscrobbler_profile_source_create_popup_menu (RBAudioscrobblerProfileSource *source,
- RBAudioscrobblerUserData *data);
-static void rb_audioscrobbler_profile_source_list_table_pack_start (GtkTable *list_table, GtkWidget *item);
-void rb_audioscrobbler_profile_source_list_layout_size_allocate_cb (GtkWidget *layout,
- GtkAllocation *allocation,
- gpointer user_data);
+static void set_user_list (RBAudioscrobblerProfileSource *source,
+ GtkWidget *list_table,
+ GPtrArray *list_data);
+static GtkWidget *create_list_button (RBAudioscrobblerProfileSource *source,
+ RBAudioscrobblerUserData *data);
+static GtkWidget *create_popup_menu (RBAudioscrobblerProfileSource *source,
+ RBAudioscrobblerUserData *data);
+static void list_table_pack_start (GtkTable *list_table, GtkWidget *item);
+void list_layout_size_allocate_cb (GtkWidget *layout,
+ GtkAllocation *allocation,
+ gpointer user_data);
/* callbacks from data list buttons and related popup menus */
-static void rb_audioscrobbler_profile_source_list_item_clicked_cb (GtkButton *button, RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_list_item_view_url_activated_cb (GtkMenuItem *menuitem,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_list_item_listen_similar_artists_activated_cb (GtkMenuItem *menuitem,
- RBAudioscrobblerProfileSource *source);
-static void rb_audioscrobbler_profile_source_list_item_listen_top_fans_activated_cb (GtkMenuItem *menuitem,
- RBAudioscrobblerProfileSource *source);
+static void list_item_clicked_cb (GtkButton *button, RBAudioscrobblerProfileSource *source);
+static void list_item_view_url_activated_cb (GtkMenuItem *menuitem,
+ RBAudioscrobblerProfileSource *source);
+static void list_item_listen_similar_artists_activated_cb (GtkMenuItem *menuitem,
+ RBAudioscrobblerProfileSource *source);
+static void list_item_listen_top_fans_activated_cb (GtkMenuItem *menuitem,
+ RBAudioscrobblerProfileSource *source);
/* RBSource implementations */
static GList *impl_get_ui_actions (RBSource *asource);
@@ -320,7 +316,7 @@ rb_audioscrobbler_profile_source_constructed (GObject *object)
g_signal_connect_object (rb_shell_get_player (shell),
"playing-song-changed",
- G_CALLBACK (rb_audioscrobbler_profile_source_playing_song_changed_cb),
+ G_CALLBACK (playing_song_changed_cb),
source, 0);
/* create the UI */
@@ -328,53 +324,53 @@ rb_audioscrobbler_profile_source_constructed (GObject *object)
gtk_box_pack_start (GTK_BOX (source), source->priv->main_vbox, TRUE, TRUE, 0);
gtk_widget_show (source->priv->main_vbox);
- rb_audioscrobbler_profile_source_init_login_ui (source);
- rb_audioscrobbler_profile_source_init_profile_ui (source);
- rb_audioscrobbler_profile_source_init_actions (source);
+ init_login_ui (source);
+ init_profile_ui (source);
+ init_actions (source);
/* create the user */
source->priv->user = rb_audioscrobbler_user_new (source->priv->service);
g_signal_connect (source->priv->user,
"user-info-updated",
- (GCallback)rb_audioscrobbler_profile_source_user_info_updated_cb,
+ G_CALLBACK (user_info_updated_cb),
source);
g_signal_connect (source->priv->user,
"recent-tracks-updated",
- (GCallback)rb_audioscrobbler_profile_source_recent_tracks_updated_cb,
+ G_CALLBACK (recent_tracks_updated_cb),
source);
g_signal_connect (source->priv->user,
"top-tracks-updated",
- (GCallback)rb_audioscrobbler_profile_source_top_tracks_updated_cb,
+ G_CALLBACK (top_tracks_updated_cb),
source);
g_signal_connect (source->priv->user,
"loved-tracks-updated",
- (GCallback)rb_audioscrobbler_profile_source_loved_tracks_updated_cb,
+ G_CALLBACK (loved_tracks_updated_cb),
source);
g_signal_connect (source->priv->user,
"top-artists-updated",
- (GCallback)rb_audioscrobbler_profile_source_top_artists_updated_cb,
+ G_CALLBACK (top_artists_updated_cb),
source);
g_signal_connect (source->priv->user,
"recommended-artists-updated",
- (GCallback)rb_audioscrobbler_profile_source_recommended_artists_updated_cb,
+ G_CALLBACK (recommended_artists_updated_cb),
source);
/* create the account */
source->priv->account = rb_audioscrobbler_account_new (source->priv->service);
g_signal_connect (source->priv->account,
"login-status-changed",
- (GCallback)rb_audioscrobbler_profile_source_login_status_change_cb,
+ (GCallback)login_status_change_cb,
source);
- rb_audioscrobbler_profile_source_login_status_change_cb (source->priv->account,
- rb_audioscrobbler_account_get_login_status (source->priv->account),
- source);
+ login_status_change_cb (source->priv->account,
+ rb_audioscrobbler_account_get_login_status (source->priv->account),
+ source);
/* scrobbling enabled gconf stuff */
scrobbling_enabled_conf_key = g_strdup_printf (CONF_AUDIOSCROBBLER_ENABLE_SCROBBLING,
rb_audioscrobbler_service_get_name (source->priv->service));
source->priv->scrobbling_enabled_notification_id =
eel_gconf_notification_add (scrobbling_enabled_conf_key,
- (GConfClientNotifyFunc) rb_audioscrobbler_profile_source_scrobbling_enabled_changed_cb,
+ (GConfClientNotifyFunc) scrobbling_enabled_changed_cb,
source);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (source->priv->scrobbling_enabled_check),
eel_gconf_get_boolean (scrobbling_enabled_conf_key));
@@ -472,7 +468,7 @@ rb_audioscrobbler_profile_source_set_property (GObject *object,
}
static void
-rb_audioscrobbler_profile_source_init_login_ui (RBAudioscrobblerProfileSource *source)
+init_login_ui (RBAudioscrobblerProfileSource *source)
{
GtkWidget *content_area;
@@ -486,13 +482,13 @@ rb_audioscrobbler_profile_source_init_login_ui (RBAudioscrobblerProfileSource *s
"", GTK_RESPONSE_OK);
g_signal_connect (source->priv->login_bar,
"response",
- G_CALLBACK (rb_audioscrobbler_profile_source_login_bar_response),
+ G_CALLBACK (login_bar_response_cb),
source);
gtk_box_pack_start (GTK_BOX (source->priv->main_vbox), source->priv->login_bar, FALSE, FALSE, 0);
}
static void
-rb_audioscrobbler_profile_source_init_profile_ui (RBAudioscrobblerProfileSource *source)
+init_profile_ui (RBAudioscrobblerProfileSource *source)
{
RBPlugin *plugin;
char *builder_file;
@@ -531,6 +527,7 @@ rb_audioscrobbler_profile_source_init_profile_ui (RBAudioscrobblerProfileSource
rb_audioscrobbler_radio_type_get_text (i));
}
gtk_combo_box_set_active (GTK_COMBO_BOX (source->priv->station_creator_type_combo), 0);
+ gtk_widget_show (source->priv->station_creator_type_combo);
/* lists of data */
source->priv->recent_tracks_area = GTK_WIDGET (gtk_builder_get_object (builder, "recent_tracks_area"));
@@ -558,7 +555,7 @@ rb_audioscrobbler_profile_source_init_profile_ui (RBAudioscrobblerProfileSource
}
static void
-rb_audioscrobbler_profile_source_init_actions (RBAudioscrobblerProfileSource *source)
+init_actions (RBAudioscrobblerProfileSource *source)
{
/* Unfortunately we can't use the usual trick of declaring a static array of GtkActionEntry,
* and simply using _rb_source_register_action_group with that array.
@@ -576,10 +573,10 @@ rb_audioscrobbler_profile_source_init_actions (RBAudioscrobblerProfileSource *so
{
{ source->priv->love_action_name, "emblem-favorite", N_("Love"), NULL,
N_("Mark this song as loved"),
- G_CALLBACK (rb_audioscrobbler_profile_source_love_track_action_cb) },
+ G_CALLBACK (love_track_action_cb) },
{ source->priv->ban_action_name, GTK_STOCK_CANCEL, N_("Ban"), NULL,
N_("Ban the current track from being played again"),
- G_CALLBACK (rb_audioscrobbler_profile_source_ban_track_action_cb) },
+ G_CALLBACK (ban_track_action_cb) },
};
source->priv->action_group = _rb_source_register_action_group (RB_SOURCE (source),
@@ -591,9 +588,9 @@ rb_audioscrobbler_profile_source_init_actions (RBAudioscrobblerProfileSource *so
}
static void
-rb_audioscrobbler_profile_source_login_bar_response (GtkInfoBar *info_bar,
- gint response_id,
- RBAudioscrobblerProfileSource *source)
+login_bar_response_cb (GtkInfoBar *info_bar,
+ gint response_id,
+ RBAudioscrobblerProfileSource *source)
{
switch (rb_audioscrobbler_account_get_login_status (source->priv->account)) {
case RB_AUDIOSCROBBLER_ACCOUNT_LOGIN_STATUS_LOGGED_OUT:
@@ -612,16 +609,16 @@ rb_audioscrobbler_profile_source_login_bar_response (GtkInfoBar *info_bar,
}
void
-rb_audioscrobbler_profile_source_logout_button_clicked_cb (GtkButton *button,
- RBAudioscrobblerProfileSource *source)
+logout_button_clicked_cb (GtkButton *button,
+ RBAudioscrobblerProfileSource *source)
{
rb_audioscrobbler_account_logout (source->priv->account);
}
static void
-rb_audioscrobbler_profile_source_login_status_change_cb (RBAudioscrobblerAccount *account,
- RBAudioscrobblerAccountLoginStatus status,
- RBAudioscrobblerProfileSource *source)
+login_status_change_cb (RBAudioscrobblerAccount *account,
+ RBAudioscrobblerAccountLoginStatus status,
+ RBAudioscrobblerProfileSource *source)
{
const char *username;
const char *session_key;
@@ -654,11 +651,11 @@ rb_audioscrobbler_profile_source_login_status_change_cb (RBAudioscrobblerAccount
rb_audioscrobbler_account_get_session_key (source->priv->account));
g_signal_connect (source->priv->audioscrobbler,
"authentication-error",
- (GCallback)rb_audioscrobbler_profile_source_scrobbler_authentication_error_cb,
+ G_CALLBACK (scrobbler_authentication_error_cb),
source);
g_signal_connect (source->priv->audioscrobbler,
"statistics-changed",
- (GCallback)rb_audioscrobbler_profile_source_scrobbler_statistics_changed_cb,
+ G_CALLBACK (scrobbler_statistics_changed_cb),
source);
rb_audioscrobbler_statistics_changed (source->priv->audioscrobbler);
g_object_unref (shell);
@@ -670,7 +667,7 @@ rb_audioscrobbler_profile_source_login_status_change_cb (RBAudioscrobblerAccount
rb_audioscrobbler_user_update (source->priv->user);
}
- rb_audioscrobbler_profile_source_load_radio_stations (source);
+ load_radio_stations (source);
/* update the login ui */
switch (status) {
@@ -730,8 +727,8 @@ rb_audioscrobbler_profile_source_login_status_change_cb (RBAudioscrobblerAccount
}
void
-rb_audioscrobbler_profile_source_scrobbling_enabled_check_toggled_cb (GtkToggleButton *togglebutton,
- RBAudioscrobblerProfileSource *source)
+scrobbling_enabled_check_toggled_cb (GtkToggleButton *togglebutton,
+ RBAudioscrobblerProfileSource *source)
{
char *conf_key;
@@ -743,10 +740,10 @@ rb_audioscrobbler_profile_source_scrobbling_enabled_check_toggled_cb (GtkToggleB
}
static void
-rb_audioscrobbler_profile_source_scrobbling_enabled_changed_cb (GConfClient *client,
- guint cnxn_id,
- GConfEntry *entry,
- RBAudioscrobblerProfileSource *source)
+scrobbling_enabled_changed_cb (GConfClient *client,
+ guint cnxn_id,
+ GConfEntry *entry,
+ RBAudioscrobblerProfileSource *source)
{
gboolean enabled = gconf_value_get_bool (entry->value);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (source->priv->scrobbling_enabled_check),
@@ -767,11 +764,11 @@ rb_audioscrobbler_profile_source_scrobbling_enabled_changed_cb (GConfClient *cli
rb_audioscrobbler_account_get_session_key (source->priv->account));
g_signal_connect (source->priv->audioscrobbler,
"authentication-error",
- (GCallback)rb_audioscrobbler_profile_source_scrobbler_authentication_error_cb,
+ G_CALLBACK (scrobbler_authentication_error_cb),
source);
g_signal_connect (source->priv->audioscrobbler,
"statistics-changed",
- (GCallback)rb_audioscrobbler_profile_source_scrobbler_statistics_changed_cb,
+ G_CALLBACK (scrobbler_statistics_changed_cb),
source);
rb_audioscrobbler_statistics_changed (source->priv->audioscrobbler);
g_object_unref (shell);
@@ -779,19 +776,19 @@ rb_audioscrobbler_profile_source_scrobbling_enabled_changed_cb (GConfClient *cli
}
static void
-rb_audioscrobbler_profile_source_scrobbler_authentication_error_cb (RBAudioscrobbler *audioscrobbler,
- RBAudioscrobblerProfileSource *source)
+scrobbler_authentication_error_cb (RBAudioscrobbler *audioscrobbler,
+ RBAudioscrobblerProfileSource *source)
{
rb_audioscrobbler_account_notify_of_auth_error (source->priv->account);
}
static void
-rb_audioscrobbler_profile_source_scrobbler_statistics_changed_cb (RBAudioscrobbler *audioscrobbler,
- const char *status_msg,
- guint queue_count,
- guint submit_count,
- const char *submit_time,
- RBAudioscrobblerProfileSource *source)
+scrobbler_statistics_changed_cb (RBAudioscrobbler *audioscrobbler,
+ const char *status_msg,
+ guint queue_count,
+ guint submit_count,
+ const char *submit_time,
+ RBAudioscrobblerProfileSource *source)
{
char *queue_count_text;
char *submit_count_text;
@@ -812,9 +809,9 @@ rb_audioscrobbler_profile_source_scrobbler_statistics_changed_cb (RBAudioscrobbl
/* re-enabled the love and ban GtkActions when a new song is played */
static void
-rb_audioscrobbler_profile_source_playing_song_changed_cb (RBShellPlayer *player,
- RhythmDBEntry *entry,
- RBAudioscrobblerProfileSource *source)
+playing_song_changed_cb (RBShellPlayer *player,
+ RhythmDBEntry *entry,
+ RBAudioscrobblerProfileSource *source)
{
GtkAction *action;
@@ -827,8 +824,7 @@ rb_audioscrobbler_profile_source_playing_song_changed_cb (RBShellPlayer *player,
}
static void
-rb_audioscrobbler_profile_source_love_track_action_cb (GtkAction *action,
- RBAudioscrobblerProfileSource *source)
+love_track_action_cb (GtkAction *action, RBAudioscrobblerProfileSource *source)
{
RBShell *shell;
RhythmDBEntry *entry;
@@ -854,8 +850,7 @@ rb_audioscrobbler_profile_source_love_track_action_cb (GtkAction *action,
}
static void
-rb_audioscrobbler_profile_source_ban_track_action_cb (GtkAction *action,
- RBAudioscrobblerProfileSource *source)
+ban_track_action_cb (GtkAction *action, RBAudioscrobblerProfileSource *source)
{
RBShell *shell;
RhythmDBEntry *entry;
@@ -878,8 +873,8 @@ rb_audioscrobbler_profile_source_ban_track_action_cb (GtkAction *action,
}
void
-rb_audioscrobbler_profile_source_station_creator_button_clicked_cb (GtkButton *button,
- RBAudioscrobblerProfileSource *source)
+station_creator_button_clicked_cb (GtkButton *button,
+ RBAudioscrobblerProfileSource *source)
{
const char *arg;
@@ -897,9 +892,7 @@ rb_audioscrobbler_profile_source_station_creator_button_clicked_cb (GtkButton *b
name = g_strdup_printf (rb_audioscrobbler_radio_type_get_default_name (type),
arg);
- rb_audioscrobbler_profile_source_add_radio_station (source,
- url,
- name);
+ add_radio_station (source, url, name);
gtk_entry_set_text (GTK_ENTRY (source->priv->station_creator_arg_entry), "");
@@ -910,7 +903,7 @@ rb_audioscrobbler_profile_source_station_creator_button_clicked_cb (GtkButton *b
/* delete old user's radio sources and load ones for new user */
static void
-rb_audioscrobbler_profile_source_load_radio_stations (RBAudioscrobblerProfileSource *source)
+load_radio_stations (RBAudioscrobblerProfileSource *source)
{
/* destroy existing sources */
while (source->priv->radio_sources != NULL) {
@@ -955,7 +948,7 @@ rb_audioscrobbler_profile_source_load_radio_stations (RBAudioscrobblerProfileSou
url);
source->priv->radio_sources = g_list_append (source->priv->radio_sources, radio);
g_signal_connect (radio, "notify::name",
- G_CALLBACK (rb_audioscrobbler_profile_source_radio_station_name_changed_cb),
+ G_CALLBACK (radio_station_name_changed_cb),
source);
}
}
@@ -969,7 +962,7 @@ rb_audioscrobbler_profile_source_load_radio_stations (RBAudioscrobblerProfileSou
url = g_strdup_printf (rb_audioscrobbler_radio_type_get_url (RB_AUDIOSCROBBLER_RADIO_TYPE_LIBRARY),
rb_audioscrobbler_account_get_username (source->priv->account));
name = g_strdup (_("My Library"));
- rb_audioscrobbler_profile_source_add_radio_station (source, url, name);
+ add_radio_station (source, url, name);
g_free (url);
g_free (name);
@@ -977,7 +970,7 @@ rb_audioscrobbler_profile_source_load_radio_stations (RBAudioscrobblerProfileSou
url = g_strdup_printf (rb_audioscrobbler_radio_type_get_url (RB_AUDIOSCROBBLER_RADIO_TYPE_RECOMMENDATION),
rb_audioscrobbler_account_get_username (source->priv->account));
name = g_strdup (_("My Recommendations"));
- rb_audioscrobbler_profile_source_add_radio_station (source, url, name);
+ add_radio_station (source, url, name);
g_free (url);
g_free (name);
@@ -985,7 +978,7 @@ rb_audioscrobbler_profile_source_load_radio_stations (RBAudioscrobblerProfileSou
url = g_strdup_printf (rb_audioscrobbler_radio_type_get_url (RB_AUDIOSCROBBLER_RADIO_TYPE_NEIGHBOURS),
rb_audioscrobbler_account_get_username (source->priv->account));
name = g_strdup (_("My Neighbourhood"));
- rb_audioscrobbler_profile_source_add_radio_station (source, url, name);
+ add_radio_station (source, url, name);
g_free (url);
g_free (name);
@@ -994,7 +987,7 @@ rb_audioscrobbler_profile_source_load_radio_stations (RBAudioscrobblerProfileSou
"rhythmbox");
name = g_strdup_printf (rb_audioscrobbler_radio_type_get_default_name (RB_AUDIOSCROBBLER_RADIO_TYPE_GROUP),
"Rhythmbox");
- rb_audioscrobbler_profile_source_add_radio_station (source, url, name);
+ add_radio_station (source, url, name);
g_free (url);
g_free (name);
}
@@ -1006,7 +999,7 @@ rb_audioscrobbler_profile_source_load_radio_stations (RBAudioscrobblerProfileSou
/* save user's radio stations */
static void
-rb_audioscrobbler_profile_source_save_radio_stations (RBAudioscrobblerProfileSource *source)
+save_radio_stations (RBAudioscrobblerProfileSource *source)
{
JsonNode *root;
JsonArray *stations;
@@ -1059,9 +1052,9 @@ rb_audioscrobbler_profile_source_save_radio_stations (RBAudioscrobblerProfileSou
/* adds a new radio station for the user, if it doesn't already exist */
static RBSource *
-rb_audioscrobbler_profile_source_add_radio_station (RBAudioscrobblerProfileSource *source,
- const char *url,
- const char *name)
+add_radio_station (RBAudioscrobblerProfileSource *source,
+ const char *url,
+ const char *name)
{
GList *i;
RBSource *radio = NULL;
@@ -1095,9 +1088,9 @@ rb_audioscrobbler_profile_source_add_radio_station (RBAudioscrobblerProfileSourc
url);
source->priv->radio_sources = g_list_append (source->priv->radio_sources, radio);
g_signal_connect (radio, "notify::name",
- G_CALLBACK (rb_audioscrobbler_profile_source_radio_station_name_changed_cb),
+ G_CALLBACK (radio_station_name_changed_cb),
source);
- rb_audioscrobbler_profile_source_save_radio_stations (source);
+ save_radio_stations (source);
g_object_unref (shell);
}
@@ -1107,12 +1100,12 @@ rb_audioscrobbler_profile_source_add_radio_station (RBAudioscrobblerProfileSourc
/* called when a radio station's name changes */
static void
-rb_audioscrobbler_profile_source_radio_station_name_changed_cb (RBAudioscrobblerRadioSource *radio,
- GParamSpec *spec,
- RBAudioscrobblerProfileSource *source)
+radio_station_name_changed_cb (RBAudioscrobblerRadioSource *radio,
+ GParamSpec *spec,
+ RBAudioscrobblerProfileSource *source)
{
/* save list of stations with new name */
- rb_audioscrobbler_profile_source_save_radio_stations (source);
+ save_radio_stations (source);
}
/* removes a station from user's list of radio stations, deletes the source */
@@ -1127,14 +1120,14 @@ rb_audioscrobbler_profile_source_remove_radio_station (RBAudioscrobblerProfileSo
if (i != NULL) {
rb_source_delete_thyself (i->data);
source->priv->radio_sources = g_list_remove (source->priv->radio_sources, i->data);
- rb_audioscrobbler_profile_source_save_radio_stations (source);
+ save_radio_stations (source);
}
}
static void
-rb_audioscrobbler_profile_source_user_info_updated_cb (RBAudioscrobblerUser *user,
- RBAudioscrobblerUserData *data,
- RBAudioscrobblerProfileSource *source)
+user_info_updated_cb (RBAudioscrobblerUser *user,
+ RBAudioscrobblerUserData *data,
+ RBAudioscrobblerProfileSource *source)
{
if (data != NULL) {
char *playcount_text;
@@ -1160,12 +1153,12 @@ rb_audioscrobbler_profile_source_user_info_updated_cb (RBAudioscrobblerUser *use
}
static void
-rb_audioscrobbler_profile_source_recent_tracks_updated_cb (RBAudioscrobblerUser *user,
- GPtrArray *recent_tracks,
- RBAudioscrobblerProfileSource *source)
+recent_tracks_updated_cb (RBAudioscrobblerUser *user,
+ GPtrArray *recent_tracks,
+ RBAudioscrobblerProfileSource *source)
{
if (recent_tracks != NULL) {
- rb_audioscrobbler_profile_source_set_user_list (source, source->priv->recent_tracks_table, recent_tracks);
+ set_user_list (source, source->priv->recent_tracks_table, recent_tracks);
gtk_widget_show_all (source->priv->recent_tracks_area);
} else {
gtk_widget_hide_all (source->priv->recent_tracks_area);
@@ -1173,12 +1166,12 @@ rb_audioscrobbler_profile_source_recent_tracks_updated_cb (RBAudioscrobblerUser
}
static void
-rb_audioscrobbler_profile_source_top_tracks_updated_cb (RBAudioscrobblerUser *user,
- GPtrArray *top_tracks,
- RBAudioscrobblerProfileSource *source)
+top_tracks_updated_cb (RBAudioscrobblerUser *user,
+ GPtrArray *top_tracks,
+ RBAudioscrobblerProfileSource *source)
{
if (top_tracks != NULL) {
- rb_audioscrobbler_profile_source_set_user_list (source, source->priv->top_tracks_table, top_tracks);
+ set_user_list (source, source->priv->top_tracks_table, top_tracks);
gtk_widget_show_all (source->priv->top_tracks_area);
} else {
gtk_widget_hide_all (source->priv->top_tracks_area);
@@ -1186,12 +1179,12 @@ rb_audioscrobbler_profile_source_top_tracks_updated_cb (RBAudioscrobblerUser *us
}
static void
-rb_audioscrobbler_profile_source_loved_tracks_updated_cb (RBAudioscrobblerUser *user,
- GPtrArray *loved_tracks,
- RBAudioscrobblerProfileSource *source)
+loved_tracks_updated_cb (RBAudioscrobblerUser *user,
+ GPtrArray *loved_tracks,
+ RBAudioscrobblerProfileSource *source)
{
if (loved_tracks != NULL) {
- rb_audioscrobbler_profile_source_set_user_list (source, source->priv->loved_tracks_table, loved_tracks);
+ set_user_list (source, source->priv->loved_tracks_table, loved_tracks);
gtk_widget_show_all (source->priv->loved_tracks_area);
} else {
gtk_widget_hide_all (source->priv->loved_tracks_area);
@@ -1199,12 +1192,12 @@ rb_audioscrobbler_profile_source_loved_tracks_updated_cb (RBAudioscrobblerUser *
}
static void
-rb_audioscrobbler_profile_source_top_artists_updated_cb (RBAudioscrobblerUser *user,
- GPtrArray *top_artists,
- RBAudioscrobblerProfileSource *source)
+top_artists_updated_cb (RBAudioscrobblerUser *user,
+ GPtrArray *top_artists,
+ RBAudioscrobblerProfileSource *source)
{
if (top_artists != NULL) {
- rb_audioscrobbler_profile_source_set_user_list (source, source->priv->top_artists_table, top_artists);
+ set_user_list (source, source->priv->top_artists_table, top_artists);
gtk_widget_show_all (source->priv->top_artists_area);
} else {
gtk_widget_hide_all (source->priv->top_artists_area);
@@ -1212,12 +1205,12 @@ rb_audioscrobbler_profile_source_top_artists_updated_cb (RBAudioscrobblerUser *u
}
static void
-rb_audioscrobbler_profile_source_recommended_artists_updated_cb (RBAudioscrobblerUser *user,
- GPtrArray *recommended_artists,
- RBAudioscrobblerProfileSource *source)
+recommended_artists_updated_cb (RBAudioscrobblerUser *user,
+ GPtrArray *recommended_artists,
+ RBAudioscrobblerProfileSource *source)
{
if (recommended_artists != NULL) {
- rb_audioscrobbler_profile_source_set_user_list (source, source->priv->recommended_artists_table, recommended_artists);
+ set_user_list (source, source->priv->recommended_artists_table, recommended_artists);
gtk_widget_show_all (source->priv->recommended_artists_area);
} else {
gtk_widget_hide_all (source->priv->recommended_artists_area);
@@ -1228,9 +1221,9 @@ rb_audioscrobbler_profile_source_recommended_artists_updated_cb (RBAudioscrobble
* eg user's top tracks or recommended artists
*/
static void
-rb_audioscrobbler_profile_source_set_user_list (RBAudioscrobblerProfileSource *source,
- GtkWidget *list_table,
- GPtrArray *list_data)
+set_user_list (RBAudioscrobblerProfileSource *source,
+ GtkWidget *list_table,
+ GPtrArray *list_data)
{
int i;
GList *button_node;
@@ -1253,20 +1246,20 @@ rb_audioscrobbler_profile_source_set_user_list (RBAudioscrobblerProfileSource *s
GtkWidget *menu;
data = g_ptr_array_index (list_data, i);
- button = rb_audioscrobbler_profile_source_create_list_button (source, data);
- menu = rb_audioscrobbler_profile_source_create_popup_menu (source, data);
+ button = create_list_button (source, data);
+ menu = create_popup_menu (source, data);
g_hash_table_insert (source->priv->button_to_popup_menu_map, button, g_object_ref_sink (menu));
g_hash_table_insert (source->priv->popup_menu_to_data_map, menu, data);
- rb_audioscrobbler_profile_source_list_table_pack_start (GTK_TABLE (list_table), button);
+ list_table_pack_start (GTK_TABLE (list_table), button);
}
}
/* creates a button for use in a list */
static GtkWidget *
-rb_audioscrobbler_profile_source_create_list_button (RBAudioscrobblerProfileSource *source,
- RBAudioscrobblerUserData *data)
+create_list_button (RBAudioscrobblerProfileSource *source,
+ RBAudioscrobblerUserData *data)
{
GtkWidget *button;
GtkWidget *button_contents;
@@ -1340,7 +1333,7 @@ rb_audioscrobbler_profile_source_create_list_button (RBAudioscrobblerProfileSour
g_signal_connect (button,
"clicked",
- (GCallback) rb_audioscrobbler_profile_source_list_item_clicked_cb,
+ G_CALLBACK (list_item_clicked_cb),
source);
return button;
@@ -1348,8 +1341,8 @@ rb_audioscrobbler_profile_source_create_list_button (RBAudioscrobblerProfileSour
/* creates a menu to be popped up when a button is clicked */
static GtkWidget *
-rb_audioscrobbler_profile_source_create_popup_menu (RBAudioscrobblerProfileSource *source,
- RBAudioscrobblerUserData *data)
+create_popup_menu (RBAudioscrobblerProfileSource *source,
+ RBAudioscrobblerUserData *data)
{
GtkWidget *menu;
@@ -1365,7 +1358,7 @@ rb_audioscrobbler_profile_source_create_popup_menu (RBAudioscrobblerProfileSourc
view_url_item = gtk_menu_item_new_with_mnemonic (item_text);
g_signal_connect (view_url_item,
"activate",
- (GCallback) rb_audioscrobbler_profile_source_list_item_view_url_activated_cb,
+ G_CALLBACK (list_item_view_url_activated_cb),
source);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), view_url_item);
@@ -1380,7 +1373,7 @@ rb_audioscrobbler_profile_source_create_popup_menu (RBAudioscrobblerProfileSourc
similar_artists_item = gtk_menu_item_new_with_mnemonic (("Listen to _Similar Artists Radio"));
g_signal_connect (similar_artists_item,
"activate",
- (GCallback) rb_audioscrobbler_profile_source_list_item_listen_similar_artists_activated_cb,
+ G_CALLBACK (list_item_listen_similar_artists_activated_cb),
source);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), similar_artists_item);
@@ -1394,7 +1387,7 @@ rb_audioscrobbler_profile_source_create_popup_menu (RBAudioscrobblerProfileSourc
top_fans_item = gtk_menu_item_new_with_mnemonic (("Listen to _Top Fans Radio"));
g_signal_connect (top_fans_item,
"activate",
- (GCallback) rb_audioscrobbler_profile_source_list_item_listen_top_fans_activated_cb,
+ G_CALLBACK (list_item_listen_top_fans_activated_cb),
source);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), top_fans_item);
@@ -1407,7 +1400,7 @@ rb_audioscrobbler_profile_source_create_popup_menu (RBAudioscrobblerProfileSourc
/* packs a button into a GtkTable, from right to left then top to bottom */
static void
-rb_audioscrobbler_profile_source_list_table_pack_start (GtkTable *list_table, GtkWidget *item)
+list_table_pack_start (GtkTable *list_table, GtkWidget *item)
{
int num_columns;
int num_rows;
@@ -1424,7 +1417,7 @@ rb_audioscrobbler_profile_source_list_table_pack_start (GtkTable *list_table, Gt
/* allocates the correct amount of size for a table containing a list of buttons */
void
-rb_audioscrobbler_profile_source_list_layout_size_allocate_cb (GtkWidget *layout,
+list_layout_size_allocate_cb (GtkWidget *layout,
GtkAllocation *allocation,
gpointer user_data)
{
@@ -1483,7 +1476,7 @@ rb_audioscrobbler_profile_source_list_layout_size_allocate_cb (GtkWidget *layout
/* re-attach each button to the table */
for (i = g_list_last (buttons); i != NULL; i = i->prev) {
- rb_audioscrobbler_profile_source_list_table_pack_start (GTK_TABLE (table),
+ list_table_pack_start (GTK_TABLE (table),
i->data);
g_object_unref (i->data);
}
@@ -1498,7 +1491,7 @@ rb_audioscrobbler_profile_source_list_layout_size_allocate_cb (GtkWidget *layout
/* popup the appropriate menu */
static void
-rb_audioscrobbler_profile_source_list_item_clicked_cb (GtkButton *button, RBAudioscrobblerProfileSource *source)
+list_item_clicked_cb (GtkButton *button, RBAudioscrobblerProfileSource *source)
{
GtkWidget *menu;
@@ -1511,8 +1504,8 @@ rb_audioscrobbler_profile_source_list_item_clicked_cb (GtkButton *button, RBAudi
}
static void
-rb_audioscrobbler_profile_source_list_item_view_url_activated_cb (GtkMenuItem *menuitem,
- RBAudioscrobblerProfileSource *source)
+list_item_view_url_activated_cb (GtkMenuItem *menuitem,
+ RBAudioscrobblerProfileSource *source)
{
GtkWidget *menu;
RBAudioscrobblerUserData *data;
@@ -1532,8 +1525,8 @@ rb_audioscrobbler_profile_source_list_item_view_url_activated_cb (GtkMenuItem *m
}
static void
-rb_audioscrobbler_profile_source_list_item_listen_similar_artists_activated_cb (GtkMenuItem *menuitem,
- RBAudioscrobblerProfileSource *source)
+list_item_listen_similar_artists_activated_cb (GtkMenuItem *menuitem,
+ RBAudioscrobblerProfileSource *source)
{
GtkWidget *menu;
RBAudioscrobblerUserData *data;
@@ -1557,7 +1550,7 @@ rb_audioscrobbler_profile_source_list_item_listen_similar_artists_activated_cb (
radio_name = g_strdup_printf (rb_audioscrobbler_radio_type_get_default_name (RB_AUDIOSCROBBLER_RADIO_TYPE_SIMILAR_ARTISTS),
artist);
- radio = rb_audioscrobbler_profile_source_add_radio_station (source, radio_url, radio_name);
+ radio = add_radio_station (source, radio_url, radio_name);
g_object_get (source, "shell", &shell, NULL);
g_object_get (shell, "sourcelist", &sourcelist, NULL);
rb_sourcelist_select (sourcelist, radio);
@@ -1569,8 +1562,8 @@ rb_audioscrobbler_profile_source_list_item_listen_similar_artists_activated_cb (
}
static void
-rb_audioscrobbler_profile_source_list_item_listen_top_fans_activated_cb (GtkMenuItem *menuitem,
- RBAudioscrobblerProfileSource *source)
+list_item_listen_top_fans_activated_cb (GtkMenuItem *menuitem,
+ RBAudioscrobblerProfileSource *source)
{
GtkWidget *menu;
RBAudioscrobblerUserData *data;
@@ -1594,7 +1587,7 @@ rb_audioscrobbler_profile_source_list_item_listen_top_fans_activated_cb (GtkMenu
radio_name = g_strdup_printf (rb_audioscrobbler_radio_type_get_default_name (RB_AUDIOSCROBBLER_RADIO_TYPE_TOP_FANS),
artist);
- radio = rb_audioscrobbler_profile_source_add_radio_station (source, radio_url, radio_name);
+ radio = add_radio_station (source, radio_url, radio_name);
g_object_get (source, "shell", &shell, NULL);
g_object_get (shell, "sourcelist", &sourcelist, NULL);
rb_sourcelist_select (sourcelist, radio);
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
index 45cba0e..a726336 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
@@ -165,29 +165,29 @@ static void rb_audioscrobbler_radio_source_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec);
-static void rb_audioscrobbler_radio_source_playing_song_changed_cb (RBShellPlayer *player,
- RhythmDBEntry *entry,
- RBAudioscrobblerRadioSource *source);
+static void playing_song_changed_cb (RBShellPlayer *player,
+ RhythmDBEntry *entry,
+ RBAudioscrobblerRadioSource *source);
/* last.fm api requests */
-static void rb_audioscrobbler_radio_source_tune (RBAudioscrobblerRadioSource *source);
-static void rb_audioscrobbler_radio_source_tune_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
-static void rb_audioscrobbler_radio_source_fetch_playlist (RBAudioscrobblerRadioSource *source);
-static void rb_audioscrobbler_radio_source_fetch_playlist_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
-static void rb_audioscrobbler_radio_source_xspf_entry_parsed (TotemPlParser *parser,
- const char *uri,
- GHashTable *metadata,
- RBAudioscrobblerRadioSource *source);
+static void tune (RBAudioscrobblerRadioSource *source);
+static void tune_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
+static void fetch_playlist (RBAudioscrobblerRadioSource *source);
+static void fetch_playlist_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
+static void xspf_entry_parsed (TotemPlParser *parser,
+ const char *uri,
+ GHashTable *metadata,
+ RBAudioscrobblerRadioSource *source);
/* action callbacks */
-static void rb_audioscrobbler_radio_source_rename_station_action_cb (GtkAction *action,
- RBAudioscrobblerRadioSource *source);
-static void rb_audioscrobbler_radio_source_delete_station_action_cb (GtkAction *action,
- RBAudioscrobblerRadioSource *source);
+static void rename_station_action_cb (GtkAction *action,
+ RBAudioscrobblerRadioSource *source);
+static void delete_station_action_cb (GtkAction *action,
+ RBAudioscrobblerRadioSource *source);
/* cover art */
static GValue *coverart_uri_request (RhythmDB *db,
@@ -224,10 +224,10 @@ static GtkActionEntry rb_audioscrobbler_radio_source_actions [] =
{
{ "AudioscrobblerRadioRenameStation", NULL, N_("_Rename Station"), NULL,
N_("Rename station"),
- G_CALLBACK (rb_audioscrobbler_radio_source_rename_station_action_cb) },
+ G_CALLBACK (rename_station_action_cb) },
{ "AudioscrobblerRadioDeleteStation", GTK_STOCK_DELETE, N_("_Delete Station"), NULL,
N_("Delete station"),
- G_CALLBACK (rb_audioscrobbler_radio_source_delete_station_action_cb) }
+ G_CALLBACK (delete_station_action_cb) }
};
G_DEFINE_TYPE (RBAudioscrobblerRadioSource, rb_audioscrobbler_radio_source, RB_TYPE_STREAMING_SOURCE)
@@ -413,7 +413,7 @@ rb_audioscrobbler_radio_source_constructed (GObject *object)
/* signals */
g_signal_connect_object (rb_shell_get_player (shell),
"playing-song-changed",
- G_CALLBACK (rb_audioscrobbler_radio_source_playing_song_changed_cb),
+ G_CALLBACK (playing_song_changed_cb),
source, 0);
g_signal_connect_object (db,
"entry-extra-metadata-request::" RHYTHMDB_PROP_COVER_ART_URI,
@@ -531,9 +531,9 @@ rb_audioscrobbler_radio_source_set_property (GObject *object,
}
static void
-rb_audioscrobbler_radio_source_playing_song_changed_cb (RBShellPlayer *player,
- RhythmDBEntry *entry,
- RBAudioscrobblerRadioSource *source)
+playing_song_changed_cb (RBShellPlayer *player,
+ RhythmDBEntry *entry,
+ RBAudioscrobblerRadioSource *source)
{
RhythmDB *db;
GtkTreeIter playing_iter;
@@ -591,8 +591,8 @@ rb_audioscrobbler_radio_source_playing_song_changed_cb (RBShellPlayer *player,
/* request more if needed */
if (entries_after_playing <= 2) {
- rb_audioscrobbler_radio_source_tune (source);
- rb_audioscrobbler_radio_source_fetch_playlist (source);
+ tune (source);
+ fetch_playlist (source);
}
/* emit cover art notification */
@@ -605,7 +605,7 @@ rb_audioscrobbler_radio_source_playing_song_changed_cb (RBShellPlayer *player,
}
static void
-rb_audioscrobbler_radio_source_tune (RBAudioscrobblerRadioSource *source)
+tune (RBAudioscrobblerRadioSource *source)
{
char *sig_arg;
char *sig;
@@ -642,7 +642,7 @@ rb_audioscrobbler_radio_source_tune (RBAudioscrobblerRadioSource *source)
strlen (request));
soup_session_queue_message (source->priv->soup_session,
msg,
- rb_audioscrobbler_radio_source_tune_response_cb,
+ tune_response_cb,
source);
g_free (escaped_station_url);
@@ -653,9 +653,9 @@ rb_audioscrobbler_radio_source_tune (RBAudioscrobblerRadioSource *source)
}
static void
-rb_audioscrobbler_radio_source_tune_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+tune_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
RBAudioscrobblerRadioSource *source;
JsonParser *parser;
@@ -721,7 +721,7 @@ rb_audioscrobbler_radio_source_tune_response_cb (SoupSession *session,
}
static void
-rb_audioscrobbler_radio_source_fetch_playlist (RBAudioscrobblerRadioSource *source)
+fetch_playlist (RBAudioscrobblerRadioSource *source)
{
char *sig_arg;
char *sig;
@@ -755,7 +755,7 @@ rb_audioscrobbler_radio_source_fetch_playlist (RBAudioscrobblerRadioSource *sour
strlen (request));
soup_session_queue_message (source->priv->soup_session,
msg,
- rb_audioscrobbler_radio_source_fetch_playlist_response_cb,
+ fetch_playlist_response_cb,
source);
/* keep pointer to message so it can be cancelled if need be */
@@ -767,9 +767,9 @@ rb_audioscrobbler_radio_source_fetch_playlist (RBAudioscrobblerRadioSource *sour
}
static void
-rb_audioscrobbler_radio_source_fetch_playlist_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+fetch_playlist_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
RBAudioscrobblerRadioSource *source;
int tmp_fd;
@@ -819,7 +819,7 @@ rb_audioscrobbler_radio_source_fetch_playlist_response_cb (SoupSession *session,
parser = totem_pl_parser_new ();
g_signal_connect_data (parser, "entry-parsed",
- G_CALLBACK (rb_audioscrobbler_radio_source_xspf_entry_parsed),
+ G_CALLBACK (xspf_entry_parsed),
source, NULL, 0);
result = totem_pl_parser_parse (parser, tmp_uri, FALSE);
@@ -853,10 +853,10 @@ rb_audioscrobbler_radio_source_fetch_playlist_response_cb (SoupSession *session,
}
static void
-rb_audioscrobbler_radio_source_xspf_entry_parsed (TotemPlParser *parser,
- const char *uri,
- GHashTable *metadata,
- RBAudioscrobblerRadioSource *source)
+xspf_entry_parsed (TotemPlParser *parser,
+ const char *uri,
+ GHashTable *metadata,
+ RBAudioscrobblerRadioSource *source)
{
RBShell *shell;
RhythmDBEntryType entry_type;
@@ -938,8 +938,7 @@ rb_audioscrobbler_radio_source_xspf_entry_parsed (TotemPlParser *parser,
}
static void
-rb_audioscrobbler_radio_source_rename_station_action_cb (GtkAction *action,
- RBAudioscrobblerRadioSource *source)
+rename_station_action_cb (GtkAction *action, RBAudioscrobblerRadioSource *source)
{
RBShell *shell;
RBSourceList *sourcelist;
@@ -954,8 +953,7 @@ rb_audioscrobbler_radio_source_rename_station_action_cb (GtkAction *action,
}
static void
-rb_audioscrobbler_radio_source_delete_station_action_cb (GtkAction *action,
- RBAudioscrobblerRadioSource *source)
+delete_station_action_cb (GtkAction *action, RBAudioscrobblerRadioSource *source)
{
rb_audioscrobbler_profile_source_remove_radio_station (source->priv->parent, RB_SOURCE (source));
}
@@ -982,7 +980,9 @@ get_image_url_for_entry (RBAudioscrobblerRadioSource *source, RhythmDBEntry *ent
}
static GValue *
-coverart_uri_request (RhythmDB *db, RhythmDBEntry *entry, RBAudioscrobblerRadioSource *source)
+coverart_uri_request (RhythmDB *db,
+ RhythmDBEntry *entry,
+ RBAudioscrobblerRadioSource *source)
{
const char *image_url;
@@ -1000,7 +1000,10 @@ coverart_uri_request (RhythmDB *db, RhythmDBEntry *entry, RBAudioscrobblerRadioS
}
static void
-extra_metadata_gather_cb (RhythmDB *db, RhythmDBEntry *entry, RBStringValueMap *map, RBAudioscrobblerRadioSource *source)
+extra_metadata_gather_cb (RhythmDB *db,
+ RhythmDBEntry *entry,
+ RBStringValueMap *map,
+ RBAudioscrobblerRadioSource *source)
{
const char *image_url;
@@ -1055,8 +1058,8 @@ impl_activate (RBSource *asource)
/* if the query model is empty then attempt to add some tracks to it */
if (rhythmdb_query_model_get_duration (source->priv->track_model) == 0) {
- rb_audioscrobbler_radio_source_tune (source);
- rb_audioscrobbler_radio_source_fetch_playlist (source);
+ tune (source);
+ fetch_playlist (source);
}
}
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-user.c b/plugins/audioscrobbler/rb-audioscrobbler-user.c
index 815ede4..a0e3c3f 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-user.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-user.c
@@ -141,77 +141,77 @@ static void rb_audioscrobbler_user_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec);
-static void rb_audioscrobbler_user_load_from_cache (RBAudioscrobblerUser *user);
-
-static char * rb_audioscrobbler_user_calculate_cached_response_path (RBAudioscrobblerUser *user,
- const char *request_name);
-static void rb_audioscrobbler_user_save_response_to_cache (RBAudioscrobblerUser *user,
- const char *request_name,
- const char *data);
-
-static void rb_audioscrobbler_user_load_cached_user_info (RBAudioscrobblerUser *user);
-static void rb_audioscrobbler_user_request_user_info (RBAudioscrobblerUser *user);
-static void rb_audioscrobbler_user_user_info_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
-static RBAudioscrobblerUserData * rb_audioscrobbler_user_parse_user_info (RBAudioscrobblerUser *user,
- const char *data);
-
-static void rb_audioscrobbler_user_load_cached_recent_tracks (RBAudioscrobblerUser *user);
-static void rb_audioscrobbler_user_request_recent_tracks (RBAudioscrobblerUser *user, int limit);
-static void rb_audioscrobbler_user_recent_tracks_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
-static GPtrArray * rb_audioscrobbler_user_parse_recent_tracks (RBAudioscrobblerUser *user,
- const char *data);
-
-static void rb_audioscrobbler_user_load_cached_top_tracks (RBAudioscrobblerUser *user);
-static void rb_audioscrobbler_user_request_top_tracks (RBAudioscrobblerUser *user, int limit);
-static void rb_audioscrobbler_user_top_tracks_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
-static GPtrArray * rb_audioscrobbler_user_parse_top_tracks (RBAudioscrobblerUser *user,
- const char *data);
-
-static void rb_audioscrobbler_user_load_cached_loved_tracks (RBAudioscrobblerUser *user);
-static void rb_audioscrobbler_user_request_loved_tracks (RBAudioscrobblerUser *user, int limit);
-static void rb_audioscrobbler_user_loved_tracks_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
-static GPtrArray * rb_audioscrobbler_user_parse_loved_tracks (RBAudioscrobblerUser *user,
- const char *data);
-
-static void rb_audioscrobbler_user_load_cached_top_artists (RBAudioscrobblerUser *user);
-static void rb_audioscrobbler_user_request_top_artists (RBAudioscrobblerUser *user, int limit);
-static void rb_audioscrobbler_user_top_artists_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
-static GPtrArray * rb_audioscrobbler_user_parse_top_artists (RBAudioscrobblerUser *user,
- const char *data);
-
-static void rb_audioscrobbler_user_load_cached_recommended_artists (RBAudioscrobblerUser *user);
-static void rb_audioscrobbler_user_request_recommended_artists (RBAudioscrobblerUser *user, int limit);
-static void rb_audioscrobbler_user_recommended_artists_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
-static GPtrArray * rb_audioscrobbler_user_parse_recommended_artists (RBAudioscrobblerUser *user,
- const char *data);
-
-static char * rb_audioscrobbler_user_calculate_cached_image_path (RBAudioscrobblerUser *user,
- RBAudioscrobblerUserData *data);
-static void rb_audioscrobbler_user_download_image (RBAudioscrobblerUser *user,
- const char *image_url,
- RBAudioscrobblerUserData *data);
-static void rb_audioscrobbler_user_image_download_cb (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data);
-
-static void rb_audioscrobbler_user_love_track_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
-static void rb_audioscrobbler_user_ban_track_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data);
+static void load_from_cache (RBAudioscrobblerUser *user);
+
+static char * calculate_cached_response_path (RBAudioscrobblerUser *user,
+ const char *request_name);
+static void save_response_to_cache (RBAudioscrobblerUser *user,
+ const char *request_name,
+ const char *data);
+
+static void load_cached_user_info (RBAudioscrobblerUser *user);
+static void request_user_info (RBAudioscrobblerUser *user);
+static void user_info_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
+static RBAudioscrobblerUserData * parse_user_info (RBAudioscrobblerUser *user,
+ const char *data);
+
+static void load_cached_recent_tracks (RBAudioscrobblerUser *user);
+static void request_recent_tracks (RBAudioscrobblerUser *user, int limit);
+static void recent_tracks_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
+static GPtrArray * parse_recent_tracks (RBAudioscrobblerUser *user,
+ const char *data);
+
+static void load_cached_top_tracks (RBAudioscrobblerUser *user);
+static void request_top_tracks (RBAudioscrobblerUser *user, int limit);
+static void top_tracks_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
+static GPtrArray * parse_top_tracks (RBAudioscrobblerUser *user,
+ const char *data);
+
+static void load_cached_loved_tracks (RBAudioscrobblerUser *user);
+static void request_loved_tracks (RBAudioscrobblerUser *user, int limit);
+static void loved_tracks_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
+static GPtrArray * parse_loved_tracks (RBAudioscrobblerUser *user,
+ const char *data);
+
+static void load_cached_top_artists (RBAudioscrobblerUser *user);
+static void request_top_artists (RBAudioscrobblerUser *user, int limit);
+static void top_artists_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
+static GPtrArray * parse_top_artists (RBAudioscrobblerUser *user,
+ const char *data);
+
+static void load_cached_recommended_artists (RBAudioscrobblerUser *user);
+static void request_recommended_artists (RBAudioscrobblerUser *user, int limit);
+static void recommended_artists_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
+static GPtrArray * parse_recommended_artists (RBAudioscrobblerUser *user,
+ const char *data);
+
+static char * calculate_cached_image_path (RBAudioscrobblerUser *user,
+ RBAudioscrobblerUserData *data);
+static void download_image (RBAudioscrobblerUser *user,
+ const char *image_url,
+ RBAudioscrobblerUserData *data);
+static void image_download_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data);
+
+static void love_track_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
+static void ban_track_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data);
enum {
PROP_0,
PROP_SERVICE
@@ -469,24 +469,24 @@ rb_audioscrobbler_user_set_authentication_details (RBAudioscrobblerUser *user,
soup_session_abort (user->priv->soup_session);
/* load new user from cache (or set to NULL) */
- rb_audioscrobbler_user_load_from_cache (user);
+ load_from_cache (user);
}
void
rb_audioscrobbler_user_update (RBAudioscrobblerUser *user)
{
if (user->priv->username != NULL) {
- rb_audioscrobbler_user_request_user_info (user);
- rb_audioscrobbler_user_request_recent_tracks (user, 15);
- rb_audioscrobbler_user_request_top_tracks (user, 15);
- rb_audioscrobbler_user_request_loved_tracks (user, 15);
- rb_audioscrobbler_user_request_top_artists (user, 15);
- rb_audioscrobbler_user_request_recommended_artists (user, 15);
+ request_user_info (user);
+ request_recent_tracks (user, 15);
+ request_top_tracks (user, 15);
+ request_loved_tracks (user, 15);
+ request_top_artists (user, 15);
+ request_recommended_artists (user, 15);
}
}
static void
-rb_audioscrobbler_user_load_from_cache (RBAudioscrobblerUser *user)
+load_from_cache (RBAudioscrobblerUser *user)
{
/* delete old data */
if (user->priv->user_info != NULL) {
@@ -521,17 +521,17 @@ rb_audioscrobbler_user_load_from_cache (RBAudioscrobblerUser *user)
/* if a username is set then attempt to load cached data */
if (user->priv->username != NULL) {
- rb_audioscrobbler_user_load_cached_user_info (user);
- rb_audioscrobbler_user_load_cached_recent_tracks (user);
- rb_audioscrobbler_user_load_cached_top_tracks (user);
- rb_audioscrobbler_user_load_cached_loved_tracks (user);
- rb_audioscrobbler_user_load_cached_top_artists (user);
- rb_audioscrobbler_user_load_cached_recommended_artists (user);
+ load_cached_user_info (user);
+ load_cached_recent_tracks (user);
+ load_cached_top_tracks (user);
+ load_cached_loved_tracks (user);
+ load_cached_top_artists (user);
+ load_cached_recommended_artists (user);
}
}
static char *
-rb_audioscrobbler_user_calculate_cached_response_path (RBAudioscrobblerUser *user, const char *request_name)
+calculate_cached_response_path (RBAudioscrobblerUser *user, const char *request_name)
{
const char *rb_cache_dir;
rb_cache_dir = rb_user_cache_dir ();
@@ -546,13 +546,13 @@ rb_audioscrobbler_user_calculate_cached_response_path (RBAudioscrobblerUser *use
}
static void
-rb_audioscrobbler_user_save_response_to_cache (RBAudioscrobblerUser *user, const char *request_name, const char *data)
+save_response_to_cache (RBAudioscrobblerUser *user, const char *request_name, const char *data)
{
char *filename;
char *file_uri;
GError *error;
- filename = rb_audioscrobbler_user_calculate_cached_response_path (user, request_name);
+ filename = calculate_cached_response_path (user, request_name);
file_uri = g_filename_to_uri (filename, NULL, NULL);
error = NULL;
@@ -573,12 +573,12 @@ rb_audioscrobbler_user_save_response_to_cache (RBAudioscrobblerUser *user, const
/* user info */
static void
-rb_audioscrobbler_user_load_cached_user_info (RBAudioscrobblerUser *user)
+load_cached_user_info (RBAudioscrobblerUser *user)
{
char *filename;
char *data;
- filename = rb_audioscrobbler_user_calculate_cached_response_path (user, "user_info");
+ filename = calculate_cached_response_path (user, "user_info");
/* delete old data */
if (user->priv->user_info != NULL) {
@@ -589,7 +589,7 @@ rb_audioscrobbler_user_load_cached_user_info (RBAudioscrobblerUser *user)
/* load cached data if it exists */
if (g_file_get_contents (filename, &data, NULL, NULL) == TRUE) {
rb_debug ("loading cached user_info");
- user->priv->user_info = rb_audioscrobbler_user_parse_user_info (user, data);
+ user->priv->user_info = parse_user_info (user, data);
}
/* emit updated signal */
@@ -601,7 +601,7 @@ rb_audioscrobbler_user_load_cached_user_info (RBAudioscrobblerUser *user)
}
static void
-rb_audioscrobbler_user_request_user_info (RBAudioscrobblerUser *user)
+request_user_info (RBAudioscrobblerUser *user)
{
char *msg_url;
SoupMessage *msg;
@@ -616,23 +616,23 @@ rb_audioscrobbler_user_request_user_info (RBAudioscrobblerUser *user)
msg = soup_message_new ("GET", msg_url);
soup_session_queue_message (user->priv->soup_session,
msg,
- rb_audioscrobbler_user_user_info_response_cb,
+ user_info_response_cb,
user);
g_free (msg_url);
}
static void
-rb_audioscrobbler_user_user_info_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+user_info_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
RBAudioscrobblerUser *user;
RBAudioscrobblerUserData *user_info;
user = RB_AUDIOSCROBBLER_USER (user_data);
- user_info = rb_audioscrobbler_user_parse_user_info (user, msg->response_body->data);
+ user_info = parse_user_info (user, msg->response_body->data);
if (user_info != NULL) {
rb_debug ("user info request was successful");
@@ -642,7 +642,7 @@ rb_audioscrobbler_user_user_info_response_cb (SoupSession *session,
}
user->priv->user_info = user_info;
- rb_audioscrobbler_user_save_response_to_cache (user, "user_info", msg->response_body->data);
+ save_response_to_cache (user, "user_info", msg->response_body->data);
g_signal_emit (user, rb_audioscrobbler_user_signals[USER_INFO_UPDATED],
0, user->priv->user_info);
@@ -655,7 +655,7 @@ rb_audioscrobbler_user_user_info_response_cb (SoupSession *session,
}
static RBAudioscrobblerUserData *
-rb_audioscrobbler_user_parse_user_info (RBAudioscrobblerUser *user, const char *data)
+parse_user_info (RBAudioscrobblerUser *user, const char *data)
{
RBAudioscrobblerUserData *user_info;
JsonParser *parser;
@@ -676,7 +676,7 @@ rb_audioscrobbler_user_parse_user_info (RBAudioscrobblerUser *user, const char *
user_info->user_info.playcount = g_strdup (json_object_get_string_member (user_object, "playcount"));
user_info->url = g_strdup (json_object_get_string_member (user_object, "url"));
- user_info->image = gdk_pixbuf_new_from_file_at_size (rb_audioscrobbler_user_calculate_cached_image_path (user, user_info),
+ user_info->image = gdk_pixbuf_new_from_file_at_size (calculate_cached_image_path (user, user_info),
USER_PROFILE_IMAGE_SIZE, -1, NULL);
if (user_info->image == NULL && json_object_has_member (user_object, "image") == TRUE) {
JsonArray *image_array;
@@ -684,7 +684,7 @@ rb_audioscrobbler_user_parse_user_info (RBAudioscrobblerUser *user, const char *
image_array = json_object_get_array_member (user_object, "image");
image_object = json_array_get_object_element (image_array, 2);
- rb_audioscrobbler_user_download_image (user, json_object_get_string_member (image_object, "#text"), user_info);
+ download_image (user, json_object_get_string_member (image_object, "#text"), user_info);
}
} else {
rb_debug ("error parsing user info response");
@@ -697,12 +697,12 @@ rb_audioscrobbler_user_parse_user_info (RBAudioscrobblerUser *user, const char *
/* recent tracks */
static void
-rb_audioscrobbler_user_load_cached_recent_tracks (RBAudioscrobblerUser *user)
+load_cached_recent_tracks (RBAudioscrobblerUser *user)
{
char *filename;
char *data;
- filename = rb_audioscrobbler_user_calculate_cached_response_path (user, "recent_tracks");
+ filename = calculate_cached_response_path (user, "recent_tracks");
/* delete old data */
if (user->priv->recent_tracks != NULL) {
@@ -713,7 +713,7 @@ rb_audioscrobbler_user_load_cached_recent_tracks (RBAudioscrobblerUser *user)
/* load cached data if it exists */
if (g_file_get_contents (filename, &data, NULL, NULL) == TRUE) {
rb_debug ("loading cached recent tracks");
- user->priv->recent_tracks = rb_audioscrobbler_user_parse_recent_tracks (user, data);
+ user->priv->recent_tracks = parse_recent_tracks (user, data);
}
/* emit updated signal */
@@ -725,7 +725,7 @@ rb_audioscrobbler_user_load_cached_recent_tracks (RBAudioscrobblerUser *user)
}
static void
-rb_audioscrobbler_user_request_recent_tracks (RBAudioscrobblerUser *user, int limit)
+request_recent_tracks (RBAudioscrobblerUser *user, int limit)
{
char *msg_url;
SoupMessage *msg;
@@ -741,23 +741,23 @@ rb_audioscrobbler_user_request_recent_tracks (RBAudioscrobblerUser *user, int li
msg = soup_message_new ("GET", msg_url);
soup_session_queue_message (user->priv->soup_session,
msg,
- rb_audioscrobbler_user_recent_tracks_response_cb,
+ recent_tracks_response_cb,
user);
g_free (msg_url);
}
static void
-rb_audioscrobbler_user_recent_tracks_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+recent_tracks_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
RBAudioscrobblerUser *user;
GPtrArray *recent_tracks;
user = RB_AUDIOSCROBBLER_USER (user_data);
- recent_tracks = rb_audioscrobbler_user_parse_recent_tracks (user, msg->response_body->data);
+ recent_tracks = parse_recent_tracks (user, msg->response_body->data);
if (recent_tracks != NULL) {
rb_debug ("recent tracks request was successful");
@@ -767,7 +767,7 @@ rb_audioscrobbler_user_recent_tracks_response_cb (SoupSession *session,
}
user->priv->recent_tracks = recent_tracks;
- rb_audioscrobbler_user_save_response_to_cache (user, "recent_tracks", msg->response_body->data);
+ save_response_to_cache (user, "recent_tracks", msg->response_body->data);
g_signal_emit (user, rb_audioscrobbler_user_signals[RECENT_TRACKS_UPDATED],
0, user->priv->recent_tracks);
@@ -780,7 +780,7 @@ rb_audioscrobbler_user_recent_tracks_response_cb (SoupSession *session,
}
static GPtrArray *
-rb_audioscrobbler_user_parse_recent_tracks (RBAudioscrobblerUser *user, const char *data)
+parse_recent_tracks (RBAudioscrobblerUser *user, const char *data)
{
GPtrArray *recent_tracks;
JsonParser *parser;
@@ -818,7 +818,7 @@ rb_audioscrobbler_user_parse_recent_tracks (RBAudioscrobblerUser *user, const ch
g_ptr_array_add (recent_tracks, track);
- track->image = gdk_pixbuf_new_from_file_at_size (rb_audioscrobbler_user_calculate_cached_image_path (user, track),
+ track->image = gdk_pixbuf_new_from_file_at_size (calculate_cached_image_path (user, track),
LIST_ITEM_IMAGE_SIZE, LIST_ITEM_IMAGE_SIZE, NULL);
if (track->image == NULL && json_object_has_member (track_object, "image") == TRUE) {
JsonArray *image_array;
@@ -826,7 +826,7 @@ rb_audioscrobbler_user_parse_recent_tracks (RBAudioscrobblerUser *user, const ch
image_array = json_object_get_array_member (track_object, "image");
image_object = json_array_get_object_element (image_array, 0);
- rb_audioscrobbler_user_download_image (user, json_object_get_string_member (image_object, "#text"), track);
+ download_image (user, json_object_get_string_member (image_object, "#text"), track);
}
}
}
@@ -841,12 +841,12 @@ rb_audioscrobbler_user_parse_recent_tracks (RBAudioscrobblerUser *user, const ch
/* top tracks */
static void
-rb_audioscrobbler_user_load_cached_top_tracks (RBAudioscrobblerUser *user)
+load_cached_top_tracks (RBAudioscrobblerUser *user)
{
char *filename;
char *data;
- filename = rb_audioscrobbler_user_calculate_cached_response_path (user, "top_tracks");
+ filename = calculate_cached_response_path (user, "top_tracks");
/* delete old data */
if (user->priv->top_tracks != NULL) {
@@ -857,7 +857,7 @@ rb_audioscrobbler_user_load_cached_top_tracks (RBAudioscrobblerUser *user)
/* load cached data if it exists */
if (g_file_get_contents (filename, &data, NULL, NULL) == TRUE) {
rb_debug ("loading cached top tracks");
- user->priv->top_tracks = rb_audioscrobbler_user_parse_top_tracks (user, data);
+ user->priv->top_tracks = parse_top_tracks (user, data);
}
/* emit updated signal */
@@ -869,7 +869,7 @@ rb_audioscrobbler_user_load_cached_top_tracks (RBAudioscrobblerUser *user)
}
static void
-rb_audioscrobbler_user_request_top_tracks (RBAudioscrobblerUser *user, int limit)
+request_top_tracks (RBAudioscrobblerUser *user, int limit)
{
char *msg_url;
SoupMessage *msg;
@@ -885,23 +885,23 @@ rb_audioscrobbler_user_request_top_tracks (RBAudioscrobblerUser *user, int limit
msg = soup_message_new ("GET", msg_url);
soup_session_queue_message (user->priv->soup_session,
msg,
- rb_audioscrobbler_user_top_tracks_response_cb,
+ top_tracks_response_cb,
user);
g_free (msg_url);
}
static void
-rb_audioscrobbler_user_top_tracks_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+top_tracks_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
RBAudioscrobblerUser *user;
GPtrArray *top_tracks;
user = RB_AUDIOSCROBBLER_USER (user_data);
- top_tracks = rb_audioscrobbler_user_parse_top_tracks (user, msg->response_body->data);
+ top_tracks = parse_top_tracks (user, msg->response_body->data);
if (top_tracks != NULL) {
rb_debug ("top tracks request was successful");
@@ -911,7 +911,7 @@ rb_audioscrobbler_user_top_tracks_response_cb (SoupSession *session,
}
user->priv->top_tracks = top_tracks;
- rb_audioscrobbler_user_save_response_to_cache (user, "top_tracks", msg->response_body->data);
+ save_response_to_cache (user, "top_tracks", msg->response_body->data);
g_signal_emit (user, rb_audioscrobbler_user_signals[TOP_TRACKS_UPDATED],
0, user->priv->top_tracks);
@@ -924,7 +924,7 @@ rb_audioscrobbler_user_top_tracks_response_cb (SoupSession *session,
}
static GPtrArray *
-rb_audioscrobbler_user_parse_top_tracks (RBAudioscrobblerUser *user, const char *data)
+parse_top_tracks (RBAudioscrobblerUser *user, const char *data)
{
GPtrArray *top_tracks;
JsonParser *parser;
@@ -962,7 +962,7 @@ rb_audioscrobbler_user_parse_top_tracks (RBAudioscrobblerUser *user, const char
g_ptr_array_add (top_tracks, track);
- track->image = gdk_pixbuf_new_from_file_at_size (rb_audioscrobbler_user_calculate_cached_image_path (user, track),
+ track->image = gdk_pixbuf_new_from_file_at_size (calculate_cached_image_path (user, track),
LIST_ITEM_IMAGE_SIZE, LIST_ITEM_IMAGE_SIZE, NULL);
if (track->image == NULL && json_object_has_member (track_object, "image") == TRUE) {
JsonArray *image_array;
@@ -970,7 +970,7 @@ rb_audioscrobbler_user_parse_top_tracks (RBAudioscrobblerUser *user, const char
image_array = json_object_get_array_member (track_object, "image");
image_object = json_array_get_object_element (image_array, 0);
- rb_audioscrobbler_user_download_image (user, json_object_get_string_member (image_object, "#text"), track);
+ download_image (user, json_object_get_string_member (image_object, "#text"), track);
}
}
}
@@ -985,12 +985,12 @@ rb_audioscrobbler_user_parse_top_tracks (RBAudioscrobblerUser *user, const char
/* loved tracks */
static void
-rb_audioscrobbler_user_load_cached_loved_tracks (RBAudioscrobblerUser *user)
+load_cached_loved_tracks (RBAudioscrobblerUser *user)
{
char *filename;
char *data;
- filename = rb_audioscrobbler_user_calculate_cached_response_path (user, "loved_tracks");
+ filename = calculate_cached_response_path (user, "loved_tracks");
/* delete old data */
if (user->priv->loved_tracks != NULL) {
@@ -1001,7 +1001,7 @@ rb_audioscrobbler_user_load_cached_loved_tracks (RBAudioscrobblerUser *user)
/* load cached data if it exists */
if (g_file_get_contents (filename, &data, NULL, NULL) == TRUE) {
rb_debug ("loading cached loved tracks");
- user->priv->loved_tracks = rb_audioscrobbler_user_parse_loved_tracks (user, data);
+ user->priv->loved_tracks = parse_loved_tracks (user, data);
}
/* emit updated signal */
@@ -1013,7 +1013,7 @@ rb_audioscrobbler_user_load_cached_loved_tracks (RBAudioscrobblerUser *user)
}
static void
-rb_audioscrobbler_user_request_loved_tracks (RBAudioscrobblerUser *user, int limit)
+request_loved_tracks (RBAudioscrobblerUser *user, int limit)
{
char *msg_url;
SoupMessage *msg;
@@ -1029,23 +1029,23 @@ rb_audioscrobbler_user_request_loved_tracks (RBAudioscrobblerUser *user, int lim
msg = soup_message_new ("GET", msg_url);
soup_session_queue_message (user->priv->soup_session,
msg,
- rb_audioscrobbler_user_loved_tracks_response_cb,
+ loved_tracks_response_cb,
user);
g_free (msg_url);
}
static void
-rb_audioscrobbler_user_loved_tracks_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+loved_tracks_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
RBAudioscrobblerUser *user;
GPtrArray *loved_tracks;
user = RB_AUDIOSCROBBLER_USER (user_data);
- loved_tracks = rb_audioscrobbler_user_parse_loved_tracks (user, msg->response_body->data);
+ loved_tracks = parse_loved_tracks (user, msg->response_body->data);
if (loved_tracks != NULL) {
rb_debug ("loved tracks request was successful");
@@ -1055,7 +1055,7 @@ rb_audioscrobbler_user_loved_tracks_response_cb (SoupSession *session,
}
user->priv->loved_tracks = loved_tracks;
- rb_audioscrobbler_user_save_response_to_cache (user, "loved_tracks", msg->response_body->data);
+ save_response_to_cache (user, "loved_tracks", msg->response_body->data);
g_signal_emit (user, rb_audioscrobbler_user_signals[LOVED_TRACKS_UPDATED],
0, user->priv->loved_tracks);
@@ -1068,7 +1068,7 @@ rb_audioscrobbler_user_loved_tracks_response_cb (SoupSession *session,
}
static GPtrArray *
-rb_audioscrobbler_user_parse_loved_tracks (RBAudioscrobblerUser *user, const char *data)
+parse_loved_tracks (RBAudioscrobblerUser *user, const char *data)
{
GPtrArray *loved_tracks;
JsonParser *parser;
@@ -1106,7 +1106,7 @@ rb_audioscrobbler_user_parse_loved_tracks (RBAudioscrobblerUser *user, const cha
g_ptr_array_add (loved_tracks, track);
- track->image = gdk_pixbuf_new_from_file_at_size (rb_audioscrobbler_user_calculate_cached_image_path (user, track),
+ track->image = gdk_pixbuf_new_from_file_at_size (calculate_cached_image_path (user, track),
LIST_ITEM_IMAGE_SIZE, LIST_ITEM_IMAGE_SIZE, NULL);
if (track->image == NULL && json_object_has_member (track_object, "image") == TRUE) {
JsonArray *image_array;
@@ -1114,7 +1114,7 @@ rb_audioscrobbler_user_parse_loved_tracks (RBAudioscrobblerUser *user, const cha
image_array = json_object_get_array_member (track_object, "image");
image_object = json_array_get_object_element (image_array, 0);
- rb_audioscrobbler_user_download_image (user, json_object_get_string_member (image_object, "#text"), track);
+ download_image (user, json_object_get_string_member (image_object, "#text"), track);
}
}
}
@@ -1129,12 +1129,12 @@ rb_audioscrobbler_user_parse_loved_tracks (RBAudioscrobblerUser *user, const cha
/* top artists */
static void
-rb_audioscrobbler_user_load_cached_top_artists (RBAudioscrobblerUser *user)
+load_cached_top_artists (RBAudioscrobblerUser *user)
{
char *filename;
char *data;
- filename = rb_audioscrobbler_user_calculate_cached_response_path (user, "top_artists");
+ filename = calculate_cached_response_path (user, "top_artists");
/* delete old data */
if (user->priv->top_artists != NULL) {
@@ -1145,7 +1145,7 @@ rb_audioscrobbler_user_load_cached_top_artists (RBAudioscrobblerUser *user)
/* load cached data if it exists */
if (g_file_get_contents (filename, &data, NULL, NULL) == TRUE) {
rb_debug ("loading cached top artists");
- user->priv->top_artists = rb_audioscrobbler_user_parse_top_artists (user, data);
+ user->priv->top_artists = parse_top_artists (user, data);
}
/* emit updated signal */
@@ -1157,7 +1157,7 @@ rb_audioscrobbler_user_load_cached_top_artists (RBAudioscrobblerUser *user)
}
static void
-rb_audioscrobbler_user_request_top_artists (RBAudioscrobblerUser *user, int limit)
+request_top_artists (RBAudioscrobblerUser *user, int limit)
{
char *msg_url;
SoupMessage *msg;
@@ -1173,23 +1173,23 @@ rb_audioscrobbler_user_request_top_artists (RBAudioscrobblerUser *user, int limi
msg = soup_message_new ("GET", msg_url);
soup_session_queue_message (user->priv->soup_session,
msg,
- rb_audioscrobbler_user_top_artists_response_cb,
+ top_artists_response_cb,
user);
g_free (msg_url);
}
static void
-rb_audioscrobbler_user_top_artists_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+top_artists_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
RBAudioscrobblerUser *user;
GPtrArray *top_artists;
user = RB_AUDIOSCROBBLER_USER (user_data);
- top_artists = rb_audioscrobbler_user_parse_top_artists (user, msg->response_body->data);
+ top_artists = parse_top_artists (user, msg->response_body->data);
if (top_artists != NULL) {
rb_debug ("top artists request was successful");
@@ -1199,7 +1199,7 @@ rb_audioscrobbler_user_top_artists_response_cb (SoupSession *session,
}
user->priv->top_artists = top_artists;
- rb_audioscrobbler_user_save_response_to_cache (user, "top_artists", msg->response_body->data);
+ save_response_to_cache (user, "top_artists", msg->response_body->data);
g_signal_emit (user, rb_audioscrobbler_user_signals[TOP_ARTISTS_UPDATED],
0, user->priv->top_artists);
@@ -1212,7 +1212,7 @@ rb_audioscrobbler_user_top_artists_response_cb (SoupSession *session,
}
static GPtrArray *
-rb_audioscrobbler_user_parse_top_artists (RBAudioscrobblerUser *user, const char *data)
+parse_top_artists (RBAudioscrobblerUser *user, const char *data)
{
GPtrArray *top_artists;
JsonParser *parser;
@@ -1247,7 +1247,7 @@ rb_audioscrobbler_user_parse_top_artists (RBAudioscrobblerUser *user, const char
g_ptr_array_add (top_artists, artist);
- artist->image = gdk_pixbuf_new_from_file_at_size (rb_audioscrobbler_user_calculate_cached_image_path (user, artist),
+ artist->image = gdk_pixbuf_new_from_file_at_size (calculate_cached_image_path (user, artist),
LIST_ITEM_IMAGE_SIZE, LIST_ITEM_IMAGE_SIZE, NULL);
if (artist->image == NULL && json_object_has_member (artist_object, "image") == TRUE) {
JsonArray *image_array;
@@ -1255,7 +1255,7 @@ rb_audioscrobbler_user_parse_top_artists (RBAudioscrobblerUser *user, const char
image_array = json_object_get_array_member (artist_object, "image");
image_object = json_array_get_object_element (image_array, 0);
- rb_audioscrobbler_user_download_image (user, json_object_get_string_member (image_object, "#text"), artist);
+ download_image (user, json_object_get_string_member (image_object, "#text"), artist);
}
}
}
@@ -1270,12 +1270,12 @@ rb_audioscrobbler_user_parse_top_artists (RBAudioscrobblerUser *user, const char
/* recommended artists */
static void
-rb_audioscrobbler_user_load_cached_recommended_artists (RBAudioscrobblerUser *user)
+load_cached_recommended_artists (RBAudioscrobblerUser *user)
{
char *filename;
char *data;
- filename = rb_audioscrobbler_user_calculate_cached_response_path (user, "recommended_artists");
+ filename = calculate_cached_response_path (user, "recommended_artists");
/* delete old data */
if (user->priv->recommended_artists != NULL) {
@@ -1286,7 +1286,7 @@ rb_audioscrobbler_user_load_cached_recommended_artists (RBAudioscrobblerUser *us
/* load cached data if it exists */
if (g_file_get_contents (filename, &data, NULL, NULL) == TRUE) {
rb_debug ("loading cached recommended artists");
- user->priv->recommended_artists = rb_audioscrobbler_user_parse_recommended_artists (user, data);
+ user->priv->recommended_artists = parse_recommended_artists (user, data);
}
/* emit updated signal */
@@ -1298,7 +1298,7 @@ rb_audioscrobbler_user_load_cached_recommended_artists (RBAudioscrobblerUser *us
}
static void
-rb_audioscrobbler_user_request_recommended_artists (RBAudioscrobblerUser *user, int limit)
+request_recommended_artists (RBAudioscrobblerUser *user, int limit)
{
char *sig_arg;
char *sig;
@@ -1324,7 +1324,7 @@ rb_audioscrobbler_user_request_recommended_artists (RBAudioscrobblerUser *user,
msg = soup_message_new ("GET", msg_url);
soup_session_queue_message (user->priv->soup_session,
msg,
- rb_audioscrobbler_user_recommended_artists_response_cb,
+ recommended_artists_response_cb,
user);
g_free (sig_arg);
@@ -1333,16 +1333,16 @@ rb_audioscrobbler_user_request_recommended_artists (RBAudioscrobblerUser *user,
}
static void
-rb_audioscrobbler_user_recommended_artists_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+recommended_artists_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
RBAudioscrobblerUser *user;
GPtrArray *recommended_artists;
user = RB_AUDIOSCROBBLER_USER (user_data);
- recommended_artists = rb_audioscrobbler_user_parse_recommended_artists (user, msg->response_body->data);
+ recommended_artists = parse_recommended_artists (user, msg->response_body->data);
if (recommended_artists != NULL) {
rb_debug ("recommended artists request was successful");
@@ -1352,7 +1352,7 @@ rb_audioscrobbler_user_recommended_artists_response_cb (SoupSession *session,
}
user->priv->recommended_artists = recommended_artists;
- rb_audioscrobbler_user_save_response_to_cache (user, "recommended_artists", msg->response_body->data);
+ save_response_to_cache (user, "recommended_artists", msg->response_body->data);
g_signal_emit (user, rb_audioscrobbler_user_signals[RECOMMENDED_ARTISTS_UPDATED],
0, user->priv->recommended_artists);
@@ -1365,7 +1365,7 @@ rb_audioscrobbler_user_recommended_artists_response_cb (SoupSession *session,
}
static GPtrArray *
-rb_audioscrobbler_user_parse_recommended_artists (RBAudioscrobblerUser *user, const char *data)
+parse_recommended_artists (RBAudioscrobblerUser *user, const char *data)
{
GPtrArray *recommended_artists;
JsonParser *parser;
@@ -1407,7 +1407,7 @@ rb_audioscrobbler_user_parse_recommended_artists (RBAudioscrobblerUser *user, co
g_ptr_array_add (recommended_artists, artist);
artist->image =
- gdk_pixbuf_new_from_file_at_size (rb_audioscrobbler_user_calculate_cached_image_path (user, artist),
+ gdk_pixbuf_new_from_file_at_size (calculate_cached_image_path (user, artist),
LIST_ITEM_IMAGE_SIZE, LIST_ITEM_IMAGE_SIZE, NULL);
if (artist->image == NULL && json_object_has_member (artist_object, "image") == TRUE) {
JsonArray *image_array;
@@ -1415,7 +1415,7 @@ rb_audioscrobbler_user_parse_recommended_artists (RBAudioscrobblerUser *user, co
image_array = json_object_get_array_member (artist_object, "image");
image_object = json_array_get_object_element (image_array, 0);
- rb_audioscrobbler_user_download_image (user, json_object_get_string_member (image_object, "#text"), artist);
+ download_image (user, json_object_get_string_member (image_object, "#text"), artist);
}
}
}
@@ -1430,7 +1430,7 @@ rb_audioscrobbler_user_parse_recommended_artists (RBAudioscrobblerUser *user, co
}
static char *
-rb_audioscrobbler_user_calculate_cached_image_path (RBAudioscrobblerUser *user, RBAudioscrobblerUserData *data)
+calculate_cached_image_path (RBAudioscrobblerUser *user, RBAudioscrobblerUserData *data)
{
const char *rb_cache_dir;
char *cache_dir;
@@ -1471,7 +1471,7 @@ rb_audioscrobbler_user_calculate_cached_image_path (RBAudioscrobblerUser *user,
}
static void
-rb_audioscrobbler_user_download_image (RBAudioscrobblerUser *user, const char *image_url, RBAudioscrobblerUserData *data)
+download_image (RBAudioscrobblerUser *user, const char *image_url, RBAudioscrobblerUserData *data)
{
GFile *src_file;
@@ -1489,7 +1489,7 @@ rb_audioscrobbler_user_download_image (RBAudioscrobblerUser *user, const char *i
GError *error;
/* ensure the dest dir exists */
- dest_filename = rb_audioscrobbler_user_calculate_cached_image_path (user, data);
+ dest_filename = calculate_cached_image_path (user, data);
dest_file_uri = g_filename_to_uri (dest_filename, NULL, NULL);
error = NULL;
rb_uri_create_parent_dirs (dest_file_uri, &error);
@@ -1515,7 +1515,7 @@ rb_audioscrobbler_user_download_image (RBAudioscrobblerUser *user, const char *i
cancellable,
NULL,
NULL,
- rb_audioscrobbler_user_image_download_cb,
+ image_download_cb,
user);
g_object_unref (dest_file);
@@ -1530,7 +1530,7 @@ rb_audioscrobbler_user_download_image (RBAudioscrobblerUser *user, const char *i
}
static void
-rb_audioscrobbler_user_image_download_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
+image_download_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
{
GFile *src_file = G_FILE (source_object);
@@ -1551,7 +1551,7 @@ rb_audioscrobbler_user_image_download_cb (GObject *source_object, GAsyncResult *
data = g_hash_table_lookup (user->priv->file_to_data_map, src_file);
g_hash_table_remove (user->priv->file_to_data_map, src_file);
- dest_file_path = rb_audioscrobbler_user_calculate_cached_image_path (user, data);
+ dest_file_path = calculate_cached_image_path (user, data);
if (data->image != NULL) {
g_object_unref (data->image);
}
@@ -1658,7 +1658,7 @@ rb_audioscrobbler_user_love_track (RBAudioscrobblerUser *user,
strlen (request));
soup_session_queue_message (user->priv->soup_session,
msg,
- rb_audioscrobbler_user_love_track_response_cb,
+ love_track_response_cb,
user);
g_free (sig_arg);
@@ -1669,9 +1669,9 @@ rb_audioscrobbler_user_love_track (RBAudioscrobblerUser *user,
}
static void
-rb_audioscrobbler_user_love_track_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+love_track_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
/* Don't know if there's anything to do here,
* might want a debug message indicating success or failure?
@@ -1719,7 +1719,7 @@ rb_audioscrobbler_user_ban_track (RBAudioscrobblerUser *user,
strlen (request));
soup_session_queue_message (user->priv->soup_session,
msg,
- rb_audioscrobbler_user_ban_track_response_cb,
+ ban_track_response_cb,
user);
g_free (sig_arg);
@@ -1730,9 +1730,9 @@ rb_audioscrobbler_user_ban_track (RBAudioscrobblerUser *user,
}
static void
-rb_audioscrobbler_user_ban_track_response_cb (SoupSession *session,
- SoupMessage *msg,
- gpointer user_data)
+ban_track_response_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
/* Don't know if there's anything to do here,
* might want a debug message indicating success or failure?
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
