[25769] in Source-Commits
/svn/athena r25221 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Jul 5 14:32:16 2011
Date: Tue, 5 Jul 2011 14:32:10 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107051832.p65IWAUt027617@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-05 14:32:09 -0400 (Tue, 05 Jul 2011)
New Revision: 25221
Modified:
trunk/debathena/config/gdm-config/debian/changelog
trunk/debathena/config/gdm-config/debian/debathena-branding
trunk/debathena/config/gdm-config/debian/debathena-branding.glade
Log:
In gdm-config:
* Applets really shouldn't attempt to steal focus (Trac: #812)
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2011-07-03 22:32:58 UTC (rev 25220)
+++ trunk/debathena/config/gdm-config/debian/changelog 2011-07-05 18:32:09 UTC (rev 25221)
@@ -1,3 +1,9 @@
+debathena-gdm-config (1.29) UNRELEASED; urgency=low
+
+ * Applets really shouldn't attempt to steal focus (Trac: #812)
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 05 Jul 2011 14:31:50 -0400
+
debathena-gdm-config (1.28) unstable; urgency=low
* Ship our own athena-session and do logic in that
Modified: trunk/debathena/config/gdm-config/debian/debathena-branding
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-branding 2011-07-03 22:32:58 UTC (rev 25220)
+++ trunk/debathena/config/gdm-config/debian/debathena-branding 2011-07-05 18:32:09 UTC (rev 25221)
@@ -9,6 +9,7 @@
import os
import subprocess
import platform
+from optparse import OptionParser
SM_DBUS_NAME = "org.gnome.SessionManager"
SM_DBUS_PATH = "/org/gnome/SessionManager"
@@ -19,7 +20,8 @@
DEBATHENA_LOGO_FILE="/usr/share/pixmaps/debathena.png"
class Branding:
- def __init__(self):
+ def __init__(self, options):
+ self.debug = options.debug
self.sessionEnding = False
self.sessionBus = dbus.SessionBus()
try:
@@ -29,9 +31,9 @@
print "Warning: Cannot register with session manager."
try:
- self.xml = gtk.glade.XML(GLADE_FILE)
+ self.xml = gtk.glade.XML(options.gladefile)
except:
- print "Could not load Glade XML: %s" % (GLADE_FILE)
+ print "Could not load Glade XML: %s" % (options.gladefile)
sys.exit(1)
@@ -109,10 +111,16 @@
def sm_on_Stop(self):
gtk.main_quit()
-def main():
+def main(options):
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
- Branding()
+ Branding(options)
gtk.main()
if __name__ == '__main__':
- main()
+ parser = OptionParser()
+ parser.set_defaults(debug=False, guitest=False)
+ parser.add_option("--test", action="store_true", dest="debug")
+ parser.add_option("--glade", action="store", type="string",
+ default=GLADE_FILE, dest="gladefile")
+ (options, args) = parser.parse_args()
+ main(options)
Modified: trunk/debathena/config/gdm-config/debian/debathena-branding.glade
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-branding.glade 2011-07-03 22:32:58 UTC (rev 25220)
+++ trunk/debathena/config/gdm-config/debian/debathena-branding.glade 2011-07-05 18:32:09 UTC (rev 25221)
@@ -1,108 +1,62 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0"?>
<glade-interface>
-
-<widget class="GtkWindow" id="winWelcome">
- <property name="visible">True</property>
- <property name="title" translatable="yes">window1</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">False</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkImage" id="imgDebathena">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><span font_desc="Trebuchet MS Bold 20">Welcome to Athena</span></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkWindow" id="winBranding">
- <property name="visible">True</property>
- <property name="title" translatable="yes">window1</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">False</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">False</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-
- <child>
- <widget class="GtkLabel" id="lblBranding">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><workstation information></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- </child>
-</widget>
-
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <widget class="GtkWindow" id="winWelcome">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">window1</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="accept_focus">False</property>
+ <property name="focus_on_map">False</property>
+ <property name="decorated">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="imgDebathena">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="label" translatable="yes"><span font_desc="Trebuchet MS Bold 20">Welcome to Athena</span></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <widget class="GtkWindow" id="winBranding">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">window1</property>
+ <property name="resizable">False</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="accept_focus">False</property>
+ <property name="focus_on_map">False</property>
+ <property name="decorated">False</property>
+ <child>
+ <widget class="GtkLabel" id="lblBranding">
+ <property name="visible">True</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="label" translatable="yes"><workstation information></property>
+ <property name="justify">center</property>
+ </widget>
+ </child>
+ </widget>
</glade-interface>
