aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2011-01-23 17:18:52 +0100
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2011-01-23 17:18:52 +0100
commit9c765ddc17fefb9d0839b75c66551ed72e187bfd (patch)
treeef039e8fa8628a1a9bd961bf0464b5e1ba933062
parent463c714aac4835bcdfda3c523122c13fac1586f3 (diff)
downloadayatana-indicator-sound-9c765ddc17fefb9d0839b75c66551ed72e187bfd.tar.gz
ayatana-indicator-sound-9c765ddc17fefb9d0839b75c66551ed72e187bfd.tar.bz2
ayatana-indicator-sound-9c765ddc17fefb9d0839b75c66551ed72e187bfd.zip
indentation fixes
-rw-r--r--src/indicator-sound.c81
1 files changed, 42 insertions, 39 deletions
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index aa7c43e..15c8cb0 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -388,23 +388,26 @@ static void indicator_sound_notification_init (IndicatorSound *self)
{
IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(self);
- if (notify_init(PACKAGE_NAME)) {
- GList* caps = notify_get_server_caps();
- gboolean has_notify_osd = FALSE;
+ if (!notify_init(PACKAGE_NAME))
+ return;
- if (caps) {
- if (g_list_find_custom(caps, "x-canonical-private-synchronous", (GCompareFunc) g_strcmp0)) {
- has_notify_osd = TRUE;
- }
- g_list_foreach(caps, (GFunc) g_free, NULL);
- g_list_free(caps);
- }
+ GList* caps = notify_get_server_caps();
+ gboolean has_notify_osd = FALSE;
- if (has_notify_osd) {
- priv->notification = notify_notification_new(PACKAGE_NAME, NULL, NULL, NULL);
- notify_notification_set_hint_string(priv->notification, "x-canonical-private-synchronous", "");
+ if (caps) {
+ if (g_list_find_custom(caps, "x-canonical-private-synchronous",
+ (GCompareFunc) g_strcmp0)) {
+ has_notify_osd = TRUE;
}
- }
+ g_list_foreach(caps, (GFunc) g_free, NULL);
+ g_list_free(caps);
+ }
+
+ if (has_notify_osd) {
+ priv->notification = notify_notification_new(PACKAGE_NAME, NULL, NULL, NULL);
+ notify_notification_set_hint_string(priv->notification,
+ "x-canonical-private-synchronous", "");
+ }
}
static void
@@ -998,31 +1001,31 @@ indicator_sound_notification_show(IndicatorSound *self, double value)
if (priv->notification == NULL)
return;
- char *icon;
- const int notify_value = CLAMP((int)value, -1, 101);
- gint state = determine_state_from_volume (CLAMP(value, 0, 100));
-
- if (state == STATE_ZERO) {
- GtkIconTheme *theme = gtk_icon_theme_get_default();
- if (gtk_icon_theme_has_icon(theme, "audio-volume-off")) {
- // Not available in all the themes
- icon = "audio-volume-off";
- } else {
- icon = "audio-volume-muted";
- }
- } else if (state == STATE_LOW) {
- icon = "audio-volume-low";
- } else if (state == STATE_MEDIUM) {
- icon = "audio-volume-medium";
- } else if (state == STATE_HIGH) {
- icon = "audio-volume-high";
- } else {
- icon = "audio-volume-muted";
- }
-
- notify_notification_update(priv->notification, PACKAGE_NAME, NULL, icon);
- notify_notification_set_hint_int32(priv->notification, "value", notify_value);
- notify_notification_show(priv->notification, NULL);
+ char *icon;
+ const int notify_value = CLAMP((int)value, -1, 101);
+ gint state = determine_state_from_volume (CLAMP(value, 0, 100));
+
+ if (state == STATE_ZERO) {
+ GtkIconTheme *theme = gtk_icon_theme_get_default();
+ if (gtk_icon_theme_has_icon(theme, "audio-volume-off")) {
+ // Not available in all the themes
+ icon = "audio-volume-off";
+ } else {
+ icon = "audio-volume-muted";
+ }
+ } else if (state == STATE_LOW) {
+ icon = "audio-volume-low";
+ } else if (state == STATE_MEDIUM) {
+ icon = "audio-volume-medium";
+ } else if (state == STATE_HIGH) {
+ icon = "audio-volume-high";
+ } else {
+ icon = "audio-volume-muted";
+ }
+
+ notify_notification_update(priv->notification, PACKAGE_NAME, NULL, icon);
+ notify_notification_set_hint_int32(priv->notification, "value", notify_value);
+ notify_notification_show(priv->notification, NULL);
}
static void