* Authors: Richard Hult <richard@imendio.com>
* Martyn Russell <martyn@imendio.com>
* Xavier Claessens <xclaesse@gmail.com>
- * Davyd Madeley <davyd.madeley@collabora.co.uk>
+ * Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
#include "config.h"
-
-#include <string.h>
-#include <stdlib.h>
+#include "empathy-presence-chooser.h"
#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
+#include <tp-account-widgets/tpaw-utils.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-connectivity.h>
-#include <libempathy/empathy-idle.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-status-presets.h>
+#include "empathy-presence-manager.h"
+#include "empathy-status-presets.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
#include "empathy-ui-utils.h"
-#include "empathy-images.h"
#include "empathy-presence-chooser.h"
#include "empathy-status-preset-dialog.h"
* Widget which extends #GtkComboBoxEntry to change presence.
*/
-/* Flashing delay for icons (milliseconds). */
-#define FLASH_TIMEOUT 500
-
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyPresenceChooser)
/* For custom message dialog */
} PresenceChooserEntryType;
typedef struct {
- EmpathyIdle *idle;
- EmpathyConnectivity *connectivity;
+ EmpathyPresenceManager *presence_mgr;
+ GNetworkMonitor *connectivity;
gboolean editing_status;
int block_set_editing;
PresenceChooserEntryType previous_type;
TpAccountManager *account_manager;
- GdkPixbuf *not_favorite_pixbuf;
} EmpathyPresenceChooserPriv;
/* States to be listed in the menu.
{ TP_CONNECTION_PRESENCE_TYPE_UNSET, },
};
+static void presence_chooser_constructed (GObject *object);
static void presence_chooser_finalize (GObject *object);
static void presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser);
static void presence_chooser_menu_add_item (GtkWidget *menu,
static void presence_chooser_custom_activate_cb (GtkWidget *item,
gpointer user_data);
-G_DEFINE_TYPE (EmpathyPresenceChooser, empathy_presence_chooser, GTK_TYPE_COMBO_BOX_ENTRY);
+G_DEFINE_TYPE (EmpathyPresenceChooser, empathy_presence_chooser, GTK_TYPE_COMBO_BOX);
static void
empathy_presence_chooser_class_init (EmpathyPresenceChooserClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ object_class->constructed = presence_chooser_constructed;
object_class->finalize = presence_chooser_finalize;
g_type_class_add_private (object_class, sizeof (EmpathyPresenceChooserPriv));
state = tp_account_manager_get_most_available_presence (
priv->account_manager, NULL, &tmp);
- if (EMP_STR_EMPTY (tmp)) {
+ if (TPAW_STR_EMPTY (tmp)) {
/* no message, use the default message */
g_free (tmp);
tmp = g_strdup (empathy_presence_get_default_message (state));
static void
presence_chooser_set_favorite_icon (EmpathyPresenceChooser *self)
{
- EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
GtkWidget *entry;
PresenceChooserEntryType type;
/* saved entries can be removed from the list */
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
- "emblem-favorite");
+ "starred-symbolic");
gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
_("Click to remove this status as a favorite"));
}
else {
/* custom entries can be favorited */
- gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entry),
+ gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
- priv->not_favorite_pixbuf);
+ "non-starred-symbolic");
gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
_("Click to make this status a favorite"));
entry = gtk_bin_get_child (GTK_BIN (self));
if (editing) {
+ gchar *tooltip_text;
+ gchar *status;
+
priv->editing_status = TRUE;
+ get_state_and_status (self, &status);
+ /* Translators: %s is a status message like 'At the pub' for example */
+ tooltip_text = g_strdup_printf (_("<b>Current message: %s</b>\n"
+ "<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"),
+ status);
+ gtk_widget_set_tooltip_markup (entry, tooltip_text);
gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
GTK_STOCK_OK);
gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
GTK_ENTRY_ICON_PRIMARY,
FALSE);
+ g_free (status);
+ g_free (tooltip_text);
} else {
GtkWidget *window;
DEBUG ("Sending state to MC-> %d (%s)", priv->state, status);
- empathy_idle_set_presence (priv->idle, priv->state, status);
+ empathy_presence_manager_set_presence (priv->presence_mgr, priv->state, status);
}
static void
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
GtkWidget *entry;
const char *icon_name;
+ const gchar *status_tooltip;
entry = gtk_bin_get_child (GTK_BIN (self));
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
GTK_ENTRY_ICON_PRIMARY,
icon_name);
- gtk_entry_set_text (GTK_ENTRY (entry), status == NULL ? "" : status);
+ status_tooltip = status == NULL ? "" : status;
+ gtk_entry_set_text (GTK_ENTRY (entry), status_tooltip);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), status_tooltip);
presence_chooser_set_favorite_icon (self);
priv->block_changed--;
mc_set_custom_state (self);
}
else {
- PresenceChooserEntryType type;
TpConnectionPresenceType state;
char *status;
- type = presence_chooser_get_entry_type (self);
state = get_state_and_status (self, &status);
if (!empathy_status_presets_is_valid (state)) {
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
- if (priv->editing_status && event->keyval == GDK_Escape) {
+ if (priv->editing_status && event->keyval == GDK_KEY_Escape) {
/* the user pressed Escape, undo the editing */
presence_chooser_reset_status (self);
return TRUE;
}
- else if (event->keyval == GDK_Up || event->keyval == GDK_Down) {
+ else if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down) {
/* ignore */
return TRUE;
}
COL_STATUS_TEXT, &status,
-1);
- empathy_idle_set_presence (priv->idle, priv->state, status);
+ empathy_presence_manager_set_presence (priv->presence_mgr, priv->state, status);
g_free (status);
}
GList *accounts, *l;
GError *error = NULL;
- if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+ if (!tp_proxy_prepare_finish (manager, result, &error)) {
DEBUG ("Failed to prepare account manager: %s", error->message);
g_error_free (error);
return;
}
- accounts = tp_account_manager_get_valid_accounts (manager);
+ accounts = tp_account_manager_dup_valid_accounts (manager);
for (l = accounts ; l != NULL ; l = g_list_next (l)) {
TpAccount *a = TP_ACCOUNT (l->data);
}
}
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
- if (!empathy_connectivity_is_online (priv->connectivity))
+ if (!g_network_monitor_get_network_available (priv->connectivity))
sensitive = FALSE;
gtk_widget_set_sensitive (GTK_WIDGET (chooser), sensitive);
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
- tp_account_manager_prepare_async (priv->account_manager, NULL,
+ tp_proxy_prepare_async (priv->account_manager, NULL,
update_sensitivity_am_prepared_cb,
chooser);
}
}
static void
-presence_chooser_connectivity_state_change (EmpathyConnectivity *connectivity,
+presence_chooser_network_change (GNetworkMonitor *connectivity,
gboolean new_online,
EmpathyPresenceChooser *chooser)
{
presence_chooser_update_sensitivity (chooser);
}
-/* Create a greyed version of the 'favorite' icon */
-static GdkPixbuf *
-create_not_favorite_pixbuf (void)
-{
- GdkPixbuf *favorite, *result;
-
- favorite = empathy_pixbuf_from_icon_name ("emblem-favorite",
- GTK_ICON_SIZE_MENU);
-
- result = gdk_pixbuf_copy (favorite);
- gdk_pixbuf_saturate_and_pixelate (favorite, result, 1.0, TRUE);
-
- g_object_unref (favorite);
- return result;
-}
-
static void
-icon_theme_changed_cb (GtkIconTheme *icon_theme,
- EmpathyPresenceChooser *self)
+empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
{
- EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
-
- /* Theme has changed, recreate the not-favorite icon */
- g_object_unref (priv->not_favorite_pixbuf);
- priv->not_favorite_pixbuf = create_not_favorite_pixbuf ();
+ EmpathyPresenceChooserPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (chooser,
+ EMPATHY_TYPE_PRESENCE_CHOOSER, EmpathyPresenceChooserPriv);
- /* Update the icon */
- presence_chooser_set_favorite_icon (self);
+ chooser->priv = priv;
}
static void
-empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
+presence_chooser_constructed (GObject *object)
{
- EmpathyPresenceChooserPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (chooser,
- EMPATHY_TYPE_PRESENCE_CHOOSER, EmpathyPresenceChooserPriv);
+ EmpathyPresenceChooser *chooser = EMPATHY_PRESENCE_CHOOSER (object);
+ EmpathyPresenceChooserPriv *priv = chooser->priv;
GtkWidget *entry;
GtkCellRenderer *renderer;
+ const gchar *status_tooltip;
- chooser->priv = priv;
-
- /* Create the not-favorite icon */
- priv->not_favorite_pixbuf = create_not_favorite_pixbuf ();
- g_assert (priv->not_favorite_pixbuf != NULL);
-
- empathy_signal_connect_weak (gtk_icon_theme_get_default (), "changed",
- G_CALLBACK (icon_theme_changed_cb),
- G_OBJECT (chooser));
+ if (G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->constructed)
+ G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->constructed (object);
presence_chooser_create_model (chooser);
- gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (chooser),
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (chooser),
COL_STATUS_TEXT);
gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (chooser),
combo_row_separator_func,
G_CALLBACK (presence_chooser_entry_focus_out_cb),
chooser);
- priv->idle = empathy_idle_dup_singleton ();
+ priv->presence_mgr = empathy_presence_manager_dup_singleton ();
priv->account_manager = tp_account_manager_dup ();
g_signal_connect_swapped (priv->account_manager,
G_CALLBACK (presence_chooser_presence_changed_cb),
chooser);
- empathy_signal_connect_weak (priv->account_manager, "account-validity-changed",
+ tp_g_signal_connect_object (priv->account_manager, "account-validity-changed",
G_CALLBACK (presence_chooser_account_manager_account_validity_changed_cb),
- G_OBJECT (chooser));
- empathy_signal_connect_weak (priv->account_manager, "account-removed",
+ chooser, 0);
+ tp_g_signal_connect_object (priv->account_manager, "account-removed",
G_CALLBACK (presence_chooser_account_manager_account_changed_cb),
- G_OBJECT (chooser));
- empathy_signal_connect_weak (priv->account_manager, "account-enabled",
+ chooser, 0);
+ tp_g_signal_connect_object (priv->account_manager, "account-enabled",
G_CALLBACK (presence_chooser_account_manager_account_changed_cb),
- G_OBJECT (chooser));
- empathy_signal_connect_weak (priv->account_manager, "account-disabled",
+ chooser, 0);
+ tp_g_signal_connect_object (priv->account_manager, "account-disabled",
G_CALLBACK (presence_chooser_account_manager_account_changed_cb),
- G_OBJECT (chooser));
+ chooser, 0);
- /* FIXME: this string sucks */
- gtk_widget_set_tooltip_text (GTK_WIDGET (chooser),
- _("Set your presence and current status"));
+ status_tooltip = gtk_entry_get_text (GTK_ENTRY (entry));
+ gtk_widget_set_tooltip_text (GTK_WIDGET (chooser), status_tooltip);
- priv->connectivity = empathy_connectivity_dup_singleton ();
- empathy_signal_connect_weak (priv->connectivity,
- "state-change",
- G_CALLBACK (presence_chooser_connectivity_state_change),
- G_OBJECT (chooser));
+ priv->connectivity = g_network_monitor_get_default ();
+ g_object_ref (priv->connectivity);
+
+ tp_g_signal_connect_object (priv->connectivity,
+ "network-changed",
+ G_CALLBACK (presence_chooser_network_change),
+ chooser, 0);
presence_chooser_update_sensitivity (chooser);
}
if (priv->account_manager != NULL)
g_object_unref (priv->account_manager);
- g_signal_handlers_disconnect_by_func (priv->idle,
+ g_signal_handlers_disconnect_by_func (priv->presence_mgr,
presence_chooser_presence_changed_cb,
object);
- g_object_unref (priv->idle);
+ g_object_unref (priv->presence_mgr);
g_object_unref (priv->connectivity);
- g_object_unref (priv->not_favorite_pixbuf);
G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->finalize (object);
}
GtkWidget *
empathy_presence_chooser_new (void)
{
- GtkWidget *chooser;
-
- chooser = g_object_new (EMPATHY_TYPE_PRESENCE_CHOOSER, NULL);
-
- return chooser;
+ /* FIXME, why can't this go in init ()? */
+ return g_object_new (EMPATHY_TYPE_PRESENCE_CHOOSER,
+ "has-entry", TRUE,
+ NULL);
}
static void
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
GTK_ENTRY_ICON_PRIMARY,
empathy_icon_name_for_presence (state));
+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), status);
entry = gtk_bin_get_child (GTK_BIN (chooser));
gtk_editable_set_editable (GTK_EDITABLE (entry),
presence_chooser_set_state (TpConnectionPresenceType state,
const gchar *status)
{
- EmpathyIdle *idle;
+ EmpathyPresenceManager *presence_mgr;
- idle = empathy_idle_dup_singleton ();
- empathy_idle_set_presence (idle, state, status);
- g_object_unref (idle);
+ presence_mgr = empathy_presence_manager_dup_singleton ();
+ empathy_presence_manager_set_presence (presence_mgr, state, status);
+ g_object_unref (presence_mgr);
}
static void
projects / empathy.git / blobdiff