From 260e11f96a8d1060979744dc2361401a8b7e6f15 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 24 Aug 2011 12:09:29 -0400 Subject: Import upstream version 0.7.6.1 --- configure | 20 ++++++++++---------- configure.ac | 4 ++-- src/transport-widget.c | 12 ++++++++---- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 1f491bf..dc3a701 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for indicator-sound 0.7.6. +# Generated by GNU Autoconf 2.68 for indicator-sound 0.7.6.1. # # Report bugs to . # @@ -630,8 +630,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='indicator-sound' PACKAGE_TARNAME='indicator-sound' -PACKAGE_VERSION='0.7.6' -PACKAGE_STRING='indicator-sound 0.7.6' +PACKAGE_VERSION='0.7.6.1' +PACKAGE_STRING='indicator-sound 0.7.6.1' PACKAGE_BUGREPORT='conor.curran@canonical.com' PACKAGE_URL='' @@ -1438,7 +1438,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures indicator-sound 0.7.6 to adapt to many kinds of systems. +\`configure' configures indicator-sound 0.7.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1508,7 +1508,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of indicator-sound 0.7.6:";; + short | recursive ) echo "Configuration of indicator-sound 0.7.6.1:";; esac cat <<\_ACEOF @@ -1645,7 +1645,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -indicator-sound configure 0.7.6 +indicator-sound configure 0.7.6.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2014,7 +2014,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by indicator-sound $as_me 0.7.6, which was +It was created by indicator-sound $as_me 0.7.6.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2834,7 +2834,7 @@ fi # Define the identity of the package. PACKAGE=indicator-sound - VERSION=0.7.6 + VERSION=0.7.6.1 cat >>confdefs.h <<_ACEOF @@ -15499,7 +15499,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by indicator-sound $as_me 0.7.6, which was +This file was extended by indicator-sound $as_me 0.7.6.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15565,7 +15565,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -indicator-sound config.status 0.7.6 +indicator-sound config.status 0.7.6.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f1a9b63..cfdb702 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(indicator-sound, 0.7.6, conor.curran@canonical.com) +AC_INIT(indicator-sound, 0.7.6.1, conor.curran@canonical.com) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-sound, 0.7.6) +AM_INIT_AUTOMAKE(indicator-sound, 0.7.6.1) AM_MAINTAINER_MODE diff --git a/src/transport-widget.c b/src/transport-widget.c index 564b76f..22e3b2a 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -181,13 +181,17 @@ transport_widget_init (TransportWidget *self) /* create widget path */ spinner_widget_path = gtk_widget_path_new(); - gtk_widget_path_iter_set_name (spinner_widget_path, -1 , "IndicatorSoundSpinner"); + gtk_widget_path_iter_set_name (spinner_widget_path, -1 , "IndicatorSound"); + gtk_widget_path_append_type (spinner_widget_path, GTK_TYPE_MENU); + gtk_widget_path_append_type (spinner_widget_path, GTK_TYPE_MENU_ITEM); gtk_widget_path_append_type (spinner_widget_path, GTK_TYPE_SPINNER); /* create style context and append path */ spinner_style_context = gtk_style_context_new(); gtk_style_context_set_path (spinner_style_context, spinner_widget_path); + gtk_style_context_add_class (spinner_style_context, GTK_STYLE_CLASS_MENU); + gtk_style_context_add_class (spinner_style_context, GTK_STYLE_CLASS_MENUITEM); gtk_style_context_add_class (spinner_style_context, GTK_STYLE_CLASS_SPINNER); } #endif @@ -1282,7 +1286,7 @@ draw (GtkWidget* button, cairo_t *cr) #if GTK_CHECK_VERSION(3, 0, 0) gtk_style_context_add_class (gtk_widget_get_style_context (button), - "menu"); + GTK_STYLE_CLASS_MENU); #endif CairoColorRGB bg_color, fg_color, bg_selected, bg_prelight; CairoColorRGB color_middle[2], color_middle_prelight[2], color_outer[2], color_outer_prelight[2], @@ -1414,7 +1418,7 @@ draw (GtkWidget* button, cairo_t *cr) draw_gradient (cr, RECT_WIDTH / 2 + X, Y + 1, - (RECT_WIDTH - 7)/2, + (RECT_WIDTH - 4.5)/2, MIDDLE_RADIUS, INNER_COMPRESSED_START, INNER_COMPRESSED_END); @@ -1466,7 +1470,7 @@ draw (GtkWidget* button, cairo_t *cr) draw_gradient (cr, RECT_WIDTH / 2 + X, Y + 1, - (RECT_WIDTH - 7)/2, + (RECT_WIDTH - 4.5)/2, MIDDLE_RADIUS, MIDDLE_START_PRELIGHT, MIDDLE_END_PRELIGHT); -- cgit v1.2.3