Remove EmpathyPresence object and have "presence" and "presence-message" properties...

[empathy.git] / libempathy-gtk / empathy-ui-utils.c

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index eabdc0a4607763ef1c5752ce12efc5bd9aa4b1cc..0b29232bcfb661a1a8c2c078e15762cd96456525 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -28,6 +28,8 @@
  *          Jeroen Zwartepoorte
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
@@ -63,7 +65,13 @@ get_glade_file (const gchar *filename,
        const char *name;
        GtkWidget **widget_ptr;
 
-       path = g_build_filename (DATADIR, "empathy", filename, NULL);
+       path = g_build_filename (UNINSTALLED_GLADE_DIR, filename, NULL);
+       if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
+               g_free (path);
+               path = g_build_filename (DATADIR, "empathy", filename, NULL);
+       }
+       empathy_debug (DEBUG_DOMAIN, "Loading glade file %s", path);
+
        gui = glade_xml_new (path, root, domain);
        g_free (path);
 
@@ -212,9 +220,9 @@ empathy_icon_name_from_account (McAccount *account)
 }
 
 const gchar *
-empathy_icon_name_for_presence_state (McPresence state)
+empathy_icon_name_for_presence (McPresence presence)
 {
-       switch (state) {
+       switch (presence) {
        case MC_PRESENCE_AVAILABLE:
                return EMPATHY_IMAGE_AVAILABLE;
        case MC_PRESENCE_DO_NOT_DISTURB:
@@ -235,33 +243,16 @@ empathy_icon_name_for_presence_state (McPresence state)
        return NULL;
 }
 
-const gchar *
-empathy_icon_name_for_presence (EmpathyPresence *presence)
-{
-       McPresence state;
-
-       g_return_val_if_fail (EMPATHY_IS_PRESENCE (presence),
-                             EMPATHY_IMAGE_OFFLINE);
-
-       state = empathy_presence_get_state (presence);
-
-       return empathy_icon_name_for_presence_state (state);
-}
-
 const gchar *
 empathy_icon_name_for_contact (EmpathyContact *contact)
 {
-       EmpathyPresence *presence;
+       McPresence presence;
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT (contact),
                              EMPATHY_IMAGE_OFFLINE);
 
        presence = empathy_contact_get_presence (contact);
-       if (presence) {
-               return empathy_icon_name_for_presence (presence);
-       }
-
-       return EMPATHY_IMAGE_UNKNOWN;
+       return empathy_icon_name_for_presence (presence);
 }
 
 GdkPixbuf *
@@ -1215,28 +1206,25 @@ empathy_text_iter_backward_search (const GtkTextIter   *iter,
        return retval;
 }
 
-static gboolean
-window_get_is_on_current_workspace (GtkWindow *window)
+gboolean
+empathy_window_get_is_visible (GtkWindow *window)
 {
-       GdkWindow *gdk_window;
+       GdkWindowState  state;
+       GdkWindow      *gdk_window;
+
+       g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
        gdk_window = GTK_WIDGET (window)->window;
-       if (gdk_window) {
-               return !(gdk_window_get_state (gdk_window) &
-                        GDK_WINDOW_STATE_ICONIFIED);
-       } else {
+       if (!gdk_window) {
                return FALSE;
        }
-}
 
-/* Checks if the window is visible as in visible on the current workspace. */
-gboolean
-empathy_window_get_is_visible (GtkWindow *window)
-{
-       g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+       state = gdk_window_get_state (gdk_window);
+       if (state & (GDK_WINDOW_STATE_WITHDRAWN | GDK_WINDOW_STATE_ICONIFIED)) {
+               return FALSE;
+       }
 
-       return GTK_WIDGET_VISIBLE (GTK_WIDGET (window)) &&
-              window_get_is_on_current_workspace (window);
+       return TRUE;
 }
 
 void 
@@ -1259,44 +1247,35 @@ empathy_window_iconify (GtkWindow *window, GtkStatusIcon *status_icon)
        XChangeProperty (dpy,
                         GDK_WINDOW_XID (gdk_window),
                         gdk_x11_get_xatom_by_name_for_display (gdk_drawable_get_display (gdk_window),
-                                                               "_NET_WM_ICON_GEOMETRY"),
+                        "_NET_WM_ICON_GEOMETRY"),
                         XA_CARDINAL, 32, PropModeReplace,
                         (guchar *)&data, 4);
 
        gtk_window_set_skip_taskbar_hint (window, TRUE);
        gtk_window_iconify (window);
-
 }
 
 /* Takes care of moving the window to the current workspace. */
 void
 empathy_window_present (GtkWindow *window,
-                      gboolean   steal_focus)
+                       gboolean   steal_focus)
 {
-       gboolean on_current;
-       guint32  timestamp;
+       guint32 timestamp;
 
-       g_return_if_fail (window != NULL);
+       g_return_if_fail (GTK_IS_WINDOW (window));
 
        /* There are three cases: hidden, visible, visible on another
         * workspace.
         */
 
-       on_current = window_get_is_on_current_workspace (window);
-
-       if ( GTK_WIDGET_VISIBLE (GTK_WIDGET (window)) && !on_current) {
+       if (!empathy_window_get_is_visible (window)) {
                /* Hide it so present brings it to the current workspace. */
                gtk_widget_hide (GTK_WIDGET (window));
        }
 
-       gtk_window_set_skip_taskbar_hint (window, FALSE);
-
        timestamp = gtk_get_current_event_time ();
-       if (steal_focus && timestamp != GDK_CURRENT_TIME) {
-               gtk_window_present_with_time (window, timestamp);
-       } else {
-               gtk_window_present (window);
-       }
+       gtk_window_set_skip_taskbar_hint (window, FALSE);
+       gtk_window_present_with_time (window, timestamp);
 }
 
 GtkWindow *
@@ -1388,3 +1367,51 @@ empathy_toggle_button_set_state_quietly (GtkWidget *widget,
        g_signal_handlers_unblock_by_func (widget, callback, user_data);
 }
 
+GtkTextTag *
+empathy_text_buffer_tag_set (GtkTextBuffer *buffer,
+                            const gchar   *tag_name,
+                            const gchar   *first_property_name,
+                            ...)
+{
+       GtkTextTagTable *table;
+       GtkTextTag      *tag;
+
+       g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+       g_return_val_if_fail (tag_name != NULL, NULL);
+
+       table = gtk_text_buffer_get_tag_table (buffer);
+       tag = gtk_text_tag_table_lookup (table, tag_name);
+
+       if (!tag) {
+               tag = gtk_text_tag_new (tag_name);
+               gtk_text_tag_table_add (table, tag);
+               g_object_unref (tag);
+       } else {
+               /* Clear the old values so that we don't affect the new theme. */
+               g_object_set (tag,
+                             "background-set", FALSE,
+                             "foreground-set", FALSE,
+                             "invisible-set", FALSE,
+                             "justification-set", FALSE,
+                             "paragraph-background-set", FALSE,
+                             "pixels-above-lines-set", FALSE,
+                             "pixels-below-lines-set", FALSE,
+                             "rise-set", FALSE,
+                             "scale-set", FALSE,
+                             "size-set", FALSE,
+                             "style-set", FALSE,
+                             "weight-set", FALSE,
+                             NULL);
+       }
+
+       if (first_property_name) {
+               va_list list;
+
+               va_start (list, first_property_name);
+               g_object_set_valist (G_OBJECT (tag), first_property_name, list);
+               va_end (list);
+       }
+
+       return tag;
+}
+