[gthumb] web services: use a standard message dialog instead of a ui file

[Paolo Bacchilega <paobac src gnome org>]

commit ede7b99847a0f06fba7c1e05881f8536c5ca1834
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sat Apr 4 22:07:58 2015 +0200

    web services: use a standard message dialog instead of a ui file

 extensions/facebook/data/ui/Makefile.am            |    1 -
 .../facebook/data/ui/facebook-export-completed.ui  |   77 --------------------
 extensions/facebook/dlg-export-to-facebook.c       |   16 +++--
 extensions/flicker_utils/data/ui/Makefile.am       |    1 -
 .../data/ui/flicker-export-completed.ui            |   77 --------------------
 extensions/flicker_utils/dlg-export-to-flickr.c    |   16 +++--
 extensions/photobucket/data/ui/Makefile.am         |    3 +-
 .../data/ui/photobucket-export-completed.ui        |   77 --------------------
 extensions/photobucket/dlg-export-to-photobucket.c |   16 +++--
 extensions/picasaweb/data/ui/Makefile.am           |    3 +-
 .../data/ui/picasa-web-export-completed.ui         |   77 --------------------
 extensions/picasaweb/dlg-export-to-picasaweb.c     |   14 ++--
 12 files changed, 37 insertions(+), 341 deletions(-)
---
diff --git a/extensions/facebook/data/ui/Makefile.am b/extensions/facebook/data/ui/Makefile.am
index da02cb0..ce56e9a 100644
--- a/extensions/facebook/data/ui/Makefile.am
+++ b/extensions/facebook/data/ui/Makefile.am
@@ -2,7 +2,6 @@ uidir = $(pkgdatadir)/ui
 ui_DATA =                                      \
        export-to-facebook.ui                   \
        facebook-album-properties.ui            \
-       facebook-export-completed.ui            \
        import-from-facebook.ui
 
 EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/facebook/dlg-export-to-facebook.c b/extensions/facebook/dlg-export-to-facebook.c
index 1c4adfb..c22e2b8 100644
--- a/extensions/facebook/dlg-export-to-facebook.c
+++ b/extensions/facebook/dlg-export-to-facebook.c
@@ -139,14 +139,18 @@ completed_messagedialog_response_cb (GtkDialog *dialog,
 static void
 export_completed_with_success (DialogData *data)
 {
-       GtkBuilder *builder;
-       GtkWidget  *dialog;
+       GtkWidget *dialog;
 
        gth_task_dialog (GTH_TASK (data->service), TRUE, NULL);
 
-       builder = _gtk_builder_new_from_file ("facebook-export-completed.ui", "facebook");
-       dialog = _gtk_builder_get_widget (builder, "completed_messagedialog");
-       g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref);
+       dialog = _gtk_message_dialog_new (GTK_WINDOW (data->browser),
+                                         GTK_DIALOG_MODAL,
+                                         NULL,
+                                         _("Files successfully uploaded to the server."),
+                                         NULL,
+                                         _GTK_LABEL_CLOSE, GTK_RESPONSE_CLOSE,
+                                         _("_Open in the Browser"), _OPEN_IN_BROWSER_RESPONSE,
+                                         NULL);
        g_signal_connect (dialog,
                          "delete-event",
                          G_CALLBACK (gtk_true),
@@ -156,8 +160,6 @@ export_completed_with_success (DialogData *data)
                          G_CALLBACK (completed_messagedialog_response_cb),
                          data);
 
-       gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->browser));
-       gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
        gtk_window_present (GTK_WINDOW (dialog));
 }
 
diff --git a/extensions/flicker_utils/data/ui/Makefile.am b/extensions/flicker_utils/data/ui/Makefile.am
index 608532b..c04fe4e 100644
--- a/extensions/flicker_utils/data/ui/Makefile.am
+++ b/extensions/flicker_utils/data/ui/Makefile.am
@@ -1,7 +1,6 @@
 uidir = $(pkgdatadir)/ui
 ui_DATA =                                      \
        export-to-flickr.ui                     \
-       flicker-export-completed.ui             \
        flickr-ask-authorization-old.ui         \
        import-from-flickr.ui
 
diff --git a/extensions/flicker_utils/dlg-export-to-flickr.c b/extensions/flicker_utils/dlg-export-to-flickr.c
index a14e748..e7e55c1 100644
--- a/extensions/flicker_utils/dlg-export-to-flickr.c
+++ b/extensions/flicker_utils/dlg-export-to-flickr.c
@@ -153,14 +153,18 @@ completed_messagedialog_response_cb (GtkDialog *dialog,
 static void
 export_completed_with_success (DialogData *data)
 {
-       GtkBuilder *builder;
-       GtkWidget  *dialog;
+       GtkWidget *dialog;
 
        gth_task_dialog (GTH_TASK (data->service), TRUE, NULL);
 
-       builder = _gtk_builder_new_from_file ("flicker-export-completed.ui", "flicker_utils");
-       dialog = _gtk_builder_get_widget (builder, "completed_messagedialog");
-       g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref);
+       dialog = _gtk_message_dialog_new (GTK_WINDOW (data->browser),
+                                         GTK_DIALOG_MODAL,
+                                         NULL,
+                                         _("Files successfully uploaded to the server."),
+                                         NULL,
+                                         _GTK_LABEL_CLOSE, GTK_RESPONSE_CLOSE,
+                                         _("_Open in the Browser"), _OPEN_IN_BROWSER_RESPONSE,
+                                         NULL);
        g_signal_connect (dialog,
                          "delete-event",
                          G_CALLBACK (gtk_true),
@@ -170,8 +174,6 @@ export_completed_with_success (DialogData *data)
                          G_CALLBACK (completed_messagedialog_response_cb),
                          data);
 
-       gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->browser));
-       gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
        gtk_window_present (GTK_WINDOW (dialog));
 }
 
