* Added missing memory frees and object unrefs
* Reordered g_type_init () so that it gets called before
the thread_init. In glib >=2.24, g_type_init also prepares
the threads
int
main (int argc, char **argv)
{
int
main (int argc, char **argv)
{
- MvsMInfoProviderService *service;
- DBusGConnection *connection;
+ MvsMInfoProviderService *service = NULL;
+ DBusGConnection *connection = NULL;
+ GMainLoop *loop = NULL;
if (!g_thread_supported ())
g_thread_init (NULL);
if (!g_thread_supported ())
g_thread_init (NULL);
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (connection == NULL) {
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (connection == NULL) {
- g_warning ("Unable to connect to dbus: %sn", error->message);
+ g_warning ("Unable to connect to dbus: %s", error->message);
g_error_free (error);
return -1;
}
g_error_free (error);
return -1;
}
g_main_loop_run (loop);
g_object_unref (service);
g_main_loop_run (loop);
g_object_unref (service);
+ g_main_loop_unref (loop);
+ dbus_g_connection_unref (connection);
+ g_error_free (error);
xmlNodePtr cur_node = NULL;
MvsTmdbMovie *movie_info = mvs_tmdb_movie_new ();
xmlNodePtr cur_node = NULL;
MvsTmdbMovie *movie_info = mvs_tmdb_movie_new ();
+ /* We use the loop to append each property to the movie object */
for (cur_node = node; cur_node; cur_node = cur_node->next) {
if (cur_node->type == XML_ELEMENT_NODE) {
for (cur_node = node; cur_node; cur_node = cur_node->next) {
if (cur_node->type == XML_ELEMENT_NODE) {
- gchar *value = xmlNodeGetContent (cur_node);
+ const gchar *value = xmlNodeGetContent (cur_node);
g_object_set (movie_info, cur_node->name, value, NULL);
}
g_object_set (movie_info, cur_node->name, value, NULL);
}
-process_response (SoupSession *session, SoupMessage *message,
+process_response_cb (SoupSession *session, SoupMessage *message,
gpointer user_data)
{
MvsMInfoProvider *self = MVS_MINFO_PROVIDER (user_data);
gpointer user_data)
{
MvsMInfoProvider *self = MVS_MINFO_PROVIDER (user_data);
}
g_signal_emit (self, signals[RESPONSE_RECEIVED], 0, list);
}
g_signal_emit (self, signals[RESPONSE_RECEIVED], 0, list);
if (message) {
soup_session_queue_message (session, message,
if (message) {
soup_session_queue_message (session, message,
- process_response, self);
+ process_response_cb, self);
g_free (*property);
*property = g_strdup (value);
g_free (*property);
*property = g_strdup (value);
+ return *property != NULL;
-response_received_callback (MvsMInfoProvider *minfo_provider, GList *list,
+response_received_cb (MvsMInfoProvider *minfo_provider, GList *list,
gpointer user_data)
{
GList *tmp = NULL;
gpointer user_data)
{
GList *tmp = NULL;
{
MvsMInfoProvider *minfo_provider = NULL;
GOptionContext *context = NULL;
{
MvsMInfoProvider *minfo_provider = NULL;
GOptionContext *context = NULL;
- GOptionGroup *gst_option_group = NULL;
GError *error = NULL;
MvsService service = MVS_SERVICE_TMDB;
g_type_init ();
GError *error = NULL;
MvsService service = MVS_SERVICE_TMDB;
g_type_init ();
-
- g_thread_init (NULL);
+ if (!g_thread_supported ())
+ g_thread_init (NULL);
context = g_option_context_new (" - Tests data provider behavior");
g_option_context_add_main_entries (context, entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error)) {
g_critical ("option parsing failed: %s", error->message);
context = g_option_context_new (" - Tests data provider behavior");
g_option_context_add_main_entries (context, entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error)) {
g_critical ("option parsing failed: %s", error->message);
+ g_error_free (error);
+ g_option_context_free (context);
minfo_provider = mvs_minfo_provider_new ();
g_signal_connect (minfo_provider, "response-received",
minfo_provider = mvs_minfo_provider_new ();
g_signal_connect (minfo_provider, "response-received",
- G_CALLBACK (response_received_callback), NULL);
+ G_CALLBACK (response_received_cb), NULL);
loop = g_main_loop_new (NULL, FALSE);
loop = g_main_loop_new (NULL, FALSE);
query);
g_main_loop_run (loop);
query);
g_main_loop_run (loop);
g_object_unref (minfo_provider);
g_main_loop_unref (loop);
g_object_unref (minfo_provider);
g_main_loop_unref (loop);
+ g_option_context_free (context);