diff options
author | Conor Curran <conor.curran@canonical.com> | 2011-01-11 03:57:41 -0600 |
---|---|---|
committer | Conor Curran <conor.curran@canonical.com> | 2011-01-11 03:57:41 -0600 |
commit | 590a3ad4a7bf384a7023365c85e127a42cd4b5b2 (patch) | |
tree | a77a7469dcabf847ed8a6e2d68b880978270d4f0 | |
parent | 9452f0262c608fc1ee6509078b3538f68b5f0993 (diff) | |
download | ayatana-indicator-sound-590a3ad4a7bf384a7023365c85e127a42cd4b5b2.tar.gz ayatana-indicator-sound-590a3ad4a7bf384a7023365c85e127a42cd4b5b2.tar.bz2 ayatana-indicator-sound-590a3ad4a7bf384a7023365c85e127a42cd4b5b2.zip |
more warnings sorted
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/indicator-sound.c | 14 | ||||
-rw-r--r-- | src/sound-service-dbus.c | 20 | ||||
-rw-r--r-- | src/sound-service.c | 4 | ||||
-rw-r--r-- | src/transport-widget.c | 4 | ||||
-rw-r--r-- | src/volume-widget.c | 3 |
6 files changed, 30 insertions, 17 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 99a00c0..22f88d7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,7 @@ libsoundmenu_la_SOURCES = \ volume-widget.h \ dbus-shared-names.h -libsoundmenu_la_CFLAGS = $(APPLET_CFLAGS) -Wall -DG_LOG_DOMAIN=\"Indicator-Sound\" +libsoundmenu_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror -DG_LOG_DOMAIN=\"Indicator-Sound\" libsoundmenu_la_LIBADD = $(APPLET_LIBS) libsoundmenu_la_LDFLAGS = -module -avoid-version diff --git a/src/indicator-sound.c b/src/indicator-sound.c index 992dfdd..9d108d8 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -152,6 +152,8 @@ indicator_sound_class_init (IndicatorSoundClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + g_debug(" !!!!!!!!!!!!!!!!! here 0"); + object_class->dispose = indicator_sound_dispose; object_class->finalize = indicator_sound_finalize; @@ -164,16 +166,17 @@ indicator_sound_class_init (IndicatorSoundClass *klass) io_class->get_menu = get_menu; io_class->scroll = indicator_sound_scroll; design_team_size = gtk_icon_size_register("design-team-size", 22, 22); - - return; } static void indicator_sound_init (IndicatorSound *self) { + g_debug(" !!!!!!!!!!!!!!!!! here 0"); + self->service = NULL; self->service = indicator_service_manager_new_version(INDICATOR_SOUND_DBUS_NAME, INDICATOR_SOUND_DBUS_VERSION); + prepare_state_machine(); prepare_blocked_animation(); animation_id = 0; @@ -186,6 +189,8 @@ indicator_sound_init (IndicatorSound *self) priv->dbus_proxy = NULL; GList* t_list = NULL; priv->transport_widgets_list = t_list; + + g_debug(" !!!!!!!!!!!!!!!!! here 1"); g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, @@ -699,7 +704,6 @@ static void g_signal_cb ( GDBusProxy *proxy, gpointer user_data) { IndicatorSound *self = INDICATOR_SOUND(user_data); - GError *error = NULL; gboolean input = g_variant_get_boolean (parameters); g_return_if_fail ( IS_INDICATOR_SOUND(self) ); @@ -825,7 +829,7 @@ key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data) } } else if (IS_TRANSPORT_WIDGET(menuitem) == TRUE) { - TransportWidget* transport_widget; + TransportWidget* transport_widget = NULL; GList* elem; for ( elem = priv->transport_widgets_list; elem; elem = elem->next ) { @@ -880,7 +884,7 @@ key_release_cb(GtkWidget* widget, GdkEventKey* event, gpointer data) menuitem = GTK_MENU_SHELL (widget)->active_menu_item; if (IS_TRANSPORT_WIDGET(menuitem) == TRUE) { - TransportWidget* transport_widget; + TransportWidget* transport_widget = NULL; GList* elem; for(elem = priv->transport_widgets_list; elem; elem = elem->next) { diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c index 8e0f31a..223c1d9 100644 --- a/src/sound-service-dbus.c +++ b/src/sound-service-dbus.c @@ -40,6 +40,12 @@ static void bus_method_call (GDBusConnection * connection, GDBusMethodInvocation * invocation, gpointer user_data); +static GDBusInterfaceVTable interface_table = { + method_call: bus_method_call, + get_property: NULL, /* No properties */ + set_property: NULL /* No properties */ +}; + typedef struct _SoundServiceDbusPrivate SoundServiceDbusPrivate; @@ -85,14 +91,14 @@ sound_service_dbus_class_init (SoundServiceDbusClass *klass) } } - if (interface_info == NULL) { - interface_info = g_dbus_node_info_lookup_interface (node_info, + if (interface_info == NULL) { + interface_info = g_dbus_node_info_lookup_interface (node_info, INDICATOR_SOUND_SERVICE_DBUS_INTERFACE); - if (interface_info == NULL) { - g_error("Unable to find interface '" INDICATOR_SOUND_SERVICE_DBUS_INTERFACE "'"); - } - } + if (interface_info == NULL) { + g_error("Unable to find interface '" INDICATOR_SOUND_SERVICE_DBUS_INTERFACE "'"); + } + } } static void @@ -117,7 +123,7 @@ sound_service_dbus_init (SoundServiceDbus *self) g_dbus_connection_register_object (priv->connection, INDICATOR_SOUND_SERVICE_DBUS_OBJECT, interface_info, - NULL, + &interface_table, NULL, NULL, &error); diff --git a/src/sound-service.c b/src/sound-service.c index 98f1881..defcb94 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -40,8 +40,8 @@ service_shutdown (IndicatorService *service, gpointer user_data) { if (mainloop != NULL) { g_debug("Service shutdown !"); - close_pulse_activites(); - g_main_loop_quit(mainloop); + //close_pulse_activites(); + //g_main_loop_quit(mainloop); } return; } diff --git a/src/transport-widget.c b/src/transport-widget.c index 9b45734..a276a31 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -757,7 +757,9 @@ _color_rgb_to_hls (gdouble *r, gdouble red; gdouble green; gdouble blue; - gdouble h, l, s; + gdouble h = 0; + gdouble l; + gdouble s; gdouble delta; red = *r; diff --git a/src/volume-widget.c b/src/volume-widget.c index 6fd4632..38dc9bb 100644 --- a/src/volume-widget.c +++ b/src/volume-widget.c @@ -28,6 +28,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include "volume-widget.h" #include "common-defs.h" #include <libido/idoscalemenuitem.h> +#include "indicator-sound.h" typedef struct _VolumeWidgetPrivate VolumeWidgetPrivate; @@ -136,7 +137,7 @@ volume_widget_property_update( DbusmenuMenuitem* item, gchar* property, gdouble update = g_variant_get_double (value); //g_debug("volume-widget - update level with value %f", update); gtk_range_set_value(range, update); - determine_state_from_volume(update); + determine_state_from_volume(update); } } } |