summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGiovanni Campagna <gcampagn@redhat.com>2013-08-20 11:10:52 +0200
committerRay Strode <rstrode@redhat.com>2013-09-03 10:05:28 -0400
commit705699b2799a3434d1a8f35c9a92868a5057f73e (patch)
tree2c3a46a2e04a9bf666d3d5f3b2c5737e167416fc /data
parent672cb149b846597e7d3cb66692d31a7df5450ee2 (diff)
downloadgnome-session-705699b2799a3434d1a8f35c9a92868a5057f73e.tar.gz
Stop connecting to the X11 server
Remove all GTK+ code from the main gnome-session binary (including the two fallback mode dialogs), so that gnome-session can run when X is not available. These dialogs are no longer used anymore, so it's not a UI freeze break. https://bugzilla.gnome.org/show_bug.cgi?id=706420
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am3
-rw-r--r--data/gsm-inhibit-dialog.ui63
2 files changed, 1 insertions, 65 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 1f330cb2..16926f9f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,8 +2,7 @@ SUBDIRS = icons
uidir = $(pkgdatadir)
ui_DATA = \
- session-properties.ui \
- gsm-inhibit-dialog.ui
+ session-properties.ui
if BUILD_SESSION_SELECTOR
ui_DATA += session-selector.ui
diff --git a/data/gsm-inhibit-dialog.ui b/data/gsm-inhibit-dialog.ui
deleted file mode 100644
index b9cb2e14..00000000
--- a/data/gsm-inhibit-dialog.ui
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkVBox" id="main-box">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="header-label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Some programs are still running:</property>
- <property name="wrap">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="inhibitors-treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="enable_search">False</property>
- <property name="show_expanders">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="description-label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="margin-bottom">18</property>
- <property name="label" translatable="no">Waiting for the program to finish. Interrupting the program may cause you to lose work.</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
-</interface>