aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-09-16 20:14:17 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-09-16 20:29:38 +0800
commit49f3411a5c414ec1a6a7cf68de9ef7c8c8cb7938 (patch)
tree10701effe70b2ddfe5c4206e2687c24cb507c74c
parent7dc159658c022fdd1bd3f05dfa3bdc8c21b88369 (diff)
downloadgsoc2013-empathy-49f3411a5c414ec1a6a7cf68de9ef7c8c8cb7938.tar
gsoc2013-empathy-49f3411a5c414ec1a6a7cf68de9ef7c8c8cb7938.tar.gz
gsoc2013-empathy-49f3411a5c414ec1a6a7cf68de9ef7c8c8cb7938.tar.bz2
gsoc2013-empathy-49f3411a5c414ec1a6a7cf68de9ef7c8c8cb7938.tar.lz
gsoc2013-empathy-49f3411a5c414ec1a6a7cf68de9ef7c8c8cb7938.tar.xz
gsoc2013-empathy-49f3411a5c414ec1a6a7cf68de9ef7c8c8cb7938.tar.zst
gsoc2013-empathy-49f3411a5c414ec1a6a7cf68de9ef7c8c8cb7938.zip
avatar-chooser: split creation of the file chooser dialog
https://bugzilla.gnome.org/show_bug.cgi?id=652985
-rw-r--r--libempathy-gtk/empathy-avatar-chooser.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index e1487d563..62ff491ea 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -934,17 +934,18 @@ avatar_chooser_clicked_cb (GtkWidget *button,
gtk_file_chooser_dialog_new (_("Select Your Avatar Image"),
empathy_get_toplevel_window (GTK_WIDGET (self)),
GTK_FILE_CHOOSER_ACTION_OPEN,
- #ifdef HAVE_CHEESE
- _("Take a picture..."),
- EMPATHY_AVATAR_CHOOSER_RESPONSE_WEBCAM,
- #endif
- _("No Image"),
- EMPATHY_AVATAR_CHOOSER_RESPONSE_NO_IMAGE,
- GTK_STOCK_CANCEL,
- EMPATHY_AVATAR_CHOOSER_RESPONSE_CANCEL,
- GTK_STOCK_OPEN,
- EMPATHY_AVATAR_CHOOSER_RESPONSE_FILE,
- NULL));
+ NULL, NULL));
+
+#ifdef HAVE_CHEESE
+ gtk_dialog_add_button (GTK_DIALOG (self->priv->chooser_dialog),
+ _("Take a picture..."), EMPATHY_AVATAR_CHOOSER_RESPONSE_WEBCAM);
+#endif
+
+ gtk_dialog_add_buttons (GTK_DIALOG (self->priv->chooser_dialog),
+ _("No Image"), EMPATHY_AVATAR_CHOOSER_RESPONSE_NO_IMAGE,
+ GTK_STOCK_CANCEL, EMPATHY_AVATAR_CHOOSER_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, EMPATHY_AVATAR_CHOOSER_RESPONSE_FILE,
+ NULL);
chooser_dialog = self->priv->chooser_dialog;
gtk_window_set_destroy_with_parent (GTK_WINDOW (chooser_dialog), TRUE);