rpms/gnome-screensaver/devel use-gtkbuilder.patch,NONE,1.1

Matthias Clasen mclasen at fedoraproject.org
Sat Aug 15 04:00:50 UTC 2009 

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20695

Added Files:
	use-gtkbuilder.patch 
Log Message:
add patches


use-gtkbuilder.patch:
 b/configure.ac                           |    3 
 b/data/Makefile.am                       |    8 
 b/data/gnome-screensaver-preferences.ui  |  719 +++++++++++++++++++++++++++++
 b/data/lock-dialog-default.ui            |  523 +++++++++++++++++++++
 b/po/POTFILES.in                         |    4 
 b/src/Makefile.am                        |    2 
 b/src/gnome-screensaver-preferences.c    |  102 ++--
 b/src/gs-lock-plug.c                     |   75 +--
 data/gnome-screensaver-preferences.glade |  760 -------------------------------
 data/lock-dialog-default.glade           |  568 -----------------------
 10 files changed, 1340 insertions(+), 1424 deletions(-)

--- NEW FILE use-gtkbuilder.patch ---
diff --git a/configure.ac b/configure.ac
index 1eb840a..30d0a8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ GTK_REQUIRED_VERSION=2.11.5
 LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
 GNOME_DESKTOP_REQUIRED_VERSION=2.23.2
 
-GLADE_REQUIRED_VERSION=2.5.0
 LIBGNOMEKBDUI_REQUIRED_VERSION=0.1
 
 AC_CHECK_HEADERS(unistd.h)
@@ -64,7 +63,6 @@ AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
 AC_SUBST(GNOME_SCREENSAVER_LIBS)
 
 PKG_CHECK_MODULES(GNOME_SCREENSAVER_DIALOG,
-        libglade-2.0 >= $GLADE_REQUIRED_VERSION
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
         gthread-2.0
         gtk+-2.0 >= $GTK_REQUIRED_VERSION)
