From 3b88fa9d064e61705923ef42381b467bc8ecfd32 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Mon, 6 Jan 2014 03:31:16 +0000
Subject: Mon Jan  6 03:27:02 UTC 2014

---
 community/cinnamon/gtk3-lock-dialog.patch | 418 ++++++++++++++++++++++++++++++
 1 file changed, 418 insertions(+)
 create mode 100644 community/cinnamon/gtk3-lock-dialog.patch

(limited to 'community/cinnamon/gtk3-lock-dialog.patch')

diff --git a/community/cinnamon/gtk3-lock-dialog.patch b/community/cinnamon/gtk3-lock-dialog.patch
new file mode 100644
index 000000000..36f0d4469
--- /dev/null
+++ b/community/cinnamon/gtk3-lock-dialog.patch
@@ -0,0 +1,418 @@
+commit 7bb5af86b404d3e89f92019dba224e6fe258f7ea
+Author: Balló György <ballogyor@gmail.com>
+Date:   Sun Jan 5 16:54:41 2014 +0100
+
+    Port Lock screen dialog to GTK+ 3
+
+diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade
+deleted file mode 100644
+index a4200f9..0000000
+--- a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade
++++ /dev/null
+@@ -1,165 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<glade-interface>
+-  <!-- interface-requires gtk+ 2.24 -->
+-  <!-- interface-naming-policy project-wide -->
+-  <widget class="GtkDialog" id="main_dialog">
+-    <property name="can_focus">False</property>
+-    <property name="border_width">6</property>
+-    <property name="type_hint">dialog</property>
+-    <child internal-child="vbox">
+-      <widget class="GtkVBox" id="dialog-vbox1">
+-        <property name="visible">True</property>
+-        <property name="can_focus">False</property>
+-        <property name="spacing">6</property>
+-        <child internal-child="action_area">
+-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <widget class="GtkButton" id="button_cancel">
+-                <property name="label">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_action_appearance">False</property>
+-                <property name="use_stock">True</property>
+-              </widget>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <widget class="GtkButton" id="button_ok">
+-                <property name="label">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_action_appearance">False</property>
+-                <property name="use_stock">True</property>
+-              </widget>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </widget>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="fill">True</property>
+-            <property name="padding">3</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+-        <child>
+-          <widget class="GtkImage" id="image_face">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <property name="stock">gtk-missing-image</property>
+-          </widget>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="fill">True</property>
+-            <property name="padding">3</property>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child>
+-          <widget class="GtkLabel" id="label_description">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <property name="label" translatable="yes">label</property>
+-          </widget>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="fill">True</property>
+-            <property name="padding">3</property>
+-            <property name="position">2</property>
+-          </packing>
+-        </child>
+-        <child>
+-          <widget class="GtkHBox" id="hbox1">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <child>
+-              <widget class="GtkLabel" id="label_away_message">
+-                <property name="visible">True</property>
+-                <property name="can_focus">False</property>
+-                <property name="label" translatable="yes">label</property>
+-              </widget>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">True</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <widget class="GtkHBox" id="hbox3">
+-                <property name="visible">True</property>
+-                <property name="can_focus">False</property>
+-                <child>
+-                  <widget class="GtkLabel" id="label1">
+-                    <property name="visible">True</property>
+-                    <property name="can_focus">False</property>
+-                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
+-                    <property name="use_markup">True</property>
+-                  </widget>
+-                  <packing>
+-                    <property name="expand">False</property>
+-                    <property name="fill">True</property>
+-                    <property name="position">0</property>
+-                  </packing>
+-                </child>
+-                <child>
+-                  <widget class="GtkEntry" id="entry_away_message">
+-                    <property name="visible">True</property>
+-                    <property name="can_focus">True</property>
+-                    <property name="invisible_char">●</property>
+-                    <property name="invisible_char_set">True</property>
+-                    <property name="primary_icon_activatable">False</property>
+-                    <property name="secondary_icon_activatable">False</property>
+-                    <property name="primary_icon_sensitive">True</property>
+-                    <property name="secondary_icon_sensitive">True</property>
+-                  </widget>
+-                  <packing>
+-                    <property name="expand">True</property>
+-                    <property name="fill">True</property>
+-                    <property name="position">1</property>
+-                  </packing>
+-                </child>
+-                <child>
+-                  <widget class="GtkLabel" id="label2">
+-                    <property name="visible">True</property>
+-                    <property name="can_focus">False</property>
+-                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
+-                    <property name="use_markup">True</property>
+-                  </widget>
+-                  <packing>
+-                    <property name="expand">False</property>
+-                    <property name="fill">True</property>
+-                    <property name="position">2</property>
+-                  </packing>
+-                </child>
+-              </widget>
+-              <packing>
+-                <property name="expand">True</property>
+-                <property name="fill">True</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </widget>
+-          <packing>
+-            <property name="expand">True</property>
+-            <property name="fill">True</property>
+-            <property name="padding">3</property>
+-            <property name="position">3</property>
+-          </packing>
+-        </child>
+-      </widget>
+-    </child>
+-  </widget>
+-</glade-interface>
+diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
+index f6f3ad1..72cdf4f 100755
+--- a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
++++ b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
+@@ -3,8 +3,7 @@
+ import sys
+ import os
+ import gettext
+-import gtk
+-import gtk.glade   
++from gi.repository import Gtk
+ import pwd
+ import socket
+ 
+@@ -25,32 +24,32 @@ class MainWindow:
+         if real_name == "":
+             real_name = username        
+ 
+-        gladefile = "/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade"
+-        self.wTree = gtk.glade.XML(gladefile, "main_dialog")        
++        self.builder = Gtk.Builder()
++        self.builder.add_from_file("/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui")
+         
+-        self.window = self.wTree.get_widget("main_dialog")        
+-        self.button_cancel = self.wTree.get_widget("button_cancel")
+-        self.button_ok = self.wTree.get_widget("button_ok")                        
+-        self.entry = self.wTree.get_widget("entry_away_message")
+-        self.image = self.wTree.get_widget("image_face")
++        self.window = self.builder.get_object("main_dialog")
++        self.button_cancel = self.builder.get_object("button_cancel")
++        self.button_ok = self.builder.get_object("button_ok")
++        self.entry = self.builder.get_object("entry_away_message")
++        self.image = self.builder.get_object("image_face")
+                     
+         self.window.set_title(_("Lock screen"))
+         self.window.set_icon_from_file("/usr/lib/cinnamon-settings/data/icons/screensaver.svg")
+                 
+-        self.wTree.get_widget("label_description").set_markup("<i>%s</i>" % _("Please type an away message for the lock screen"))
+-        self.wTree.get_widget("label_away_message").set_markup("<b>%s: </b>" % real_name)        
++        self.builder.get_object("label_description").set_markup("<i>%s</i>" % _("Please type an away message for the lock screen"))
++        self.builder.get_object("label_away_message").set_markup("<b>%s: </b>" % real_name)
+         
+         if os.path.exists("%s/.face" % home_dir):
+             self.image.set_from_file("%s/.face" % home_dir)
+         else:
+             self.image.set_from_file("/usr/share/pixmaps/nobody.png")
+         
+-        self.window.connect("destroy", gtk.main_quit)
+-        self.button_cancel.connect("clicked", gtk.main_quit)
++        self.window.connect("destroy", Gtk.main_quit)
++        self.button_cancel.connect("clicked", Gtk.main_quit)
+         self.button_ok.connect('clicked', self.lock_screen)
+         self.entry.connect('activate', self.lock_screen)
+         
+-        self.wTree.get_widget("dialog-action_area1").set_focus_chain((self.button_ok, self.button_cancel))
++        self.builder.get_object("dialog-action_area1").set_focus_chain((self.button_ok, self.button_cancel))
+           
+         self.window.show()                    
+         
+@@ -60,8 +59,8 @@ class MainWindow:
+             os.system("cinnamon-screensaver-command --lock --away-message \"%s\" &" % self.entry.get_text())
+         else:
+             os.system("cinnamon-screensaver-command --lock &")
+-        gtk.main_quit()
++        Gtk.main_quit()
+    
+ if __name__ == "__main__":    
+     MainWindow()
+-    gtk.main()
++    Gtk.main()
+diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui
+new file mode 100644
+index 0000000..30700b9
+--- /dev/null
++++ b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui
+@@ -0,0 +1,165 @@
++<?xml version="1.0"?>
++<interface>
++  <!-- interface-requires gtk+ 2.24 -->
++  <!-- interface-naming-policy project-wide -->
++  <object class="GtkDialog" id="main_dialog">
++    <property name="can_focus">False</property>
++    <property name="border_width">6</property>
++    <property name="type_hint">dialog</property>
++    <child internal-child="vbox">
++      <object class="GtkVBox" id="dialog-vbox1">
++        <property name="visible">True</property>
++        <property name="can_focus">False</property>
++        <property name="spacing">6</property>
++        <child internal-child="action_area">
++          <object class="GtkHButtonBox" id="dialog-action_area1">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button_cancel">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_action_appearance">False</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="button_ok">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_action_appearance">False</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="padding">3</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkImage" id="image_face">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="stock">gtk-missing-image</property>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="padding">3</property>
++            <property name="position">1</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkLabel" id="label_description">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">label</property>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="padding">3</property>
++            <property name="position">2</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkHBox" id="hbox1">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <child>
++              <object class="GtkLabel" id="label_away_message">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">label</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkHBox" id="hbox3">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <child>
++                  <object class="GtkLabel" id="label1">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
++                    <property name="use_markup">True</property>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkEntry" id="entry_away_message">
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="invisible_char">&#x25CF;</property>
++                    <property name="invisible_char_set">True</property>
++                    <property name="primary_icon_activatable">False</property>
++                    <property name="secondary_icon_activatable">False</property>
++                    <property name="primary_icon_sensitive">True</property>
++                    <property name="secondary_icon_sensitive">True</property>
++                  </object>
++                  <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkLabel" id="label2">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
++                    <property name="use_markup">True</property>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
++                    <property name="position">2</property>
++                  </packing>
++                </child>
++              </object>
++              <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
++            <property name="padding">3</property>
++            <property name="position">3</property>
++          </packing>
++        </child>
++      </object>
++    </child>
++  </object>
++</interface>
-- 
cgit v1.2.3-54-g00ecf