Merge lp:~bilalakhtar/gnome-media-player/bugfix into lp:gnome-media-player/0.1

[Bilal Akhtar]

[Bilal Akhtar (bilalakhtar)]

I have fixed bug #524316 here. The bug is here:- https://bugs.launchpad.net/gnome-media-player/+bug/524316

[Bilal Akhtar (bilalakhtar)]

Also, I have fixed a bug in the makefile. The bug was that if one types "make dist" then an error would come because the package wasn't properly declared. The bug has been fixed in this branch

[Michael Lamothe (lamothe-deactivatedaccount-deactivatedaccount)]

Looks good to me. Thanks for the fix.

review: Approve (final)

=== modified file 'Makefile.am'
--- Makefile.am	2010-01-30 14:32:43 +0000
+++ Makefile.am	2010-02-19 10:40:32 +0000
@@ -3,6 +3,8 @@
 
 SUBDIRS = src po
 
+PACKAGE = gnome-media-player
+
 desktopdir = $(datadir)/applications
 desktop_in_files = gnome-media-player.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)

=== modified file 'Makefile.in'
--- Makefile.in	2010-01-30 14:32:43 +0000
+++ Makefile.in	2010-02-19 10:40:32 +0000
@@ -196,7 +196,7 @@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
+PACKAGE = gnome-media-player
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@

=== modified file 'src/main_window.cc'
--- src/main_window.cc	2010-02-16 20:09:50 +0000
+++ src/main_window.cc	2010-02-19 10:40:32 +0000
@@ -324,7 +324,7 @@
 		list_store->clear();
 		add_to_playlist(filename);
 		g_free (filename);
-
+image_play->set(Gtk::Stock::MEDIA_PAUSE, Gtk::ICON_SIZE_MENU);
 		action_play->activate();
 	}
 	gtk_widget_destroy (dialog);