@@ -74,7 +72,6 @@ AC_SUBST(GNOME_SCREENSAVER_DIALOG_LIBS)
 PKG_CHECK_MODULES(GNOME_SCREENSAVER_CAPPLET,
         gio-2.0 >= $GLIB_REQUIRED_VERSION
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
-        libglade-2.0 >= $GLADE_REQUIRED_VERSION
         gtk+-2.0 >= $GTK_REQUIRED_VERSION
         libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
 AC_SUBST(GNOME_SCREENSAVER_CAPPLET_CFLAGS)
diff --git a/data/Makefile.am b/data/Makefile.am
index 87d46d6..9833cae 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,10 +34,10 @@ menu_DATA =					\
 	gnome-screensavers.menu			\
 	$(NULL)
 
-gladedir = $(pkgdatadir)
-glade_DATA = 					\
-	gnome-screensaver-preferences.glade	\
-	lock-dialog-default.glade		\
+gtkbuilderdir = $(pkgdatadir)
+gtkbuilder_DATA = 					\
+	gnome-screensaver-preferences.ui	\
+	lock-dialog-default.ui		\
 	$(NULL)
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/data/gnome-screensaver-preferences.glade b/data/gnome-screensaver-preferences.glade
deleted file mode 100644
index 574e142..0000000
--- a/data/gnome-screensaver-preferences.glade
+++ /dev/null
@@ -1,760 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="prefs_dialog">
-  <property name="border_width">5</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Screensaver Preferences</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">600</property>
-  <property name="default_height">400</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">2</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="helpbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-help</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-11</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="gpm_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-2</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment2">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox11">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image6">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-jump-to</property>
-			  <property name="icon_size">4</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">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label16">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Power _Management</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</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">0</property>
-			  <property name="ypad">0</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>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-7</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
[...2670 lines suppressed...]
         char      *string;
         gdouble    activate_delay;
         gboolean   enabled;
         gboolean   is_writable;
         GConfClient *client;
+        GError    *error=NULL;
 
-        glade_file = g_build_filename (GLADEDIR, GLADE_XML_FILE, NULL);
-        xml = glade_xml_new (glade_file, NULL, PACKAGE);
-        g_free (glade_file);
+        gtk_builder_file = g_build_filename (GTKBUILDERDIR, GTK_BUILDER_FILE, NULL);
+        builder = gtk_builder_new();
+        if (!gtk_builder_add_from_file(builder, gtk_builder_file, &error)) {
+                g_warning("Couldn't load builder file: %s", error->message);
+                g_error_free(error);
+        }
+        g_free (gtk_builder_file);
 
-        if (xml == NULL) {
+        if (builder == NULL) {
 
                 dialog = gtk_message_dialog_new (NULL,
                                                  0, GTK_MESSAGE_ERROR,
@@ -1471,26 +1475,26 @@ init_capplet (void)
                 exit (1);
         }
 
-        preview            = glade_xml_get_widget (xml, "preview_area");
-        dialog             = glade_xml_get_widget (xml, "prefs_dialog");
-        treeview           = glade_xml_get_widget (xml, "savers_treeview");
-        list_scroller      = glade_xml_get_widget (xml, "themes_scrolled_window");
-        activate_delay_hscale = glade_xml_get_widget (xml, "activate_delay_hscale");
-        activate_delay_hbox   = glade_xml_get_widget (xml, "activate_delay_hbox");
-        enabled_checkbox   = glade_xml_get_widget (xml, "enable_checkbox");
-        lock_checkbox      = glade_xml_get_widget (xml, "lock_checkbox");
-        root_warning_label = glade_xml_get_widget (xml, "root_warning_label");
-        preview_button     = glade_xml_get_widget (xml, "preview_button");
-        gpm_button         = glade_xml_get_widget (xml, "gpm_button");
-        fullscreen_preview_window = glade_xml_get_widget (xml, "fullscreen_preview_window");
-        fullscreen_preview_area = glade_xml_get_widget (xml, "fullscreen_preview_area");
-        fullscreen_preview_close = glade_xml_get_widget (xml, "fullscreen_preview_close");
-        fullscreen_preview_previous = glade_xml_get_widget (xml, "fullscreen_preview_previous_button");
-        fullscreen_preview_next = glade_xml_get_widget (xml, "fullscreen_preview_next_button");
-
-        label              = glade_xml_get_widget (xml, "activate_delay_label");
+        preview            = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area"));
+        dialog             = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
+        treeview           = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
+        list_scroller      = GTK_WIDGET (gtk_builder_get_object (builder, "themes_scrolled_window"));
+        activate_delay_hscale = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_hscale"));
+        activate_delay_hbox   = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_hbox"));
+        enabled_checkbox   = GTK_WIDGET (gtk_builder_get_object (builder, "enable_checkbox"));
+        lock_checkbox      = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
+        root_warning_label = GTK_WIDGET (gtk_builder_get_object (builder, "root_warning_label"));
+        preview_button     = GTK_WIDGET (gtk_builder_get_object (builder, "preview_button"));
+        gpm_button         = GTK_WIDGET (gtk_builder_get_object (builder, "gpm_button"));
+        fullscreen_preview_window = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_window"));
+        fullscreen_preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_area"));
+        fullscreen_preview_close = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_close"));
+        fullscreen_preview_previous = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_previous_button"));
+        fullscreen_preview_next = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_next_button"));
+
+        label              = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_label"));
         gtk_label_set_mnemonic_widget (GTK_LABEL (label), activate_delay_hscale);
-        label              = glade_xml_get_widget (xml, "savers_label");
+        label              = GTK_WIDGET (gtk_builder_get_object (builder, "savers_label"));
         gtk_label_set_mnemonic_widget (GTK_LABEL (label), treeview);
 
         gtk_widget_set_no_show_all (root_warning_label, TRUE);
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index 0b36a7c..bdb68ae 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -37,7 +37,6 @@
 #include <gdk/gdkx.h>
 #include <X11/XKBlib.h>
 #include <gtk/gtk.h>
-#include <glade/glade-xml.h>
 #include <gconf/gconf-client.h>
 
 #ifdef WITH_KBD_LAYOUT_INDICATOR
@@ -1627,21 +1626,22 @@ load_theme (GSLockPlug *plug)
 {
         char       *theme;
         char       *filename;
-        char       *glade;
+        char       *gtkbuilder;
         char       *rc;
-        GladeXML   *xml;
+        GtkBuilder *builder;
         GtkWidget  *lock_dialog;
+        GError     *error=NULL;
 
         theme = get_dialog_theme_name (plug);
         if (theme == NULL) {
                 return FALSE;
         }
 
-        filename = g_strdup_printf ("lock-dialog-%s.glade", theme);
-        glade = g_build_filename (GLADEDIR, filename, NULL);
+        filename = g_strdup_printf ("lock-dialog-%s.ui", theme);
+        gtkbuilder = g_build_filename (GTKBUILDERDIR, filename, NULL);
         g_free (filename);
-        if (! g_file_test (glade, G_FILE_TEST_IS_REGULAR)) {
-                g_free (glade);
+        if (! g_file_test (gtkbuilder, G_FILE_TEST_IS_REGULAR)) {
+                g_free (gtkbuilder);
                 g_free (theme);
                 return FALSE;
         }
@@ -1649,50 +1649,51 @@ load_theme (GSLockPlug *plug)
         filename = g_strdup_printf ("lock-dialog-%s.gtkrc", theme);
         g_free (theme);
 
-        rc = g_build_filename (GLADEDIR, filename, NULL);
+        rc = g_build_filename (GTKBUILDERDIR, filename, NULL);
         g_free (filename);
         if (g_file_test (rc, G_FILE_TEST_IS_REGULAR)) {
                 gtk_rc_parse (rc);
         }
         g_free (rc);
 
-        xml = glade_xml_new (glade, "lock-dialog", NULL);
+        builder = gtk_builder_new();
 
-        if (xml == NULL) {
-                g_warning ("Failed to load '%s'\n", glade);
-                g_free (glade);
+        if (!gtk_builder_add_from_file (builder,filename ,&error)) {
+                g_warning ("Couldn't load builder file: %s", error->message);
+                g_error_free(error);
+                g_free (gtkbuilder);
                 return FALSE;
         }
-        g_free (glade);
+        g_free (gtkbuilder);
 
-        lock_dialog = glade_xml_get_widget (xml, "lock-dialog");
+        lock_dialog = GTK_WIDGET (gtk_builder_get_object(builder, "lock-dialog"));
         gtk_container_add (GTK_CONTAINER (plug), lock_dialog);
 
         plug->priv->vbox = NULL;
-        plug->priv->notebook = glade_xml_get_widget (xml, "notebook");
-
-        plug->priv->auth_face_image = glade_xml_get_widget (xml, "auth-face-image");
-        plug->priv->auth_action_area = glade_xml_get_widget (xml, "auth-action-area");
-        plug->priv->auth_realname_label = glade_xml_get_widget (xml, "auth-realname-label");
-        plug->priv->auth_username_label = glade_xml_get_widget (xml, "auth-username-label");
-        plug->priv->auth_prompt_label = glade_xml_get_widget (xml, "auth-prompt-label");
-        plug->priv->auth_prompt_entry = glade_xml_get_widget (xml, "auth-prompt-entry");
-        plug->priv->auth_prompt_box = glade_xml_get_widget (xml, "auth-prompt-box");
-        plug->priv->auth_capslock_label = glade_xml_get_widget (xml, "auth-capslock-label");
-        plug->priv->auth_message_label = glade_xml_get_widget (xml, "auth-status-label");
-        plug->priv->auth_unlock_button = glade_xml_get_widget (xml, "auth-unlock-button");
-        plug->priv->auth_cancel_button = glade_xml_get_widget (xml, "auth-cancel-button");
-        plug->priv->auth_logout_button = glade_xml_get_widget (xml, "auth-logout-button");
-        plug->priv->auth_switch_button = glade_xml_get_widget (xml, "auth-switch-button");
-        plug->priv->auth_note_button = glade_xml_get_widget (xml, "auth-note-button");
-        plug->priv->note_tab = glade_xml_get_widget (xml, "note-tab");
-        plug->priv->note_tab_label = glade_xml_get_widget (xml, "note-tab-label");
-        plug->priv->note_ok_button = glade_xml_get_widget (xml, "note-ok-button");
-        plug->priv->note_text_view = glade_xml_get_widget (xml, "note-text-view");
-        plug->priv->note_cancel_button = glade_xml_get_widget (xml, "note-cancel-button");
+        plug->priv->notebook = GTK_WIDGET (gtk_builder_get_object(builder, "notebook"));
+
+        plug->priv->auth_face_image = GTK_WIDGET (gtk_builder_get_object(builder, "auth-face-image"));
+        plug->priv->auth_action_area = GTK_WIDGET (gtk_builder_get_object(builder, "auth-action-area"));
+        plug->priv->auth_realname_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-realname-label"));
+        plug->priv->auth_username_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-username-label"));
+        plug->priv->auth_prompt_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-label"));
+        plug->priv->auth_prompt_entry = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-entry"));
+        plug->priv->auth_prompt_box = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-box"));
+        plug->priv->auth_capslock_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-capslock-label"));
+        plug->priv->auth_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-status-label"));
+        plug->priv->auth_unlock_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-unlock-button"));
+        plug->priv->auth_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-cancel-button"));
+        plug->priv->auth_logout_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-logout-button"));
+        plug->priv->auth_switch_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-switch-button"));
+        plug->priv->auth_note_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-note-button"));
+        plug->priv->note_tab = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab"));
+        plug->priv->note_tab_label = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab-label"));
+        plug->priv->note_ok_button = GTK_WIDGET (gtk_builder_get_object(builder, "note-ok-button"));
+        plug->priv->note_text_view = GTK_WIDGET (gtk_builder_get_object(builder, "note-text-view"));
+        plug->priv->note_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "note-cancel-button"));
 
         /* Placeholder for the keyboard indicator */
-        plug->priv->auth_prompt_kbd_layout_indicator = glade_xml_get_widget (xml, "auth-prompt-kbd-layout-indicator");
+        plug->priv->auth_prompt_kbd_layout_indicator = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-kbd-layout-indicator"));
         if (plug->priv->auth_logout_button != NULL) {
                 gtk_widget_set_no_show_all (plug->priv->auth_logout_button, TRUE);
         }
@@ -1705,7 +1706,7 @@ load_theme (GSLockPlug *plug)
 
         gtk_widget_show_all (lock_dialog);
 
-        plug->priv->status_message_label = glade_xml_get_widget (xml, "status-message-label");
+        plug->priv->status_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "status-message-label"));
 
         return TRUE;
 }

More information about the fedora-extras-commits mailing list