pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 17867 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/gnome-control-center based on submit request 17867 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/17867
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=27
This commit is contained in:
OBS User autobuild 2009-08-17 12:49:25 +00:00 committed by Git OBS Bridge
parent 20432a387f
commit 63bffaa367
6 changed files with 329 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-control-center-2.27.4.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e17256022af4c4723290be9644667b6efc07988f9462cc62a58c03848933936
size 2271175

3
gnome-control-center-2.27.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48fd54795f9c29d9dd4a0cc701852f0ef3d50cb195f3965dd25bf7936283f7ab
size 2315300

237
gnome-control-center-libslab.patch Normal file
View File

@ -0,0 +1,237 @@
diff --git a/configure.in b/configure.in
index ec2a67b..d3cd6bb 100644
--- a/configure.in
+++ b/configure.in
@@ -95,7 +95,7 @@ COMMON_MODULES="gtk+-2.0 >= 2.15.0 dnl
gnome-desktop-2.0 >= 2.25.1"
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
-PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnomeui-2.0 libgnome-menu libpanelapplet-2.0)
+PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu unique-1.0)
PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
@@ -121,14 +121,9 @@ WARN_CFLAGS="-Wall"
AC_SUBST(LIBSLAB_CFLAGS)
AC_SUBST(LIBSLAB_LIBS)
AC_SUBST(WARN_CFLAGS)
+AM_CONDITIONAL(LIBSLAB_FOR_INTERNAL_USE, test "yes" = "yes")
AM_CONDITIONAL(HAVE_LIBSLAB_DEPS, [test $have_libslab_deps = yes])
-# When copying libslab, make sure to change this to match the value specified
-# in libslab's configure.ac file
-
-LT_VERSION=1:2:1
-AC_SUBST(LT_VERSION)
-
dnl
dnl Check for Xft version 2; we build in extra functionality to the font capplet
dnl when we have it.
@@ -348,7 +343,6 @@ libwindow-settings/Makefile
libwindow-settings/gnome-window-settings-2.0.pc
po/Makefile.in
libslab/Makefile
-libslab/libslab.pc
shell/Makefile
shell/gnomecc.desktop.in
typing-break/Makefile
diff --git a/libslab/Makefile.am b/libslab/Makefile.am
index 520c61e..771e840 100644
--- a/libslab/Makefile.am
+++ b/libslab/Makefile.am
@@ -26,7 +26,11 @@ HEADER_FILES= \
system-tile.h \
tile.h
+if !LIBSLAB_FOR_INTERNAL_USE
lib_LTLIBRARIES = libslab.la
+else
+noinst_LTLIBRARIES = libslab.la
+endif
libslab_la_SOURCES = \
$(MARSHAL_GENERATED) \
@@ -53,10 +57,12 @@ libslab_la_SOURCES = \
tile-action.c \
tile.c
+if !LIBSLAB_FOR_INTERNAL_USE
libslab_includedir = $(includedir)/libslab
libslab_include_HEADERS = $(HEADER_FILES)
libslab_la_LDFLAGS = -version-info $(LT_VERSION)
+endif
libslab_la_LIBADD = $(LIBSLAB_LIBS)
@@ -65,6 +71,7 @@ search-entry-watermark.h: search-entry-watermark.svg
sed -e 's/"/\\"/g' -e 's/$$/\\/' -e 's/#000000/#%s/g' $< >> $@; \
echo '"' >> $@
+
MARSHAL_GENERATED = nld-marshal.c nld-marshal.h
nld-marshal.h: nld-marshal.list
diff --git a/libslab/app-shell.c b/libslab/app-shell.c
index 2cf8e02..ad7293d 100644
--- a/libslab/app-shell.c
+++ b/libslab/app-shell.c
@@ -138,7 +138,6 @@ create_main_window (AppShellData * app_data, const gchar * app_name, const gchar
gtk_window_set_position (GTK_WINDOW (app_data->main_app), GTK_WIN_POS_CENTER);
if (!hidden)
show_shell (app_data);
- gtk_main ();
return TRUE;
}
diff --git a/libslab/libslab.pc.in b/libslab/libslab.pc.in
deleted file mode 100644
index 101fa0f..0000000
--- a/libslab/libslab.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libslab
-Description: Beautiful App Slab
-Requires: glib-2.0 gobject-2.0 gtk+-2.0 gnome-desktop-2.0 libgnome-menu
-Requires.private: gdk-2.0 librsvg-2.0
-Version: @VERSION@
-Libs: -L${libdir} -lslab
-Cflags: -I${includedir}/slab
diff --git a/shell/control-center.c b/shell/control-center.c
index 26f902c..c4c154d 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -20,16 +20,12 @@
#include "config.h"
-#include <string.h>
-
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <panel-applet.h>
#include <libgnome/gnome-desktop-item.h>
-#include <libgnomeui/libgnomeui.h>
-#include <dirent.h>
+#include <unique/unique.h>
-#include "app-shell.h"
-#include "slab-gnome-util.h"
+#include <libslab/slab.h>
void handle_static_action_clicked (Tile * tile, TileEvent * event, gpointer data);
static GSList *get_actions_list ();
@@ -102,13 +98,51 @@ handle_static_action_clicked (Tile * tile, TileEvent * event, gpointer data)
g_free (temp);
}
+static UniqueResponse
+message_received_cb (UniqueApp *app,
+ UniqueCommand command,
+ UniqueMessageData *message,
+ guint time,
+ gpointer user_data)
+{
+ UniqueResponse res;
+ AppShellData *app_data = user_data;
+
+ switch (command) {
+ case UNIQUE_ACTIVATE:
+ /* move the main window to the screen that sent us the command */
+ gtk_window_set_screen (GTK_WINDOW (app_data->main_app),
+ unique_message_data_get_screen (message));
+ if (!app_data->main_app_window_shown_once)
+ show_shell (app_data);
+
+ gtk_window_present_with_time (GTK_WINDOW (app_data->main_app),
+ time);
+
+ gtk_widget_grab_focus (SLAB_SECTION (app_data->filter_section)->contents);
+
+ res = UNIQUE_RESPONSE_OK;
+ break;
+ default:
+ res = UNIQUE_RESPONSE_PASSTHROUGH;
+ break;
+ }
+
+ return res;
+}
+
int
main (int argc, char *argv[])
{
gboolean hidden = FALSE;
+ UniqueApp *unique_app;
AppShellData *app_data;
GSList *actions;
- GnomeProgram *program;
+ GError *error;
+ GOptionEntry options[] = {
+ { "hide", 0, 0, G_OPTION_ARG_NONE, &hidden, N_("Hide on start (useful to preload the shell)"), NULL },
+ { NULL }
+ };
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
@@ -116,20 +150,29 @@ main (int argc, char *argv[])
textdomain (GETTEXT_PACKAGE);
#endif
- if (argc > 1)
- {
- if (argc != 2 || strcmp ("-h", argv[1]))
- {
- printf ("Usage - gnome-control-center [-h]\n");
- printf ("Options: -h : hide on start\n");
- printf ("\tUseful if you want to autostart the control-center singleton so it can get all its slow loading done\n");
- exit (1);
- }
- hidden = TRUE;
+ error = NULL;
+ if (!gtk_init_with_args (&argc, &argv,
+ NULL, options, GETTEXT_PACKAGE, &error)) {
+ g_printerr ("%s\n", error->message);
+ g_error_free (error);
+ return 1;
}
- program = gnome_program_init ("GNOME Control Center", "0.1", LIBGNOMEUI_MODULE,
- argc, argv, NULL, NULL);
+ unique_app = unique_app_new ("org.opensuse.yast-control-center-gnome", NULL);
+ if (unique_app_is_running (unique_app)) {
+ int retval = 0;
+
+ if (!hidden) {
+ UniqueResponse response;
+ response = unique_app_send_message (unique_app,
+ UNIQUE_ACTIVATE,
+ NULL);
+ retval = (response != UNIQUE_RESPONSE_OK);
+ }
+
+ g_object_unref (unique_app);
+ return retval;
+ }
app_data = appshelldata_new ("gnomecc.menu", NULL, CONTROL_CENTER_PREFIX,
GTK_ICON_SIZE_DND, FALSE, TRUE);
@@ -142,5 +185,13 @@ main (int argc, char *argv[])
create_main_window (app_data, "MyControlCenter", _("Control Center"),
"gnome-control-center", 975, 600, hidden);
+ unique_app_watch_window (unique_app, GTK_WINDOW (app_data->main_app));
+ g_signal_connect (unique_app, "message-received",
+ G_CALLBACK (message_received_cb), app_data);
+
+ gtk_main ();
+
+ g_object_unref (unique_app);
+
return 0;
};

12
gnome-control-center-use-settings-menu.patch
View File

@ -1,13 +1,13 @@
Index: shell/control-center.c
===================================================================
--- shell/control-center.c (revision 7440)
+++ shell/control-center.c (working copy)
@@ -151,7 +151,7 @@
exit (1);
}
--- shell/control-center.c.orig
+++ shell/control-center.c
@@ -131,7 +131,7 @@ main (int argc, char *argv[])
program = gnome_program_init ("GNOME Control Center", "0.1", LIBGNOMEUI_MODULE,
argc, argv, NULL, NULL);
- app_data = appshelldata_new ("gnomecc.menu", NULL, CONTROL_CENTER_PREFIX,
+ app_data = appshelldata_new ("settings.menu", NULL, CONTROL_CENTER_PREFIX,
GTK_ICON_SIZE_DND, FALSE, TRUE);
GTK_ICON_SIZE_DND, FALSE, TRUE);
generate_categories (app_data);

