[gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-color-manager/files: gnome-color-manager-3.0.0-packagename.patch gnome-color-manager-3.0.0-cc-panel.patch

[gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-color-manager/files: gnome-color-manager-3.0.0-packagename.patch gnome-color-manager-3.0.0-cc-panel.patch

[Nirbheek Chauhan (nirbheek)]

nirbheek    11/08/19 11:09:05

  Added:                gnome-color-manager-3.0.0-packagename.patch
                        gnome-color-manager-3.0.0-cc-panel.patch
  Log:
  Bump to 3.0.0, from gnome overlay for GNOME 3
  
  (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-packagename.patch?rev=1.1&content-type=text/plain

Index: gnome-color-manager-3.0.0-packagename.patch
===================================================================
diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
index 34ce173..f4307cc 100644
--- a/src/cc-color-panel.c
+++ b/src/cc-color-panel.c
@@ -2150,7 +2150,7 @@ cc_color_panel_is_color_profiles_extra_installed (CcColorPanel *panel)
 	GError *error = NULL;
 
 #ifndef HAVE_PACKAGEKIT
-	g_warning ("cannot query %s: this package was not compiled with --enable-packagekit", package_name);
+	g_warning ("cannot query %s: this package was not compiled with --enable-packagekit", GCM_PREFS_PACKAGE_NAME_COLOR_PROFILES_EXTRA);
 	return;
 #endif
 



1.1                  gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.0.0-cc-panel.patch?rev=1.1&content-type=text/plain

Index: gnome-color-manager-3.0.0-cc-panel.patch
===================================================================
From 66e2933c29964e72fa96f95d518763f2b4e95f79 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 13 May 2011 18:32:16 +0000
Subject: Ensure we cancel the initial panel startup if the panel was created and destroyed without ever getting control of the mainloop

This can happen if you plug in a color sensor, with the color control center
panel already open.
In this case, the g-s-d plugin creates a new instance which seemingly gets
loaded and unloaded and control is returned to to original instance.

A workaround is either to not have the control panel panel open when pushing in
the device, or to restart the control center after plugging in the hardware.
---
diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
index 34ce173..898004e 100644
--- a/src/cc-color-panel.c
+++ b/src/cc-color-panel.c
@@ -61,6 +61,7 @@ struct _CcColorPanelPrivate {
 	GSettings		*settings;
 	guint			 save_and_apply_id;
 	guint			 apply_all_devices_id;
+	guint			 session_startup_id;
 	GCancellable		*cancellable;
 };
 
@@ -2270,6 +2271,7 @@ cc_color_panel_startup_idle_cb (CcColorPanel *panel)
 	g_debug ("getting installed");
 	cc_color_panel_is_color_profiles_extra_installed (panel);
 out:
+	panel->priv->session_startup_id = 0;
 	g_free (colorspace_rgb);
 	g_free (colorspace_cmyk);
 	return FALSE;
@@ -2452,6 +2454,8 @@ cc_color_panel_finalize (GObject *object)
 		g_source_remove (panel->priv->save_and_apply_id);
 	if (panel->priv->apply_all_devices_id != 0)
 		g_source_remove (panel->priv->apply_all_devices_id);
+	if (panel->priv->session_startup_id > 0)
+		g_source_remove (panel->priv->session_startup_id);
 
 	G_OBJECT_CLASS (cc_color_panel_parent_class)->finalize (object);
 }
@@ -2644,7 +2648,8 @@ cc_color_panel_init (CcColorPanel *panel)
 if(0)	cc_color_panel_setup_drag_and_drop (GTK_WIDGET (panel->priv->main_window));
 
 	/* do all this after the window has been set up */
-	g_idle_add ((GSourceFunc) cc_color_panel_startup_idle_cb, panel);
+	panel->priv->session_startup_id =
+		g_idle_add ((GSourceFunc) cc_color_panel_startup_idle_cb, panel);
 out:
 	return;
 }
--
cgit v0.9

[gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-color-manager/files: gnome-color-manager-3.0.0-packagename.patch gnome-color-manager-3.0.0-cc-panel.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    11/11/25 06:38:57

  Removed:              gnome-color-manager-3.0.0-packagename.patch
                        gnome-color-manager-3.0.0-cc-panel.patch
  Log:
  Drop old.
  
  (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)