diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-08-10 01:17:12 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-08-10 01:17:12 +0800 |
| commit | 6b18017f8240d6ce4880a1ed7d9158be8d914c95 (patch) | |
| tree | 3f98de4a2431e5c4684b2e7351ac0861b83872e2 /libempathy-gtk/empathy-ui-utils.c | |
| parent | 0a392cd8a302c71ce28efa14e6a0b8792b5a393f (diff) | |
| download | gsoc2013-empathy-6b18017f8240d6ce4880a1ed7d9158be8d914c95.tar gsoc2013-empathy-6b18017f8240d6ce4880a1ed7d9158be8d914c95.tar.gz gsoc2013-empathy-6b18017f8240d6ce4880a1ed7d9158be8d914c95.tar.bz2 gsoc2013-empathy-6b18017f8240d6ce4880a1ed7d9158be8d914c95.tar.lz gsoc2013-empathy-6b18017f8240d6ce4880a1ed7d9158be8d914c95.tar.xz gsoc2013-empathy-6b18017f8240d6ce4880a1ed7d9158be8d914c95.tar.zst gsoc2013-empathy-6b18017f8240d6ce4880a1ed7d9158be8d914c95.zip | |
Remove per-state "Custom message..." item and add one on the bottom of the
2007-08-09 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/empathy-presence-chooser.glade:
* libempathy-gtk/empathy-presence-chooser.c:
* libempathy-gtk/empathy-status-presets.c:
* libempathy-gtk/empathy-status-presets.h:
* libempathy-gtk/empathy-ui-utils.c: Remove per-state
"Custom message..." item and add one on the bottom of the menu. Add
a combobox on the custom message dialog to select the state and change
the action of the checkbox, now it add/remove the message from saved
messages. Make easier to add other states to the list if needed.
Fixes bug #460678.
svn path=/trunk/; revision=241
Diffstat (limited to 'libempathy-gtk/empathy-ui-utils.c')
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 5a6ba8733..af7f72caa 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -1345,7 +1345,8 @@ empathy_get_toplevel_window (GtkWidget *widget) g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); toplevel = gtk_widget_get_toplevel (widget); - if (GTK_IS_WINDOW (toplevel)) { + if (GTK_IS_WINDOW (toplevel) && + GTK_WIDGET_TOPLEVEL (toplevel)) { return GTK_WINDOW (toplevel); } |