32
gnome-control-center.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Thu Aug 13 15:41:13 CEST 2009 - vuntz@novell.com
- Update to version 2.27.5:
+ Default applications:
- Don't clear the custom browser command on startup
(bgo#590316)
+ General:
- Remove all libglade dependencies
- Remove markup from translatable strings in GTKBuilder files
(bgo#599759)
+ Network:
- Fix unparsed mnemonics (bgo#590364)
+ Shell:
- Removed deprecated dependencies from libslab
- Adapted shell to new libslab API
- Remove libgnome and libgnomeui dependencies
+ Updated translations.
- Respin gnome-control-center-use-settings-menu.patch.
- Add gnome-control-center-libslab.patch, taken from git, to fix
some mess with the internal copy of libslab.
- Remove gstreamer010-plugins-base-devel, libglade2-devel
BuildRequires.
- Remove Recommends on gnome-audio: that's not true anymore (the
capplet handling this has moved to gnome-media).
- Split out libraries in their own packages:
libgnome-window-settings1, libgnome-window-settings-devel.
- Remove permissions PreReq and the call to
run_permissions/verifyscript/verify_permissions since we don't
ship change-passwd anymore.
- Remove libexecdir argument from configure.
-------------------------------------------------------------------
Mon Jul 20 12:58:41 CEST 2009 - vuntz@novell.com

87
gnome-control-center.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-control-center (Version 2.27.4.1)
# spec file for package gnome-control-center (Version 2.27.5)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -29,11 +29,10 @@ BuildRequires: gnome-doc-utils-devel
BuildRequires: gnome-menus-devel
BuildRequires: gnome-panel-devel
BuildRequires: gnome-settings-daemon-devel
BuildRequires: gstreamer010-plugins-base-devel
BuildRequires: intltool
BuildRequires: libglade2-devel
BuildRequires: libgnomekbd-devel
BuildRequires: librsvg-devel
BuildRequires: libunique-devel
BuildRequires: libxklavier-devel
BuildRequires: metacity-devel
BuildRequires: update-desktop-files
@ -42,10 +41,12 @@ License: GPL v2 or later
Group: System/GUI/GNOME
Obsoletes: fontilus themus acme
Provides: fontilus themus acme
Version: 2.27.4.1
Version: 2.27.5
Release: 1
Summary: The GNOME Control Center
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gnome-control-center-libslab.patch vuntz@novell.com -- Taken from git, to fix the libslab mess
Patch0: gnome-control-center-libslab.patch
# PATCH-FIX-UPSTREAM gnome-control-center-bnc427745-force-dpi.patch bnc427745 bgo553652 vuntz@novell.com -- Force the DPI to 96 right now to avoid big fonts.
Patch1: gnome-control-center-bnc427745-force-dpi.patch
# PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE)
@ -59,8 +60,6 @@ Patch31: gnome-control-center-bnc436206-add-to-default.patch
Url: http://www.gnome.org
Requires: nautilus gnome-settings-daemon gnome-menus libcanberra-gtk
Requires: %{name}-lang = %{version}
PreReq: permissions
Recommends: gnome-audio
Provides: control-center2 = 2.22.1
Obsoletes: control-center2 <= 2.22.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -69,33 +68,43 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This package contains the control center for the GNOME 2.x Desktop.
Authors:
--------
Jonathan Blandford <jrb@redhat.com>
%package devel
License: GPL v2 or later
Summary: Header files for the GNOME Control Center
Group: System/GUI/GNOME
Requires: %{name} = %{version} dbus-1-devel glib2-devel gtk2-devel gnome-desktop-devel gnome-menus-devel libglade2-devel libgnomeui-devel librsvg-devel pango-devel
Requires: dbus-1-glib-devel
Requires: %{name} = %{version}
Provides: control-center2-devel = 2.22.1
Obsoletes: control-center2-devel <= 2.22.1
%description devel
This package contains the control center for the GNOME 2.x Desktop.
%package -n libgnome-window-settings1
License: GPL v2 or later
Summary: Utility library for getting window manager settings
Group: Development/Libraries/GNOME
Group: Development/Libraries/GNOME
Requires: %{name}-lang = %{version}
%description -n libgnome-window-settings1
This library is used by the GNOME control center to change preferences
of window managers.
Authors:
--------
Jonathan Blandford <jrb@redhat.com>
%package -n libgnome-window-settings-devel
License: GPL v2 or later
Summary: Utility library for getting window manager settings - Development Files
Group: Development/Libraries/GNOME
Requires: libgnome-window-settings1 = %{version}
Requires: gtk2-devel
%description -n libgnome-window-settings-devel
This library is used by the GNOME control center to change preferences
of window managers.
%lang_package
%prep
%setup -q -n %{name}-%{version}
%setup -q
%patch0 -p1
%patch1 -p1
#NEEDS-REBASE
#%patch14 -p1
@ -106,7 +115,6 @@ Authors:
%build
autoreconf -f -i
%configure --with-pic\
--libexecdir=%{_prefix}/lib/control-center-2.0\
--disable-static\
--disable-scrollkeeper\
--disable-update-mimedb\
@ -115,6 +123,12 @@ make %{?jobs:-j%jobs}
%install
%makeinstall
rm -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name}-2.0
# help files
%find_lang control-center %{name}-2.0.lang
%find_gconf_schemas
%suse_update_desktop_file -N "Control Center" -G "Personal Settings" -C "Configure the desktop" gnomecc DesktopSettings
# capplets
%suse_update_desktop_file at-properties X-SuSE-ControlCenter-Personal
@ -130,12 +144,6 @@ make %{?jobs:-j%jobs}
%suse_update_desktop_file gnome-at-session
%suse_update_desktop_file gnome-font-viewer
%suse_update_desktop_file gnome-theme-installer
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
%find_lang %{name}-2.0
%find_lang control-center %{name}-2.0.lang
%find_gconf_schemas
cat %{name}.schemas_list >gnome-%{name}.lst
find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
%fdupes $RPM_BUILD_ROOT
%clean
@ -144,25 +152,24 @@ rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
%post
/sbin/ldconfig
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
%run_permissions
%verifyscript
%verify_permissions -e %{_sbindir}/change-passwd
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%postun
/sbin/ldconfig
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
%files -f gnome-%{name}.lst
%post -n libgnome-window-settings1 -p /sbin/ldconfig
%postun -n libgnome-window-settings1 -p /sbin/ldconfig
%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/*
@ -174,17 +181,25 @@ fi
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_datadir}/mime/packages/*.xml
%{_libdir}/*.so.*
%{_libdir}/window-manager-settings
%{_sysconfdir}/xdg/menus/gnomecc.menu
%files lang -f %{name}-2.0.lang
%files devel
%defattr (-, root, root)
%{_datadir}/pkgconfig/gnome-default-applications.pc
%{_datadir}/pkgconfig/gnome-keybindings.pc
%files -n libgnome-window-settings1
%defattr (-, root, root)
%dir %{_libdir}/window-manager-settings
%{_libdir}/window-manager-settings/libmetacity.so
%{_libdir}/libgnome-window-settings.so.*
%files -n libgnome-window-settings-devel
%defattr (-, root, root)
%{_includedir}/gnome-window-settings-2.0
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/pkgconfig/*.pc
%{_libdir}/libgnome-window-settings.so
%{_libdir}/pkgconfig/gnome-window-settings-2.0.pc
%changelog