aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/indicator-sound.c5
-rw-r--r--src/indicator-sound.h4
-rw-r--r--src/metadata-widget.c4
-rw-r--r--src/sound-service.c4
-rw-r--r--tests/test-indicator-sound-dbus-client.c74
-rw-r--r--tests/test-indicator-sound-dbus-server.c1
6 files changed, 33 insertions, 59 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;
}
diff --git a/tests/test-indicator-sound-dbus-client.c b/tests/test-indicator-sound-dbus-client.c
index 1c23dc5..a9ac9ff 100644
--- a/tests/test-indicator-sound-dbus-client.c
+++ b/tests/test-indicator-sound-dbus-client.c
@@ -34,59 +34,42 @@ static DBusGProxy * proxy= NULL;
static void
test_fetch_mute(DBusGProxy * proxy)
{
- GError * error = NULL;
- gboolean *fetched_mute_value;
- fetched_mute_value = g_new0(gboolean, 1);
- org_ayatana_indicator_sound_get_sink_mute(proxy, fetched_mute_value, &error);
+ GError * error = NULL;
+ gboolean *fetched_mute_value;
+ fetched_mute_value = g_new0(gboolean, 1);
+ org_ayatana_indicator_sound_get_sink_mute(proxy, fetched_mute_value, &error);
if (error != NULL) {
g_warning("test-indicator-sound-dbus-client::test_fetch_mute - Unable to fetch mute: %s", error->message);
g_error_free(error);
- g_free(fetched_mute_value);
- return;
- }
- g_assert(TEST_MUTE_VALUE == *fetched_mute_value);
g_free(fetched_mute_value);
+ return;
+ }
+ g_assert(TEST_MUTE_VALUE == *fetched_mute_value);
+ g_free(fetched_mute_value);
}
-static void
-test_fetch_volume(DBusGProxy * proxy)
+static void
+test_fetch_availability(DBusGProxy * proxy)
{
GError * error = NULL;
- gdouble *volume_percent_input;
- volume_percent_input = g_new0(gdouble, 1);
- org_ayatana_indicator_sound_get_sink_volume(proxy, volume_percent_input, &error);
+ gboolean * available_input;
+ available_input = g_new0(gboolean, 1);
+ org_ayatana_indicator_sound_get_sink_availability(proxy, available_input, &error);
if (error != NULL) {
- g_warning("test-indicator-sound-dbus-client::test_fetch_volume - Unable to fetch VOLUME: %s", error->message);
+ g_warning("test-indicator-sound-dbus-client::test_fetch_availability - unable to fetch availability %s", error->message);
g_error_free(error);
- g_free(volume_percent_input);
- return;
+ g_free(available_input);
+ return;
}
- g_assert(TEST_VOLUME_VALUE == *volume_percent_input);
- g_free(volume_percent_input);
-}
-
-static void
-test_fetch_availability(DBusGProxy * proxy)
-{
- GError * error = NULL;
- gboolean * available_input;
- available_input = g_new0(gboolean, 1);
- org_ayatana_indicator_sound_get_sink_availability(proxy, available_input, &error);
- if (error != NULL) {
- g_warning("test-indicator-sound-dbus-client::test_fetch_availability - unable to fetch availability %s", error->message);
- g_error_free(error);
- g_free(available_input);
- return;
- }
- g_assert(TEST_AVAILABLE_VALUE == *available_input);
- g_free(available_input);
+ g_assert(TEST_AVAILABLE_VALUE == *available_input);
+ g_free(available_input);
}
gboolean
kill_func (gpointer userdata)
{
- g_free(proxy);
+ g_free(proxy);
g_main_loop_quit(mainloop);
return FALSE;
}
@@ -107,24 +90,17 @@ main (gint argc, gchar * argv[])
}
DBusGProxy * proxy = dbus_g_proxy_new_for_name_owner(session_bus,
- ":1.0",
- INDICATOR_SOUND_SERVICE_DBUS_OBJECT,
- INDICATOR_SOUND_SERVICE_DBUS_INTERFACE,
- &error);
+ ":1.0",
+ INDICATOR_SOUND_SERVICE_DBUS_OBJECT,
+ INDICATOR_SOUND_SERVICE_DBUS_INTERFACE,
+ &error);
if (error != NULL) {
g_error("Unable to get property proxy: %s", error->message);
return 1;
}
-/* g_test_add_func("/test-indicator-sound-dbus/test-fetch-mute", test_fetch_mute);*/
-/* g_test_add_func("/test-indicator-sound-dbus/test-fetch-volume", test_fetch_volume);*/
-/* g_test_add_func("/test-indicator-sound-dbus/test-fetch-availability", test_fetch_availability);*/
-/* g_test_queue_free(proxy);*/
-/* return g_test_run();*/
-
- test_fetch_mute(proxy);
- test_fetch_volume(proxy);
- test_fetch_availability(proxy);
+ test_fetch_mute(proxy);
+ test_fetch_availability(proxy);
g_timeout_add_seconds(2, kill_func, NULL);
diff --git a/tests/test-indicator-sound-dbus-server.c b/tests/test-indicator-sound-dbus-server.c
index 6912dc4..49da136 100644
--- a/tests/test-indicator-sound-dbus-server.c
+++ b/tests/test-indicator-sound-dbus-server.c
@@ -50,7 +50,6 @@ main (gint argc, gchar * argv[])
// Set the mute value
sound_service_dbus_update_sink_mute(dbus_interface, TEST_MUTE_VALUE);
- sound_service_dbus_update_sink_volume(dbus_interface, TEST_VOLUME_VALUE);
sound_service_dbus_update_sink_availability(dbus_interface, TEST_AVAILABLE_VALUE);
g_timeout_add_seconds(4, kill_func, NULL);
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 12:55:58 +0000