Fix icon warnings upon startup, play/stop/prev/next buttons were broken.

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646822
ced4f26e05
This commit is contained in:
landry 2012-02-16 21:36:03 +00:00
parent 72bbe18ad2
commit 024e246367
3 changed files with 128 additions and 2 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.45 2012/01/03 07:03:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.46 2012/02/16 21:36:03 landry Exp $
COMMENT= GNOME music player client
VERSION= 11.8.16
DISTNAME= gmpc-${VERSION}
REVISION = 3
REVISION = 4
CATEGORIES= audio
@ -36,6 +36,10 @@ USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
# fuck you vala, for running valac without reason and generating broken code.
post-patch:
touch ${WRKSRC}/src/gmpc_vala.stamp
BUILD_DEPENDS= x11/gob2 \
x11/gnome/doc-utils \
lang/vala>=0.7.10

View File

@ -0,0 +1,84 @@
$OpenBSD: patch-glade_playlist3_ui,v 1.1 2012/02/16 21:36:03 landry Exp $
Fix icon warnings upon startup
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646822
http://repo.or.cz/w/gmpc.git/commit/ced4f26e053bff5bb04205f623a179fc97fdfe52
--- glade/playlist3.ui.orig Wed Aug 17 05:09:54 2011
+++ glade/playlist3.ui Sun Feb 12 20:45:39 2012
@@ -436,16 +436,17 @@
<child>
<object class="GtkButton" id="button_previous">
<property name="visible">True</property>
+ <property name="use_action_appearance">False</property>
<property name="related-action">MPDPrevious</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
<property name="use_action_appearance">False</property>
<child>
- <object class="GtkImage" id="image10">
+ <object class="GtkImage" id="button_previous_image">
<property name="visible">True</property>
<property name="stock">gtk-media-previous</property>
- </object>
+ </object>
</child>
</object>
<packing>
@@ -455,18 +456,18 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="top_button">
+ <object class="GtkButton" id="stop_button">
<property name="visible">True</property>
+ <property name="use_action_appearance">False</property>
<property name="related-action">MPDStop</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
- <property name="use_action_appearance">False</property>
<child>
- <object class="GtkImage" id="stop_button_image">
+ <object class="GtkImage" id="button_stop_image">
<property name="visible">True</property>
<property name="stock">gtk-media-stop</property>
- </object>
+ </object>
</child>
</object>
<packing>
@@ -478,15 +479,16 @@
<child>
<object class="GtkButton" id="play_button">
<property name="visible">True</property>
+ <property name="use_action_appearance">False</property>
<property name="related-action">MPDPlayPause</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
<child>
- <object class="GtkImage" id="play_button_image">
+ <object class="GtkImage" id="play_button_image">
<property name="visible">True</property>
<property name="stock">gtk-media-play</property>
- </object>
+ </object>
</child>
</object>
<packing>
@@ -498,13 +500,13 @@
<child>
<object class="GtkButton" id="next_button">
<property name="visible">True</property>
+ <property name="use_action_appearance">False</property>
<property name="related-action">MPDNext</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<child>
- <object class="GtkImage" id="image11">
+ <object class="GtkImage" id="next_button_image">
<property name="visible">True</property>
<property name="stock">gtk-media-next</property>
</object>

View File

@ -0,0 +1,38 @@
$OpenBSD: patch-src_playlist3_c,v 1.1 2012/02/16 21:36:03 landry Exp $
Fix icon warnings upon startup
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646822
http://repo.or.cz/w/gmpc.git/commit/ced4f26e053bff5bb04205f623a179fc97fdfe52
--- src/playlist3.c.orig Wed Aug 17 05:09:55 2011
+++ src/playlist3.c Sun Feb 12 20:45:39 2012
@@ -1632,7 +1632,8 @@ static void playlist_status_changed(MpdObj * mi, Chang
gtk_action_set_stock_id(GTK_ACTION(gtk_builder_get_object(pl3_xml, "MPDPlayPause")), "gtk-media-pause");
gtk_image_set_from_stock(GTK_IMAGE
(gtk_builder_get_object
- (pl3_xml, "play_button_image")), "gtk-media-pause", GTK_ICON_SIZE_BUTTON);
+ (pl3_xml, "play_button_image")), "gtk-media-pause",
+ GTK_ICON_SIZE_MENU);
/**
* Update window title
@@ -1669,8 +1670,8 @@ static void playlist_status_changed(MpdObj * mi, Chang
gtk_action_set_stock_id(GTK_ACTION(gtk_builder_get_object(pl3_xml, "MPDPlayPause")), "gtk-media-play");
gtk_image_set_from_stock(GTK_IMAGE
(gtk_builder_get_object
- (pl3_xml, "play_button_image")), "gtk-media-play", GTK_ICON_SIZE_BUTTON);
-
+ (pl3_xml, "play_button_image")), "gtk-media-play",
+ GTK_ICON_SIZE_MENU);
/**
* Set paused in Window string
*/
@@ -1704,8 +1705,8 @@ static void playlist_status_changed(MpdObj * mi, Chang
gtk_image_set_from_stock(GTK_IMAGE
(gtk_builder_get_object
- (pl3_xml, "play_button_image")), "gtk-media-play", GTK_ICON_SIZE_BUTTON);
-
+ (pl3_xml, "play_button_image")), "gtk-media-play",
+ GTK_ICON_SIZE_MENU);
if (gmpc_profiles_get_number_of_profiles(gmpc_profiles) > 1)
{
gchar *id = gmpc_profiles_get_current(gmpc_profiles);