aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-05-25 16:56:23 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-05-26 17:55:31 +0800
commitb2d9be57443afa50f1a216030996dcf8581492e3 (patch)
treef51989719629c24f028f3830cf919ee58bb01a87
parent0db0042b4183d6bcc3e5b2dc646eb0f769440f65 (diff)
downloadgsoc2013-empathy-b2d9be57443afa50f1a216030996dcf8581492e3.tar
gsoc2013-empathy-b2d9be57443afa50f1a216030996dcf8581492e3.tar.gz
gsoc2013-empathy-b2d9be57443afa50f1a216030996dcf8581492e3.tar.bz2
gsoc2013-empathy-b2d9be57443afa50f1a216030996dcf8581492e3.tar.lz
gsoc2013-empathy-b2d9be57443afa50f1a216030996dcf8581492e3.tar.xz
gsoc2013-empathy-b2d9be57443afa50f1a216030996dcf8581492e3.tar.zst
gsoc2013-empathy-b2d9be57443afa50f1a216030996dcf8581492e3.zip
Set a parent for the error dialog
-rw-r--r--libempathy-gtk/empathy-new-message-dialog.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 9b0101d22..d3c04c327 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -111,11 +111,11 @@ out:
}
static void
-show_chat_error (GError *error)
+show_chat_error (GError *error, GtkWindow *parent)
{
GtkWidget *dialog;
- dialog = gtk_message_dialog_new (NULL, 0,
+ dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
"%s",
get_error_display_message (error));
@@ -138,7 +138,7 @@ ensure_text_channel_cb (GObject *source,
TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error))
{
DEBUG ("Failed to ensure text channel: %s", error->message);
- show_chat_error (error);
+ show_chat_error (error, user_data);
g_error_free (error);
}
}
@@ -161,13 +161,15 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id)
case EMP_NEW_MESSAGE_TEXT:
empathy_dispatcher_chat_with_contact_id (account, contact_id,
gtk_get_current_event_time (),
- ensure_text_channel_cb, NULL);
+ ensure_text_channel_cb,
+ gtk_widget_get_parent_window (GTK_WIDGET (dialog)));
break;
case EMP_NEW_MESSAGE_SMS:
empathy_dispatcher_sms_contact_id (account, contact_id,
gtk_get_current_event_time (),
- ensure_text_channel_cb, NULL);
+ ensure_text_channel_cb,
+ gtk_widget_get_parent_window (GTK_WIDGET (dialog)));
break;
default: