diff -Nru gnome-mplayer-1.0.9a~svn2439/ChangeLog gnome-mplayer-1.0.9a~svn2440/ChangeLog --- gnome-mplayer-1.0.9a~svn2439/ChangeLog 2013-05-16 08:45:09.000000000 +0000 +++ gnome-mplayer-1.0.9a~svn2440/ChangeLog 2013-05-17 08:45:09.000000000 +0000 @@ -1,4 +1,5 @@ Development + Protect for media == null in dbus-interface Tighten up the display in the nemo/nautilus plugins Add support for building Nemo plugin Fix GDK Warning diff -Nru gnome-mplayer-1.0.9a~svn2439/debian/changelog gnome-mplayer-1.0.9a~svn2440/debian/changelog --- gnome-mplayer-1.0.9a~svn2439/debian/changelog 2013-05-16 08:45:22.000000000 +0000 +++ gnome-mplayer-1.0.9a~svn2440/debian/changelog 2013-05-17 08:45:22.000000000 +0000 @@ -1,8 +1,8 @@ -gnome-mplayer (1.0.9a~svn2439-0ubuntu1~gmdevppa1~lucid) lucid; urgency=low +gnome-mplayer (1.0.9a~svn2440-0ubuntu1~gmdevppa1~lucid) lucid; urgency=low * New upstream release. - -- Brandon Snider Thu, 16 May 2013 04:45:02 -0400 + -- Brandon Snider Fri, 17 May 2013 04:45:02 -0400 gnome-mplayer (1.0.2-0ubuntu1) natty; urgency=low diff -Nru gnome-mplayer-1.0.9a~svn2439/src/dbus-interface.c gnome-mplayer-1.0.9a~svn2440/src/dbus-interface.c --- gnome-mplayer-1.0.9a~svn2439/src/dbus-interface.c 2013-05-16 08:45:08.000000000 +0000 +++ gnome-mplayer-1.0.9a~svn2440/src/dbus-interface.c 2013-05-17 08:45:09.000000000 +0000 @@ -112,9 +112,11 @@ gm_log(verbose, G_LOG_LEVEL_DEBUG, "Path matched %s", dbus_message_get_path(message)); if (message_type == DBUS_MESSAGE_TYPE_SIGNAL) { if (g_ascii_strcasecmp(dbus_message_get_member(message), "Open") == 0) { - if (gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) != MEDIA_STATE_UNKNOWN) { - dontplaynext = TRUE; - gmtk_media_player_set_state(GMTK_MEDIA_PLAYER(media), MEDIA_STATE_QUIT); + if (media != NULL) { + if (gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) != MEDIA_STATE_UNKNOWN) { + dontplaynext = TRUE; + gmtk_media_player_set_state(GMTK_MEDIA_PLAYER(media), MEDIA_STATE_QUIT); + } } dbus_error_init(&error); if (dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID)) { @@ -326,8 +328,10 @@ dbus_unhook(); gtk_main_quit(); */ - if (gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) != MEDIA_STATE_UNKNOWN) - dontplaynext = TRUE; + if (media != NULL) { + if (gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) != MEDIA_STATE_UNKNOWN) + dontplaynext = TRUE; + } g_idle_add(set_quit, idledata); return DBUS_HANDLER_RESULT_HANDLED; } @@ -393,10 +397,12 @@ if (g_ascii_strcasecmp(dbus_message_get_member(message), "SetPercent") == 0 && idledata != NULL) { dbus_error_init(&error); if (dbus_message_get_args(message, &error, DBUS_TYPE_DOUBLE, &percent, DBUS_TYPE_INVALID)) { - gmtk_media_player_seek(GMTK_MEDIA_PLAYER(media), - gmtk_media_player_get_attribute_double(GMTK_MEDIA_PLAYER(media), - ATTRIBUTE_LENGTH) * percent, - SEEK_ABSOLUTE); + if (media != NULL) { + gmtk_media_player_seek(GMTK_MEDIA_PLAYER(media), + gmtk_media_player_get_attribute_double(GMTK_MEDIA_PLAYER(media), + ATTRIBUTE_LENGTH) * percent, + SEEK_ABSOLUTE); + } g_idle_add(set_progress_value, idledata); } else { dbus_error_free(&error); @@ -410,10 +416,12 @@ (message, &error, DBUS_TYPE_DOUBLE, &percent, DBUS_TYPE_INT32, &source_id, DBUS_TYPE_INVALID)) { if (source_id != control_id) { idledata->fromdbus = TRUE; - gmtk_media_player_seek(GMTK_MEDIA_PLAYER(media), - gmtk_media_player_get_attribute_double(GMTK_MEDIA_PLAYER(media), - ATTRIBUTE_LENGTH) * percent, - SEEK_ABSOLUTE); + if (media != NULL) { + gmtk_media_player_seek(GMTK_MEDIA_PLAYER(media), + gmtk_media_player_get_attribute_double(GMTK_MEDIA_PLAYER(media), + ATTRIBUTE_LENGTH) * + percent, SEEK_ABSOLUTE); + } } } else { dbus_error_free(&error); @@ -442,8 +450,10 @@ dbus_error_init(&error); if (dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID)) { g_strlcpy(idledata->progress_text, s, sizeof(idledata->progress_text)); - if (gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) != MEDIA_STATE_PLAY) - g_idle_add(set_progress_text, idledata); + if (media != NULL) { + if (gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) != MEDIA_STATE_PLAY) + g_idle_add(set_progress_text, idledata); + } } else { dbus_error_free(&error); } @@ -506,9 +516,12 @@ if (g_ascii_strcasecmp(dbus_message_get_member(message), "SetURL") == 0) { dbus_error_init(&error); if (dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID)) { - gmtk_media_player_set_uri(GMTK_MEDIA_PLAYER(media), s); - g_strlcpy(idledata->url, s, sizeof(idledata->url)); - g_idle_add(show_copyurl, idledata); + if (s != NULL) { + if (media != NULL) + gmtk_media_player_set_uri(GMTK_MEDIA_PLAYER(media), s); + g_strlcpy(idledata->url, s, sizeof(idledata->url)); + g_idle_add(show_copyurl, idledata); + } } else { dbus_error_free(&error); }