aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2011-05-26 18:00:58 +0800
committerXavier Claessens <xclaesse@gmail.com>2011-05-26 18:49:48 +0800
commit984e946f6bb2c385394db123f1b2edea05d9209b (patch)
tree8e28463d0f004583b2b4a5346cfd44a3b547c8ab /src
parentff175f03615bdbd8d05bf352b3e4b49d59b3ce25 (diff)
downloadgsoc2013-empathy-984e946f6bb2c385394db123f1b2edea05d9209b.tar
gsoc2013-empathy-984e946f6bb2c385394db123f1b2edea05d9209b.tar.gz
gsoc2013-empathy-984e946f6bb2c385394db123f1b2edea05d9209b.tar.bz2
gsoc2013-empathy-984e946f6bb2c385394db123f1b2edea05d9209b.tar.lz
gsoc2013-empathy-984e946f6bb2c385394db123f1b2edea05d9209b.tar.xz
gsoc2013-empathy-984e946f6bb2c385394db123f1b2edea05d9209b.tar.zst
gsoc2013-empathy-984e946f6bb2c385394db123f1b2edea05d9209b.zip
Stop dealing with iconification of main window, just hide/present it
It does not work with gnome-shell, unity and indicators anyway, so it is just complex code for no benefit anymore.
Diffstat (limited to 'src')
-rw-r--r--src/empathy-status-icon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 38a68d433..008ea4701 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -62,7 +62,7 @@ typedef struct {
EmpathyEvent *event;
GSettings *gsettings_ui;
- GtkWindow *window;
+ GtkWidget *window;
GtkUIManager *ui_manager;
GtkWidget *popup_menu;
GtkAction *show_window_item;
@@ -222,7 +222,7 @@ status_icon_set_visibility (EmpathyStatusIcon *icon,
}
if (!visible) {
- empathy_window_iconify (priv->window, priv->icon);
+ gtk_widget_hide (priv->window);
} else {
empathy_window_present (GTK_WINDOW (priv->window));
}
@@ -246,7 +246,7 @@ status_icon_toggle_visibility (EmpathyStatusIcon *icon)
EmpathyStatusIconPriv *priv = GET_PRIV (icon);
gboolean visible;
- visible = gtk_window_is_active (priv->window);
+ visible = gtk_window_is_active (GTK_WINDOW (priv->window));
status_icon_set_visibility (icon, !visible, TRUE);
}
@@ -334,7 +334,7 @@ status_icon_popup_menu_cb (GtkStatusIcon *status_icon,
GtkWidget *submenu;
gboolean show;
- show = empathy_window_get_is_visible (GTK_WINDOW (priv->window));
+ show = gtk_widget_get_visible (priv->window);
g_signal_handlers_block_by_func (priv->show_window_item,
status_icon_show_hide_window_cb,