[empathy] Move empathy_check_available_state() from utils to sound-manager
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Move empathy_check_available_state() from utils to sound-manager
- Date: Thu, 18 Jul 2013 11:02:32 +0000 (UTC)
commit eaa91c2dea8e630e113025764d678c823761e1e6
Author: Xavier Claessens <xavier claessens collabora co uk>
Date: Thu Jul 18 12:31:49 2013 +0200
Move empathy_check_available_state() from utils to sound-manager
It is used only from one place, there is no reason to have it
in utils.
https://bugzilla.gnome.org/show_bug.cgi?id=704454
libempathy-gtk/empathy-sound-manager.c | 18 ++++++++++++++++++
libempathy/empathy-utils.c | 18 ------------------
libempathy/empathy-utils.h | 1 -
3 files changed, 18 insertions(+), 19 deletions(-)
---
diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c
index 600816f..4f69c62 100644
--- a/libempathy-gtk/empathy-sound-manager.c
+++ b/libempathy-gtk/empathy-sound-manager.c
@@ -23,6 +23,7 @@
#include <glib/gi18n-lib.h>
#include "empathy-gsettings.h"
+#include "empathy-presence-manager.h"
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
@@ -162,6 +163,23 @@ empathy_sound_manager_dup_singleton (void)
}
static gboolean
+empathy_check_available_state (void)
+{
+ TpConnectionPresenceType presence;
+ EmpathyPresenceManager *presence_mgr;
+
+ presence_mgr = empathy_presence_manager_dup_singleton ();
+ presence = empathy_presence_manager_get_state (presence_mgr);
+ g_object_unref (presence_mgr);
+
+ if (presence != TP_CONNECTION_PRESENCE_TYPE_AVAILABLE &&
+ presence != TP_CONNECTION_PRESENCE_TYPE_UNSET)
+ return FALSE;
+
+ return TRUE;
+}
+
+static gboolean
empathy_sound_pref_is_enabled (EmpathySoundManager *self,
EmpathySound sound_id)
{
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 0efe3a1..25624bf 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -34,7 +34,6 @@
#include <math.h>
#include "empathy-client-factory.h"
-#include "empathy-presence-manager.h"
#include "extensions.h"
#include <math.h>
@@ -422,23 +421,6 @@ empathy_file_lookup (const gchar *filename, const gchar *subdir)
return path;
}
-gboolean
-empathy_check_available_state (void)
-{
- TpConnectionPresenceType presence;
- EmpathyPresenceManager *presence_mgr;
-
- presence_mgr = empathy_presence_manager_dup_singleton ();
- presence = empathy_presence_manager_get_state (presence_mgr);
- g_object_unref (presence_mgr);
-
- if (presence != TP_CONNECTION_PRESENCE_TYPE_AVAILABLE &&
- presence != TP_CONNECTION_PRESENCE_TYPE_UNSET)
- return FALSE;
-
- return TRUE;
-}
-
gint
empathy_uint_compare (gconstpointer a,
gconstpointer b)
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 440fe83..f002c41 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -60,7 +60,6 @@ const gchar * empathy_presence_to_str (TpConnectionPresenceType presence);
TpConnectionPresenceType empathy_presence_from_str (const gchar *str);
gchar * empathy_file_lookup (const gchar *filename,
const gchar *subdir);
-gboolean empathy_check_available_state (void);
gint empathy_uint_compare (gconstpointer a,
gconstpointer b);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]