diff --git a/extensions/photobucket/data/ui/Makefile.am b/extensions/photobucket/data/ui/Makefile.am
index 89536cc..ccee6b6 100644
--- a/extensions/photobucket/data/ui/Makefile.am
+++ b/extensions/photobucket/data/ui/Makefile.am
@@ -1,8 +1,7 @@
 uidir = $(pkgdatadir)/ui
 ui_DATA =                                      \
        export-to-photobucket.ui                \
-       photobucket-album-properties.ui         \
-       photobucket-export-completed.ui
+       photobucket-album-properties.ui
 
 EXTRA_DIST = $(ui_DATA)
 
diff --git a/extensions/photobucket/dlg-export-to-photobucket.c 
b/extensions/photobucket/dlg-export-to-photobucket.c
index cbe03db..a5da2c7 100644
--- a/extensions/photobucket/dlg-export-to-photobucket.c
+++ b/extensions/photobucket/dlg-export-to-photobucket.c
@@ -147,14 +147,18 @@ completed_messagedialog_response_cb (GtkDialog *dialog,
 static void
 export_completed_with_success (DialogData *data)
 {
-       GtkBuilder *builder;
-       GtkWidget  *dialog;
+       GtkWidget *dialog;
 
        gth_task_dialog (GTH_TASK (data->service), TRUE, NULL);
 
-       builder = _gtk_builder_new_from_file ("photobucket-export-completed.ui", "photobucket");
-       dialog = _gtk_builder_get_widget (builder, "completed_messagedialog");
-       g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref);
+       dialog = _gtk_message_dialog_new (GTK_WINDOW (data->browser),
+                                         GTK_DIALOG_MODAL,
+                                         NULL,
+                                         _("Files successfully uploaded to the server."),
+                                         NULL,
+                                         _GTK_LABEL_CLOSE, GTK_RESPONSE_CLOSE,
+                                         _("_Open in the Browser"), _OPEN_IN_BROWSER_RESPONSE,
+                                         NULL);
        g_signal_connect (dialog,
                          "delete-event",
                          G_CALLBACK (gtk_true),
@@ -164,8 +168,6 @@ export_completed_with_success (DialogData *data)
                          G_CALLBACK (completed_messagedialog_response_cb),
                          data);
 
-       gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->browser));
-       gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
        gtk_window_present (GTK_WINDOW (dialog));
 }
 
diff --git a/extensions/picasaweb/data/ui/Makefile.am b/extensions/picasaweb/data/ui/Makefile.am
index 7224618..6b32436 100644
--- a/extensions/picasaweb/data/ui/Makefile.am
+++ b/extensions/picasaweb/data/ui/Makefile.am
@@ -2,8 +2,7 @@ uidir = $(pkgdatadir)/ui
 ui_DATA =                                      \
        export-to-picasaweb.ui                  \
        import-from-picasaweb.ui                \
-       picasa-web-album-properties.ui          \
-       picasa-web-export-completed.ui
+       picasa-web-album-properties.ui
 EXTRA_DIST = $(ui_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/extensions/picasaweb/dlg-export-to-picasaweb.c b/extensions/picasaweb/dlg-export-to-picasaweb.c
index 4bb6c16..c1e9ca7 100644
--- a/extensions/picasaweb/dlg-export-to-picasaweb.c
+++ b/extensions/picasaweb/dlg-export-to-picasaweb.c
@@ -139,14 +139,18 @@ completed_messagedialog_response_cb (GtkDialog *dialog,
 static void
 export_completed_with_success (DialogData *data)
 {
-       GtkBuilder *builder;
        GtkWidget  *dialog;
 
        gth_task_dialog (GTH_TASK (data->service), TRUE, NULL);
 
-       builder = _gtk_builder_new_from_file ("picasa-web-export-completed.ui", "picasaweb");
-       dialog = _gtk_builder_get_widget (builder, "completed_messagedialog");
-       g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref);
+       dialog = _gtk_message_dialog_new (GTK_WINDOW (data->browser),
+                                         GTK_DIALOG_MODAL,
+                                         NULL,
+                                         _("Files successfully uploaded to the server."),
+                                         NULL,
+                                         _GTK_LABEL_CLOSE, GTK_RESPONSE_CLOSE,
+                                         _("_Open in the Browser"), _OPEN_IN_BROWSER_RESPONSE,
+                                         NULL);
        g_signal_connect (dialog,
                          "delete-event",
                          G_CALLBACK (gtk_true),
@@ -156,8 +160,6 @@ export_completed_with_success (DialogData *data)
                          G_CALLBACK (completed_messagedialog_response_cb),
                          data);
 
-       gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->browser));
-       gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
        gtk_window_present (GTK_WINDOW (dialog));
 }