[gnome-session/wip/cleanups: 12/15] Drop the fallback dialog
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-session/wip/cleanups: 12/15] Drop the fallback dialog
- Date: Mon, 12 Nov 2012 13:37:39 +0000 (UTC)
commit 2106ad2a4f0c16999ae4a69ec963e9e6e8f93f9c
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Nov 11 23:49:47 2012 -0500
Drop the fallback dialog
Since we are dropping fallback mode, we don't need this dialog
anymore.
gnome-session/gsm-manager.c | 66 -------------------------------------------
1 files changed, 0 insertions(+), 66 deletions(-)
---
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index e5f4596..a349bb3 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -1211,71 +1211,6 @@ end_session_or_show_shell_dialog (GsmManager *manager)
}
static void
-show_fallback_dialog (const char *title,
- const char *description,
- const char *link_text,
- const char *uri)
-{
- GtkWidget *dialog, *image, *link, *hbox;
-
- dialog = gtk_message_dialog_new (NULL, 0,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_CLOSE,
- "%s", title);
-
- gtk_window_set_icon_name (GTK_WINDOW (dialog), GSM_ICON_COMPUTER_FAIL);
-
- image = gtk_image_new_from_icon_name (GSM_ICON_COMPUTER_FAIL,
- 4); //gsm_util_get_computer_fail_icon_size ());
- gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
-
- if (description) {
- gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
- "%s", description);
- }
-
- hbox = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog));
-
- if (uri) {
- if (link_text) {
- link = gtk_link_button_new_with_label (uri, link_text);
- } else {
- link = gtk_link_button_new (uri);
- }
- gtk_box_pack_start (GTK_BOX (hbox), link, FALSE, FALSE, 0);
- }
-
- gtk_widget_show_all (dialog);
-
- g_signal_connect (dialog,
- "response",
- G_CALLBACK (gtk_widget_destroy),
- NULL);
-}
-
-static void
-possibly_show_fallback_dialog (GsmManager *manager)
-{
- if (manager->priv->is_fallback_session &&
- g_strcmp0 (manager->priv->session_name, "gnome-fallback") == 0 &&
- g_settings_get_boolean (manager->priv->settings,
- KEY_SHOW_FALLBACK_WARNING)) {
- show_fallback_dialog (_("GNOME 3 Failed to Load"),
- _("Unfortunately GNOME 3 failed to start properly and started in the <i>fallback mode</i>.\n\n"
- "This most likely means your system (graphics hardware or driver) is not capable of delivering the full GNOME 3 experience."),
- _("Learn more about GNOME 3"),
- "http://www.gnome3.org");
- g_settings_set_boolean (manager->priv->settings,
- KEY_SHOW_FALLBACK_WARNING, FALSE);
- } else if (g_strcmp0 (manager->priv->session_name, "gnome") == 0 &&
- g_settings_get_boolean (manager->priv->settings,
- KEY_SHOW_FALLBACK_WARNING)) {
- /* Reset the setting if we ever manage to log into gnome 3 */
- g_settings_reset (manager->priv->settings, KEY_SHOW_FALLBACK_WARNING);
- }
-}
-
-static void
query_end_session_complete (GsmManager *manager)
{
@@ -1444,7 +1379,6 @@ start_phase (GsmManager *manager)
do_phase_startup (manager);
break;
case GSM_MANAGER_PHASE_RUNNING:
- possibly_show_fallback_dialog (manager);
g_signal_emit (manager, signals[SESSION_RUNNING], 0);
update_idle (manager);
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]