diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-08-18 10:55:43 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-08-18 10:55:43 +0100 |
| commit | 8c5284005a19897d5e07fdb9bfe62b0a5d126058 (patch) | |
| tree | 4dee261f96c7f87113be00e0c185dd49eefa97fc /src | |
| parent | f18466945a43718111ec93a79f1936157b02ce3f (diff) | |
| download | ayatana-indicator-sound-8c5284005a19897d5e07fdb9bfe62b0a5d126058.tar.gz ayatana-indicator-sound-8c5284005a19897d5e07fdb9bfe62b0a5d126058.tar.bz2 ayatana-indicator-sound-8c5284005a19897d5e07fdb9bfe62b0a5d126058.zip | |
tests fixed, and metadata height reset readjustment fixed
Diffstat (limited to 'src')
| -rw-r--r-- | src/indicator-sound.c | 5 | ||||
| -rw-r--r-- | src/indicator-sound.h | 4 | ||||
| -rw-r--r-- | src/metadata-widget.c | 4 | ||||
| -rw-r--r-- | src/sound-service.c | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/indicator-sound.c b/src/indicator-sound.c index 557ce85..ba36290 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -32,11 +32,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-bindings.h> -#include <libindicator/indicator.h> -#include <libindicator/indicator-object.h> -#include <libindicator/indicator-service-manager.h> -#include <libindicator/indicator-image-helper.h> - #include "indicator-sound.h" #include "transport-widget.h" #include "metadata-widget.h" diff --git a/src/indicator-sound.h b/src/indicator-sound.h index 251295c..9f829bb 100644 --- a/src/indicator-sound.h +++ b/src/indicator-sound.h @@ -23,6 +23,10 @@ PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <libindicator/indicator.h> +#include <libindicator/indicator-object.h> +#include <libindicator/indicator-service-manager.h> +#include <libindicator/indicator-image-helper.h> #define INDICATOR_SOUND_TYPE (indicator_sound_get_type ()) #define INDICATOR_SOUND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SOUND_TYPE, IndicatorSound)) diff --git a/src/metadata-widget.c b/src/metadata-widget.c index da18ccc..aaf71e2 100644 --- a/src/metadata-widget.c +++ b/src/metadata-widget.c @@ -150,8 +150,8 @@ metadata_widget_init (MetadataWidget *self) g_signal_connect(G_OBJECT(twin_item), "property-changed", G_CALLBACK(metadata_widget_property_update), self); gtk_widget_show_all (priv->hbox); - gtk_container_add (GTK_CONTAINER (self), hbox); - + gtk_widget_set_size_request(GTK_WIDGET(self), 200, 60); + gtk_container_add (GTK_CONTAINER (self), hbox); } static gboolean diff --git a/src/sound-service.c b/src/sound-service.c index 8768cd3..16fa87c 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -42,8 +42,8 @@ service_shutdown (IndicatorService *service, gpointer user_data) if (mainloop != NULL) { g_debug("Service shutdown !"); // TODO: uncomment for release !! - close_pulse_activites(); - g_main_loop_quit(mainloop); + //close_pulse_activites(); + //g_main_loop_quit(mainloop); } return; } |