[gnome-screensaver] Revert "Add control center extension panel"
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-screensaver] Revert "Add control center extension panel"
- Date: Thu, 25 Feb 2010 12:25:08 +0000 (UTC)
commit 08451e3f67843488b590b6b92897a673475fc96f
Author: William Jon McCann <jmccann redhat com>
Date: Thu Feb 25 12:24:44 2010 +0000
Revert "Add control center extension panel"
This reverts commit 9c201069a316e7610eab55681d3a5a153333c68a.
configure.ac | 12 -
data/gnome-screensaver-preferences.ui | 420 ++++++---
src/Makefile.am | 78 +-
src/cc-screensaver-page.c | 1679 ---------------------------------
src/cc-screensaver-page.h | 55 --
src/cc-screensaver-panel.c | 144 ---
src/cc-screensaver-panel.h | 54 --
src/screensaver-module.c | 42 -
8 files changed, 314 insertions(+), 2170 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fbe5a04..17af53b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,18 +172,6 @@ PKG_CHECK_MODULES(LIB_GNOME_MENU,
AC_SUBST(LIB_GNOME_MENU_CFLAGS)
AC_SUBST(LIB_GNOME_MENU_LIBS)
-dnl ================================================================
-dnl Control Center Extension
-dnl ================================================================
-
-PKG_CHECK_MODULES(CC_EXTENSION, libgnome-control-center-extension)
-
-CC_EXTENSION_LIBTOOL_FLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'"
-AC_SUBST(CC_EXTENSION_LIBTOOL_FLAGS)
-
-CCEXTENSIONSDIR="${libdir}/control-center-1/extensions"
-AC_SUBST(CCEXTENSIONSDIR)
-
dnl ---------------------------------------------------------------------------
dnl - Where should we put documentation ?
dnl ---------------------------------------------------------------------------
diff --git a/data/gnome-screensaver-preferences.ui b/data/gnome-screensaver-preferences.ui
index 7708276..cfa6ccd 100644
--- a/data/gnome-screensaver-preferences.ui
+++ b/data/gnome-screensaver-preferences.ui
@@ -1,339 +1,438 @@
<?xml version="1.0"?>
+<!--*- mode: xml -*-->
<interface>
- <!-- interface-requires gtk+ 2.12 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkImage" id="preview_image">
<property name="stock">gtk-fullscreen</property>
+ <property name="icon_size">4</property>
</object>
<object class="GtkImage" id="power_image">
<property name="stock">gtk-jump-to</property>
+ <property name="icon_size">4</property>
</object>
<object class="GtkAdjustment" id="adjustment1">
- <property name="value">10</property>
- <property name="lower">1</property>
<property name="upper">120</property>
- <property name="step_increment">1</property>
+ <property name="lower">1</property>
<property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">10</property>
</object>
<object 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="type_hint">dialog</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">
<object class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
<property name="spacing">2</property>
- <child>
- <object class="GtkVBox" id="screensaver_vbox">
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="border_width">5</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object 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>
+ </object>
+ </child>
+ <child>
+ <object 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="image">power_image</property>
+ <property name="label" translatable="yes">Power _Management</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object 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>
+ </object>
+ </child>
+ </object>
+ <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>
+ <object class="GtkVBox" id="vbox1">
<property name="orientation">vertical</property>
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="homogeneous">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkVBox" id="vbox8">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="savers_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Screensaver theme:</property>
- <property name="use_markup">True</property>
<property name="use_underline">True</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</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>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
- <property name="column_spacing">6</property>
+ <property name="homogeneous">False</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="themes_scrolled_window">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<object class="GtkTreeView" id="savers_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
<accessibility>
- <relation type="label-for" target="savers_treeview"/>
+ <relation target="savers_treeview" type="label-for"/>
</accessibility>
</object>
</child>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
</packing>
</child>
<child>
- <object class="GtkDrawingArea" id="preview_area"/>
+ <object class="GtkDrawingArea" id="preview_area">
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">0</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
- <property name="layout_style">start</property>
+ <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <property name="spacing">0</property>
<child>
<object class="GtkButton" id="preview_button">
- <property name="label" translatable="yes">_Preview</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="image">preview_image</property>
+ <property name="label" translatable="yes">_Preview</property>
<property name="use_underline">True</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
</packing>
</child>
</object>
<packing>
- <property name="position">0</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
<packing>
- <property name="position">0</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
<packing>
- <property name="position">0</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
<object class="GtkVBox" id="vbox5">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
<object class="GtkVBox" id="vbox6">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
<object class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="activate_delay_hbox">
<property name="visible">True</property>
+ <property name="homogeneous">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="activate_delay_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Regard the computer as _idle after:</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>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
+ <property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkHScale" id="activate_delay_hscale">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">adjustment1</property>
+ <property name="draw_value">True</property>
+ <property name="value_pos">GTK_POS_TOP</property>
<property name="digits">0</property>
+ <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+ <property name="inverted">False</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
- <property name="position">0</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="enable_checkbox">
- <property name="label" translatable="yes">_Activate screensaver when computer is idle</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes">_Activate screensaver when computer is idle</property>
<property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="lock_checkbox">
- <property name="label" translatable="yes">_Lock screen when screensaver is active</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label" translatable="yes">_Lock screen when screensaver is active</property>
<property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="root_warning_label">
- <property name="xalign">0</property>
<property name="label" translatable="yes"><b>Warning: the screen will not be locked for the root user.</b></property>
+ <property name="use_underline">False</property>
<property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</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>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
</packing>
</child>
</object>
<packing>
- <property name="position">0</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
<packing>
- <property name="position">0</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
<packing>
- <property name="position">0</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
<packing>
- <property name="position">0</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="helpbutton1">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">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="gpm_button">
- <property name="label" translatable="yes">Power _Management</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="image">power_image</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
@@ -348,108 +447,161 @@
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="title" translatable="yes">Screensaver Preview</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">True</property>
- <property name="window_position">center</property>
+ <property name="resizable">True</property>
<property name="destroy_with_parent">True</property>
+ <property name="decorated">False</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <property name="decorated">False</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>
<object class="GtkVBox" id="vbox10">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
<object class="GtkHBox" id="hbox9">
<property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="xpad">10</property>
<property name="stock">gtk-dialog-warning</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">10</property>
+ <property name="ypad">0</property>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"><b>Screensaver preview</b></property>
+ <property name="use_underline">False</property>
<property name="use_markup">True</property>
- <property name="justify">fill</property>
+ <property name="justify">GTK_JUSTIFY_FILL</property>
<property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</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>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
- <property name="position">1</property>
+ <property name="fill">True</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="fullscreen_preview_theme_label">
<property name="visible">True</property>
+ <property name="label" translatable="yes"/>
+ <property name="use_underline">False</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>
</object>
<packing>
- <property name="position">2</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="fullscreen_preview_previous_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<child>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="stock">gtk-go-back</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>
</object>
</child>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkButton" id="fullscreen_preview_next_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<child>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="stock">gtk-go-forward</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>
</object>
</child>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkButton" id="fullscreen_preview_close">
- <property name="label">gtk-leave-fullscreen</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="label">gtk-leave-fullscreen</property>
<property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">5</property>
</packing>
</child>
</object>
<packing>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
@@ -457,7 +609,9 @@
<property name="visible">True</property>
</object>
<packing>
- <property name="position">1</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</object>
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e0fd8a..290aac1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,14 +51,6 @@ noinst_PROGRAMS = \
test-window \
$(NULL)
-noinst_LTLIBRARIES = \
- libscreensaver-settings-common.la \
- libscreensaver-common.la \
- $(NULL)
-
-ccmodulesdir = $(CCEXTENSIONSDIR)
-ccmodules_LTLIBRARIES = libgnome-screensaver.la
-
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = gnome-screensaver.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -81,10 +73,11 @@ test_fade_SOURCES = \
test-fade.c \
gs-fade.c \
gs-fade.h \
+ gs-debug.c \
+ gs-debug.h \
$(NULL)
test_fade_LDADD = \
- libscreensaver-common.la \
$(GNOME_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(NULL)
@@ -94,10 +87,11 @@ test_passwd_SOURCES = \
$(AUTH_SOURCES) \
setuid.c \
setuid.h \
+ subprocs.c \
+ subprocs.h \
$(NULL)
test_passwd_LDADD = \
- libscreensaver-common.la \
$(GNOME_SCREENSAVER_DIALOG_LIBS)\
$(AUTH_LIBS) \
$(NULL)
@@ -108,10 +102,11 @@ test_watcher_SOURCES = \
gs-watcher-x11.c \
gs-marshal.c \
gs-marshal.h \
+ gs-debug.c \
+ gs-debug.h \
$(NULL)
test_watcher_LDADD = \
- libscreensaver-common.la \
$(GNOME_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(NULL)
@@ -124,10 +119,13 @@ test_window_SOURCES = \
gs-grab.h \
gs-marshal.c \
gs-marshal.h \
+ gs-debug.c \
+ gs-debug.h \
+ subprocs.c \
+ subprocs.h \
$(NULL)
test_window_LDADD = \
- libscreensaver-common.la \
$(GNOME_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(NULL)
@@ -136,8 +134,12 @@ gnome_screensaver_dialog_SOURCES = \
gnome-screensaver-dialog.c \
gs-lock-plug.c \
gs-lock-plug.h \
+ gs-debug.c \
+ gs-debug.h \
setuid.c \
setuid.h \
+ subprocs.c \
+ subprocs.h \
$(AUTH_SOURCES) \
$(NULL)
@@ -148,7 +150,6 @@ EXTRA_gnome_screensaver_dialog_SOURCES = \
$(NULL)
gnome_screensaver_dialog_LDADD = \
- libscreensaver-common.la \
$(GNOME_SCREENSAVER_DIALOG_LIBS)\
$(SAVER_LIBS) \
$(AUTH_LIBS) \
@@ -183,6 +184,14 @@ gnome_screensaver_SOURCES = \
gs-window.h \
gs-prefs.c \
gs-prefs.h \
+ gs-theme-manager.c \
+ gs-theme-manager.h \
+ gs-job.c \
+ gs-job.h \
+ gs-debug.c \
+ gs-debug.h \
+ subprocs.c \
+ subprocs.h \
gs-grab-x11.c \
gs-grab.h \
gs-fade.c \
@@ -202,14 +211,16 @@ gnome_screensaver_gl_helper_SOURCES = \
$(NULL)
gnome_screensaver_LDADD = \
- libscreensaver-common.la \
$(GNOME_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(NULL)
gnome_screensaver_LDFLAGS = -export-dynamic
-libscreensaver_common_la_SOURCES = \
+gnome_screensaver_preferences_SOURCES = \
+ gnome-screensaver-preferences.c \
+ copy-theme-dialog.c \
+ copy-theme-dialog.h \
gs-theme-manager.c \
gs-theme-manager.h \
gs-job.c \
@@ -220,42 +231,7 @@ libscreensaver_common_la_SOURCES = \
subprocs.h \
$(NULL)
-libscreensaver_settings_common_la_SOURCES = \
- copy-theme-dialog.c \
- copy-theme-dialog.h \
- $(NULL)
-
-libgnome_screensaver_la_SOURCES = \
- screensaver-module.c \
- cc-screensaver-panel.c \
- cc-screensaver-panel.h \
- cc-screensaver-page.c \
- cc-screensaver-page.h \
- $(NULL)
-
-libgnome_screensaver_la_LDFLAGS = \
- $(CC_EXTENSION_LIBTOOL_FLAGS) \
- $(NULL)
-
-libgnome_screensaver_la_LIBADD = \
- libscreensaver-settings-common.la \
- libscreensaver-common.la \
- $(CC_EXTENSION_LIBS) \
- $(NULL)
-
-libgnome_screensaver_la_CFLAGS = \
- $(CC_EXTENSION_CFLAGS) \
- $(NULL)
-
-libgnome_screensaver_la_LIBTOOLFLAGS = --tag=disable-static
-
-gnome_screensaver_preferences_SOURCES = \
- gnome-screensaver-preferences.c \
- $(NULL)
-
-gnome_screensaver_preferences_LDADD = \
- libscreensaver-settings-common.la \
- libscreensaver-common.la \
+gnome_screensaver_preferences_LDADD = \
$(GNOME_SCREENSAVER_CAPPLET_LIBS) \
$(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
