gnome-session r4795 - in branches/dbus_based: . gnome-session

[mccann svn gnome org]

Author: mccann
Date: Mon Jul  7 13:49:55 2008
New Revision: 4795
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4795&view=rev

Log:
2008-07-07  William Jon McCann  <jmccann redhat com>

	* gnome-session/gsm-logout-inhibit-dialog.c (update_dialog_text),
	(name_cell_data_func), (setup_dialog):
	* gnome-session/gsm-logout-inhibit-dialog.glade:
	Implement MPT's suggested rewording.



Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.c
   branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.glade

Modified: branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.c	(original)
+++ branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.c	Mon Jul  7 13:49:55 2008
@@ -300,26 +300,15 @@
 static void
 update_dialog_text (GsmLogoutInhibitDialog *dialog)
 {
-        const char *header_text;
         const char *description_text;
         GtkWidget  *widget;
 
         if (model_has_one_entry (GTK_TREE_MODEL (dialog->priv->list_store))) {
                 g_debug ("Found one entry in model");
-                header_text = _("A program is still running:");
-                description_text = _("Interrupting this program may cause you to lose work.");
+                description_text = _("Waiting for program to finish.  Interrupting program may cause you to lose work.");
         } else {
                 g_debug ("Found multiple entries in model");
-                header_text = _("Some programs are still running:");
-                description_text = _("Interrupting these programs may cause you to lose work.");
-        }
-
-        widget = glade_xml_get_widget (dialog->priv->xml, "header-label");
-        if (widget != NULL) {
-                char *markup;
-                markup = g_strdup_printf ("<b>%s</b>", header_text);
-                gtk_label_set_markup (GTK_LABEL (widget), markup);
-                g_free (markup);
+                description_text = _("Waiting for programs to finish.  Interrupting these programs may cause you to lose work.");
         }
 
         widget = glade_xml_get_widget (dialog->priv->xml, "description-label");
@@ -468,7 +457,7 @@
                             INHIBIT_REASON_COLUMN, &reason,
                             -1);
 
-        markup = g_strdup_printf ("<b>%s</b>\n"
+        markup = g_strdup_printf ("<b>%s</b> is busy\n"
                                   "<i><span size=\"x-small\">%s</span></i>",
                                   name ? name : "(null)",
                                   reason ? reason : "(null)");
@@ -508,22 +497,22 @@
 
         switch (dialog->priv->action) {
         case GSM_LOGOUT_ACTION_SWITCH_USER:
-                button_text = _("Switch User Now");
+                button_text = _("Switch User Anyway");
                 break;
         case GSM_LOGOUT_ACTION_LOGOUT:
-                button_text = _("Logout Now");
+                button_text = _("Logout Anyway");
                 break;
         case GSM_LOGOUT_ACTION_SLEEP:
-                button_text = _("Suspend Now");
+                button_text = _("Suspend Anyway");
                 break;
         case GSM_LOGOUT_ACTION_HIBERNATE:
-                button_text = _("Hibernate Now");
+                button_text = _("Hibernate Anyway");
                 break;
         case GSM_LOGOUT_ACTION_SHUTDOWN:
-                button_text = _("Shutdown Now");
+                button_text = _("Shutdown Anyway");
                 break;
         case GSM_LOGOUT_ACTION_REBOOT:
-                button_text = _("Reboot Now");
+                button_text = _("Reboot Anyway");
                 break;
         default:
                 g_assert_not_reached ();

Modified: branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.glade
==============================================================================
--- branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.glade	(original)
+++ branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.glade	Mon Jul  7 13:49:55 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.4 on Wed Jun 25 19:36:21 2008 -->
+<!--Generated with glade3 3.4.4 on Mon Jul  7 09:44:00 2008 -->
 <glade-interface>
   <widget class="GtkDialog" id="dialog1">
     <property name="border_width">5</property>
@@ -17,18 +17,6 @@
             <property name="border_width">6</property>
             <property name="spacing">6</property>
             <child>
-              <widget class="GtkLabel" id="header-label">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Some programs are still running:&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
               <widget class="GtkTreeView" id="inhibitors-treeview">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -37,9 +25,6 @@
                 <property name="enable_search">False</property>
                 <property name="show_expanders">False</property>
               </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
               <widget class="GtkLabel" id="description-label">
@@ -51,7 +36,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </widget>