leigh123linux pushed to cinnamon-session (f22). "update to git snapshot"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 20 11:01:12 UTC 2015
From e2661158c7c2d27b33f85b7367951d0f68489186 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Tue, 5 May 2015 15:04:28 +0100
Subject: update to git snapshot
diff --git a/.gitignore b/.gitignore
index ebd8bb9..ef4bdfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/cinnamon-session-2.4.0.git8c1b918.tar.gz
/cinnamon-session-2.4.0.tar.gz
/cinnamon-session-2.4.1.tar.gz
+/cinnamon-session-2.5.1.gitfc7111e.tar.gz
diff --git a/0001-Revert-Re-Add-session-timeout-disable-by-default.patch b/0001-Revert-Re-Add-session-timeout-disable-by-default.patch
deleted file mode 100644
index 43b0e86..0000000
--- a/0001-Revert-Re-Add-session-timeout-disable-by-default.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-From f7b2fd57b45c292d7c94202ae35325a49edc04fa Mon Sep 17 00:00:00 2001
-From: leigh123linux <leigh123linux at googlemail.com>
-Date: Thu, 20 Nov 2014 09:40:31 +0000
-Subject: [PATCH] Revert "Re-Add session timeout, disable by default"
-
-This reverts commit c9c49bfb8dc15c655091c6a251fb2dac21141ff8.
----
- cinnamon-session/csm-logout-dialog.c | 173 ++++--------------------
- data/org.cinnamon.SessionManager.gschema.xml.in | 12 +-
- 2 files changed, 29 insertions(+), 156 deletions(-)
-
-diff --git a/cinnamon-session/csm-logout-dialog.c b/cinnamon-session/csm-logout-dialog.c
-index 86e139f..e274fc1 100644
---- a/cinnamon-session/csm-logout-dialog.c
-+++ b/cinnamon-session/csm-logout-dialog.c
-@@ -42,10 +42,6 @@
- #define LOCKDOWN_SCHEMA "org.cinnamon.desktop.lockdown"
- #define KEY_DISABLE_USER_SWITCHING "disable-user-switching"
-
--#define SESSION_SCHEMA "org.cinnamon.SessionManager"
--#define KEY_TOGGLE_DELAY "quit-delay-toggle"
--#define KEY_DELAY "quit-time-delay"
--
- struct _CsmLogoutDialogPrivate
- {
- CsmDialogLogoutType type;
-@@ -53,20 +49,12 @@ struct _CsmLogoutDialogPrivate
- #ifdef HAVE_OLD_UPOWER
- UpClient *up_client;
- #endif
-- CsmSystem *system;
-- GtkWidget *progressbar;
--
-- gboolean delay_toggle;
-- int timeout;
-- int delay;
-- unsigned int timeout_id;
-+ CsmSystem *system;
- unsigned int default_response;
- };
-
- static CsmLogoutDialog *current_dialog = NULL;
-
--static void csm_logout_dialog_set_timeout (CsmLogoutDialog *logout_dialog);
--
- static void csm_logout_dialog_destroy (CsmLogoutDialog *logout_dialog,
- gpointer data);
-
-@@ -137,9 +125,7 @@ static void
- csm_logout_dialog_init (CsmLogoutDialog *logout_dialog)
- {
- logout_dialog->priv = CSM_LOGOUT_DIALOG_GET_PRIVATE (logout_dialog);
--
-- logout_dialog->priv->timeout_id = 0;
-- logout_dialog->priv->timeout = 0;
-+
- logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL;
-
- gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE);
-@@ -166,11 +152,7 @@ csm_logout_dialog_init (CsmLogoutDialog *logout_dialog)
- static void
- csm_logout_dialog_destroy (CsmLogoutDialog *logout_dialog,
- gpointer data)
--{
-- if (logout_dialog->priv->timeout_id != 0) {
-- g_source_remove (logout_dialog->priv->timeout_id);
-- logout_dialog->priv->timeout_id = 0;
-- }
-+{
-
- #ifdef HAVE_OLD_UPOWER
- if (logout_dialog->priv->up_client) {
-@@ -245,111 +227,26 @@ csm_logout_supports_shutdown (CsmLogoutDialog *logout_dialog)
-
- static void
- csm_logout_dialog_show (CsmLogoutDialog *logout_dialog, gpointer user_data)
--{
-- csm_logout_dialog_set_timeout (logout_dialog);
--}
--
--static gboolean
--csm_logout_dialog_timeout (gpointer data)
--{
-- CsmLogoutDialog *logout_dialog;
-- char *seconds_warning;
-- char *secondary_text;
--
-- logout_dialog = (CsmLogoutDialog *) data;
--
-- if (!logout_dialog->priv->timeout && logout_dialog->priv->delay_toggle) {
-- gtk_dialog_response (GTK_DIALOG (logout_dialog),
-- logout_dialog->priv->default_response);
--
-- return FALSE;
-- }
--
-- switch (logout_dialog->priv->type) {
-- case CSM_DIALOG_LOGOUT_TYPE_LOGOUT:
-- /* This string is shared with csm-fail-whale-dialog.c */
-- seconds_warning = ngettext ("You will be logged "
-- "out in %d second.",
-- "You will be logged "
-- "out in %d seconds.",
-- logout_dialog->priv->timeout);
-- break;
--
-- case CSM_DIALOG_LOGOUT_TYPE_SHUTDOWN:
-- seconds_warning = ngettext ("This system will be "
-- "shut down in %d second.",
-- "This system will be "
-- "shut down in %d seconds.",
-- logout_dialog->priv->timeout);
-- break;
--
-- case CSM_DIALOG_LOGOUT_TYPE_REBOOT:
-- seconds_warning = ngettext ("This system will be "
-- "restarted in %d second.",
-- "This system will be "
-- "restarted in %d seconds.",
-- logout_dialog->priv->timeout);
-- break;
--
-- default:
-- g_assert_not_reached ();
-- }
--
-- if (!csm_system_is_login_session (logout_dialog->priv->system)) {
-- char *name;
--
-- name = g_locale_to_utf8 (g_get_real_name (), -1, NULL, NULL, NULL);
--
-- if (!name || name[0] == '\0' || strcmp (name, "Unknown") == 0) {
-- name = g_locale_to_utf8 (g_get_user_name (), -1 , NULL, NULL, NULL);
-- }
--
-- if (!name) {
-- name = g_strdup (g_get_user_name ());
-- }
--
-- secondary_text = g_strdup_printf (_("You are currently logged in as \"%s\"."), name);
--
-- g_free (name);
-- }
--
-- gdouble delay;
--
-- delay = (gdouble)logout_dialog->priv->delay;
-- seconds_warning = g_strdup_printf (seconds_warning, logout_dialog->priv->timeout);
--
-- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (logout_dialog->priv->progressbar), logout_dialog->priv->timeout / delay);
-- gtk_progress_bar_set_show_text( GTK_PROGRESS_BAR(logout_dialog->priv->progressbar), TRUE );
-- gtk_progress_bar_set_text (GTK_PROGRESS_BAR (logout_dialog->priv->progressbar), seconds_warning);
--
-- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (logout_dialog),
-- secondary_text,
-- NULL);
--
-- logout_dialog->priv->timeout--;
--
-- g_free (secondary_text);
-- g_free (seconds_warning);
--
-- return TRUE;
--}
--
--static void
--csm_logout_dialog_set_timeout (CsmLogoutDialog *logout_dialog)
--{
-- logout_dialog->priv->timeout = logout_dialog->priv->delay;
--
-- /* Sets the secondary text */
-- csm_logout_dialog_timeout (logout_dialog);
--
-- if (logout_dialog->priv->timeout_id != 0) {
-- g_source_remove (logout_dialog->priv->timeout_id);
-- logout_dialog->priv->timeout_id = 0;
-- }
--
-- logout_dialog->priv->timeout_id = g_timeout_add (1000,
-- csm_logout_dialog_timeout,
-- logout_dialog);
-+{
-+ if (!csm_system_is_login_session (logout_dialog->priv->system)) {
-+ gchar *name, *secondary_text;
-+
-+ name = g_locale_to_utf8 (g_get_real_name (), -1, NULL, NULL, NULL);
-+
-+ if (!name || name[0] == '\0' || strcmp (name, "Unknown") == 0) {
-+ g_free (name);
-+ name = g_locale_to_utf8 (g_get_user_name (), -1 , NULL, NULL, NULL);
-+ }
-+
-+ if (!name) {
-+ name = g_strdup (g_get_user_name ());
-+ }
-+
-+ secondary_text = g_strdup_printf (_("You are currently logged in as \"%s\"."), name);
-+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (logout_dialog), secondary_text, NULL);
-+ g_free (secondary_text);
-+ g_free (name);
-+ }
- }
-
- static gboolean
-@@ -385,12 +282,7 @@ csm_get_dialog (CsmDialogLogoutType type,
-
- gtk_window_set_title (GTK_WINDOW (logout_dialog), _("Session"));
-
-- logout_dialog->priv->type = type;
--
-- GSettings *settings = g_settings_new (SESSION_SCHEMA);
--
-- logout_dialog->priv->delay_toggle = g_settings_get_boolean (settings, KEY_TOGGLE_DELAY);
-- logout_dialog->priv->delay = g_settings_get_int (settings, KEY_DELAY);
-+ logout_dialog->priv->type = type;
-
- icon_name = NULL;
- primary_text = NULL;
-@@ -473,17 +365,10 @@ csm_get_dialog (CsmDialogLogoutType type,
-
- dialog_image = gtk_message_dialog_get_image (GTK_MESSAGE_DIALOG (logout_dialog));
-
-- if (logout_dialog->priv->delay_toggle) {
-- hbox = gtk_box_new (FALSE, 0);
--
-- logout_dialog->priv->progressbar = gtk_progress_bar_new ();
-- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (logout_dialog->priv->progressbar), 1.0);
-- gtk_box_pack_start (GTK_BOX (hbox),
-- logout_dialog->priv->progressbar,
-- TRUE, TRUE, 12);
-- gtk_widget_show_all (hbox);
-- gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), hbox);
-- }
-+ hbox = gtk_box_new (FALSE, 0);
-+
-+ gtk_widget_show_all (hbox);
-+ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), hbox);
-
- gtk_image_set_from_icon_name (GTK_IMAGE (dialog_image),
- icon_name, GTK_ICON_SIZE_DIALOG);
-@@ -498,8 +383,6 @@ csm_get_dialog (CsmDialogLogoutType type,
-
- g_signal_connect (logout_dialog, "show", G_CALLBACK (on_show), NULL);
-
-- g_object_unref(settings);
--
- return GTK_WIDGET (logout_dialog);
- }
-
-diff --git a/data/org.cinnamon.SessionManager.gschema.xml.in b/data/org.cinnamon.SessionManager.gschema.xml.in
-index af9b34f..f9e60d8 100644
---- a/data/org.cinnamon.SessionManager.gschema.xml.in
-+++ b/data/org.cinnamon.SessionManager.gschema.xml.in
-@@ -23,16 +23,6 @@
- being accessible during the session. Note: gnome-settings-daemon, gnome-fallback-mount-helper,
- nautilus, and gnome-screensaver are hardcoded. This list can add to those.
- </description>
-- </key>
-- <key name="quit-delay-toggle" type="b">
-- <default>false</default>
-- <summary>Toggles if there should be a timer when ending the session</summary>
-- <description>Toggles whether or not there's a timer to automatically end the current session</description>
-- </key>
-- <key name="quit-time-delay" type="i">
-- <default>60</default>
-- <summary>The time delay before quitting the system automatically</summary>
-- <description>The time delay before the shutdown/logout dialogue quits the system automatically</description>
-- </key>
-+ </key>
- </schema>
- </schemalist>
---
-1.9.3
-
diff --git a/0001-fix-the-width-of-the-Program-column-in-gtk3.14.patch b/0001-fix-the-width-of-the-Program-column-in-gtk3.14.patch
deleted file mode 100644
index 1193c4f..0000000
--- a/0001-fix-the-width-of-the-Program-column-in-gtk3.14.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0f6679a53a64c853709088f8d80e0496c2460cbc Mon Sep 17 00:00:00 2001
-From: JosephMcc <mccullarjoseph at gmail.com>
-Date: Tue, 20 Jan 2015 02:00:24 -0800
-Subject: [PATCH] fix the width of the "Program" column in gtk3.14
-
----
- capplet/csm-properties-dialog.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/capplet/csm-properties-dialog.c b/capplet/csm-properties-dialog.c
-index b8f3f1b..6a8252c 100644
---- a/capplet/csm-properties-dialog.c
-+++ b/capplet/csm-properties-dialog.c
-@@ -561,6 +561,7 @@ setup_dialog (CsmPropertiesDialog *dialog)
- "ellipsize", PANGO_ELLIPSIZE_END,
- NULL);
- gtk_tree_view_append_column (treeview, column);
-+ gtk_tree_view_column_set_expand (column, TRUE);
-
- /* DELAY COLUMN */
-
---
-1.9.3
-
diff --git a/blacklist_gnome-initial-setup.patch b/blacklist_gnome-initial-setup.patch
deleted file mode 100644
index 044bb25..0000000
--- a/blacklist_gnome-initial-setup.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/cinnamon-session/csm-manager.c 2014-11-08 09:05:05.000000000 +0000
-+++ b/cinnamon-session/csm-manager.c 2014-11-21 17:35:31.979898468 +0000
-@@ -107,7 +107,10 @@ const gchar *blacklist[] = {
- "gnome-screensaver",
- "mate-screensaver",
- "mate-keyring-daemon",
-- "indicator-"
-+ "indicator-",
-+ "gnome-initial-setup-copy-worker",
-+ "gnome-initial-setup-first-login",
-+ "gnome-welcome-tour"
- };
-
- static void app_registered (CsmApp *app, CsmManager *manager);
diff --git a/cinnamon-session.spec b/cinnamon-session.spec
index 66962ec..d7a42ab 100644
--- a/cinnamon-session.spec
+++ b/cinnamon-session.spec
@@ -1,25 +1,17 @@
%global po_package cinnamon-session-3.0
-#global _internal_version 8c1b918
+%global _internal_version fc7111e
Summary: Cinnamon session manager
Name: cinnamon-session
-Version: 2.4.1
-Release: 5%{?dist}
+Version: 2.5.1
+Release: 0.1.git%{_internal_version}%{?dist}
URL: http://cinnamon.linuxmint.com
License: GPLv2+ and LGPLv2+
Group: User Interface/Desktops
# To generate tarball
# wget https://github.com/linuxmint/cinnamon-session/tarball/%%{_internal_version} -O cinnamon-session-%%{version}.git%%{_internal_version}.tar.gz
-#Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-session/source/cinnamon-session-%%{version}.git%%{_internal_version}.tar.gz
-Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-session/source/cinnamon-session-%{version}.tar.gz
-
-# revert upstream commit (somethings are rotten and should remain dead)
-# https://github.com/linuxmint/cinnamon-session/commit/c9c49bfb8dc15c655091c6a251fb2dac21141ff8
-Patch0: 0001-Revert-Re-Add-session-timeout-disable-by-default.patch
-
-Patch1: blacklist_gnome-initial-setup.patch
-Patch2: 0001-fix-the-width-of-the-Program-column-in-gtk3.14.patch
-Patch3: set_clutter_env.patch
+Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-session/source/cinnamon-session-%{version}.git%{_internal_version}.tar.gz
+#Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-session/source/cinnamon-session-%%{version}.tar.gz
Requires: system-logos
# Needed for cinnamon-settings-daemon
@@ -54,7 +46,6 @@ BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(libsystemd-login)
BuildRequires: pkgconfig(polkit-agent-1)
BuildRequires: pkgconfig(libcanberra)
-BuildRequires: desktop-file-utils
BuildRequires: gnome-common
BuildRequires: gnome-keyring-devel
BuildRequires: intltool
@@ -66,14 +57,7 @@ Cinnamon-session manages a Cinnamon desktop or GDM login session. It starts up
the other core components and handles logout and saving the session.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%if 0%{?fedora} > 21
-%patch3 -p1
-%endif
-rm missing
+%setup -q -n linuxmint-%{name}-%{_internal_version}
NOCONFIGURE=1 ./autogen.sh
%build
@@ -90,13 +74,6 @@ make %{?_smp_mflags} V=1
%install
%{make_install}
-desktop-file-install \
- --delete-original \
- --set-icon=cinnamon-session-properties \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon-session-properties.desktop
-
-
%find_lang %{po_package}
%post
@@ -118,7 +95,6 @@ fi
%files -f %{po_package}.lang
%doc AUTHORS COPYING README
%doc %{_mandir}/man*/*
-%{_datadir}/applications/cinnamon-session-properties.desktop
%{_bindir}/*
%{_libexecdir}/cinnamon-session-check-accelerated
%{_libexecdir}/cinnamon-session-check-accelerated-helper
@@ -128,6 +104,9 @@ fi
%{_datadir}/glib-2.0/schemas/org.cinnamon.SessionManager.gschema.xml
%changelog
+* Tue May 05 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.1-0.1.gitfc7111e
+- update to git snapshot
+
* Sun Feb 22 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.4.1-5
- set clutter env for f22+
diff --git a/set_clutter_env.patch b/set_clutter_env.patch
deleted file mode 100644
index b786fb2..0000000
--- a/set_clutter_env.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cinnamon-session/main.c 2014-11-08 09:05:05.000000000 +0000
-+++ b/cinnamon-session/main.c 2015-02-22 19:04:01.043335620 +0000
-@@ -348,6 +348,7 @@ main (int argc, char **argv)
- * detect if GNOME is running. We keep this for compatibility reasons.
- */
- csm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
-+ csm_util_setenv ("CLUTTER_BACKEND", "x11");
-
- client_store = csm_store_new ();
-
diff --git a/sources b/sources
index 71589ea..9c42415 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5910bdae58967632d887f57b98e70b06 cinnamon-session-2.4.1.tar.gz
+3e9d295f9eb9e8aa6a1c90e1d00f8daf cinnamon-session-2.5.1.gitfc7111e.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/cinnamon-session.git/commit/?h=f22&id=e2661158c7c2d27b33f85b7367951d0f68489186
More information about the scm-commits
mailing list