[gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-control-center/files/3.2.0/, gnome-base/gnome-control-center/

[Alexandre Restovtsev]

commit:     9dee3926cbc4bdfd13d3a5ca1d8568df478f9cb8
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Sep 30 23:49:26 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Sep 30 23:49:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9dee3926

gnome-base/gnome-control-center: add patches and nm-applet dep (#385049)

Add missing nm-applet-0.9.1.90 dependency; gnome-control-center needs
the libnm-gkt library it installs for the network panel. Fixes bug #385049,
thanks to poncho <poncho <AT> spahan.ch> for the report.

Also, add several useful patches from upstream fixing visible issues in
shell, power, and printer panels.

---
 ...tk_widget_show-instead-of-_show_all-in-gn.patch |   28 +++
 ...the-label-for-the-category-sections-which.patch |   26 +++
 ...0003-info-Use-new-GtkAppChooserButton-API.patch |   51 +++++
 ...he-correct-item-in-the-combo-boxes-when-s.patch |   39 ++++
 ...e-sure-we-gtk_widget_show-the-search-view.patch |   25 +++
 ...-Printers-check-state-of-CUPS-after-start.patch |  203 ++++++++++++++++++++
 ...ebuild => gnome-control-center-3.2.0-r1.ebuild} |   12 +-
 .../gnome-control-center-9999.ebuild               |    4 +-
 8 files changed, 385 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-control-center/files/3.2.0/0001-shell-Use-gtk_widget_show-instead-of-_show_all-in-gn.patch b/gnome-base/gnome-control-center/files/3.2.0/0001-shell-Use-gtk_widget_show-instead-of-_show_all-in-gn.patch
new file mode 100644
index 0000000..0ef551c
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.2.0/0001-shell-Use-gtk_widget_show-instead-of-_show_all-in-gn.patch
@@ -0,0 +1,28 @@
+From 70a0d19c712c8ebe26f74e56bce3741d481a4b16 Mon Sep 17 00:00:00 2001
+From: Rodrigo Moya <rodrigo@××××××××.org>
+Date: Tue, 20 Sep 2011 13:29:56 +0200
+Subject: [PATCH 01/14] shell: Use gtk_widget_show instead of _show_all in
+ gnome_control_center_show
+
+Using gtk_widget_show_all will make all invisible widgets show up when a
+second instance of the shell is run from the command line.
+
+https://bugs.launchpad.net/gnome-control-center/+bug/854544
+---
+ shell/gnome-control-center.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
+index c47d5bf..af8387c 100644
+--- a/shell/gnome-control-center.c
++++ b/shell/gnome-control-center.c
+@@ -1125,5 +1125,5 @@ gnome_control_center_show (GnomeControlCenter *center,
+ 			   GtkApplication     *app)
+ {
+   gtk_window_set_application (GTK_WINDOW (center->priv->window), app);
+-  gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (center->priv->window)));
++  gtk_widget_show (gtk_bin_get_child (GTK_BIN (center->priv->window)));
+ }
+-- 
+1.7.6.1
+

diff --git a/gnome-base/gnome-control-center/files/3.2.0/0002-shell-Show-the-label-for-the-category-sections-which.patch b/gnome-base/gnome-control-center/files/3.2.0/0002-shell-Show-the-label-for-the-category-sections-which.patch
new file mode 100644
index 0000000..d4467af
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.2.0/0002-shell-Show-the-label-for-the-category-sections-which.patch
@@ -0,0 +1,26 @@
+From a3f157c97ba64d1e96dab705656ca5eadb251538 Mon Sep 17 00:00:00 2001
+From: Rodrigo Moya <rodrigo@××××××××.org>
+Date: Tue, 20 Sep 2011 15:44:20 +0200
+Subject: [PATCH 02/14] shell: Show the label for the category sections, which
+ was being shown because of the gtk_widget_show_all
+ replaced in previous commit
+
+---
+ shell/cc-shell-category-view.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/shell/cc-shell-category-view.c b/shell/cc-shell-category-view.c
+index b2a5ee4..e52f558 100644
+--- a/shell/cc-shell-category-view.c
++++ b/shell/cc-shell-category-view.c
+@@ -164,6 +164,7 @@ cc_shell_category_view_constructed (GObject *object)
+       gtk_label_set_attributes (GTK_LABEL (label), attrs);
+       pango_attr_list_unref (attrs);
+       gtk_frame_set_label_widget (GTK_FRAME (object), label);
++      gtk_widget_show (label);
+ 
+       g_signal_connect (label, "style-set", G_CALLBACK (label_style_set_cb),
+                         NULL);
+-- 
+1.7.6.1
+

diff --git a/gnome-base/gnome-control-center/files/3.2.0/0003-info-Use-new-GtkAppChooserButton-API.patch b/gnome-base/gnome-control-center/files/3.2.0/0003-info-Use-new-GtkAppChooserButton-API.patch
new file mode 100644
index 0000000..9f6e3bd
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.2.0/0003-info-Use-new-GtkAppChooserButton-API.patch
@@ -0,0 +1,51 @@
+From d3b765a658e186fca1c4e73db2e12b4dfbdaefa5 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@××××××.net>
+Date: Mon, 12 Sep 2011 23:01:57 +0100
+Subject: [PATCH 03/14] info: Use new GtkAppChooserButton API
+
+gtk_app_chooser_button_set_show_default_item() was
+added so that we could show the default application
+for the content-type at the top, and selected, without
+hacks.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=658693
+---
+ panels/info/cc-info-panel.c |   17 +----------------
+ 1 files changed, 1 insertions(+), 16 deletions(-)
+
+diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
+index 035a5d8..473b50f 100644
+--- a/panels/info/cc-info-panel.c
++++ b/panels/info/cc-info-panel.c
+@@ -907,27 +907,12 @@ info_panel_setup_default_app (CcInfoPanel *self,
+ {
+   GtkWidget *button;
+   GtkWidget *table;
+-  GAppInfo  *info;
+-  GError    *error = NULL;
+   GtkWidget *label;
+ 
+   table = WID ("default_apps_table");
+ 
+-  /* FIXME: We need to do this because GtkAppChooser doesn't
+-   * give us the opportunity to select what app should be selected
+-   * by default.
+-   * https://bugzilla.gnome.org/show_bug.cgi?id=642706 */
+-  info = g_app_info_get_default_for_type (content_type, FALSE);
+-  if (info != NULL && g_app_info_set_as_last_used_for_type (info, content_type, &error) == FALSE)
+-    {
+-      g_warning ("Failed to set '%s' as the default application for '%s': %s",
+-                 g_app_info_get_name (info), content_type, error->message);
+-      g_error_free (error);
+-    }
+-  if (info != NULL)
+-    g_object_unref (info);
+-
+   button = gtk_app_chooser_button_new (content_type);
++  gtk_app_chooser_button_set_show_default_item (GTK_APP_CHOOSER_BUTTON (button), TRUE);
+   gtk_table_attach (GTK_TABLE (table), button,
+                     left_attach, right_attach,
+                     top_attach, bottom_attach, GTK_FILL, 0, 0, 0);
+-- 
+1.7.6.1
+

diff --git a/gnome-base/gnome-control-center/files/3.2.0/0004-power-Use-the-correct-item-in-the-combo-boxes-when-s.patch b/gnome-base/gnome-control-center/files/3.2.0/0004-power-Use-the-correct-item-in-the-combo-boxes-when-s.patch
new file mode 100644
index 0000000..52b38da
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.2.0/0004-power-Use-the-correct-item-in-the-combo-boxes-when-s.patch
@@ -0,0 +1,39 @@
+From 7929a519af5119e6c78b93107cb5de9405f7d01f Mon Sep 17 00:00:00 2001
+From: Rodrigo Moya <rodrigo@××××××××.org>
+Date: Tue, 27 Sep 2011 16:08:37 +0200
+Subject: [PATCH 06/14] power: Use the correct item in the combo boxes when
+ sleep-when-inactive is disabled
+
+---
+ panels/power/cc-power-panel.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
+index c069187..92b2e85 100644
+--- a/panels/power/cc-power-panel.c
++++ b/panels/power/cc-power-panel.c
+@@ -602,6 +602,10 @@ cc_power_panel_init (CcPowerPanel *self)
+ 
+   /* auto-sleep time */
+   value = g_settings_get_int (self->priv->gsd_settings, "sleep-inactive-ac-timeout");
++  if (!g_settings_get_boolean (self->priv->gsd_settings, "sleep-inactive-ac"))
++    {
++      value = 0;
++    }
+   widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+                                                "combobox_sleep_ac"));
+   set_value_for_combo (GTK_COMBO_BOX (widget), value);
+@@ -610,6 +614,10 @@ cc_power_panel_init (CcPowerPanel *self)
+                     G_CALLBACK (combo_time_changed_cb),
+                     self);
+   value = g_settings_get_int (self->priv->gsd_settings, "sleep-inactive-battery-timeout");
++  if (!g_settings_get_boolean (self->priv->gsd_settings, "sleep-inactive-battery"))
++    {
++      value = 0;
++    }
+   widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+                                                "combobox_sleep_battery"));
+   set_value_for_combo (GTK_COMBO_BOX (widget), value);
+-- 
+1.7.6.1
+

diff --git a/gnome-base/gnome-control-center/files/3.2.0/0005-shell-Make-sure-we-gtk_widget_show-the-search-view.patch b/gnome-base/gnome-control-center/files/3.2.0/0005-shell-Make-sure-we-gtk_widget_show-the-search-view.patch
new file mode 100644
index 0000000..e4dffb8
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.2.0/0005-shell-Make-sure-we-gtk_widget_show-the-search-view.patch
@@ -0,0 +1,25 @@
+From e25d52d05c2bcd519b55bb3569fa6d58ee820a52 Mon Sep 17 00:00:00 2001
+From: Rodrigo Moya <rodrigo@××××××××.org>
+Date: Wed, 28 Sep 2011 13:33:06 +0200
+Subject: [PATCH 09/14] shell: Make sure we gtk_widget_show the search view
+
+---
+ shell/gnome-control-center.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
+index af8387c..618d31a 100644
+--- a/shell/gnome-control-center.c
++++ b/shell/gnome-control-center.c
+@@ -612,6 +612,8 @@ setup_search (GnomeControlCenter *shell)
+ 
+   g_signal_connect (widget, "icon-release", G_CALLBACK (search_entry_clear_cb),
+                     priv);
++
++  gtk_widget_show (priv->search_view);
+ }
+ 
+ static void
+-- 
+1.7.6.1
+

diff --git a/gnome-base/gnome-control-center/files/3.2.0/0006-Printers-check-state-of-CUPS-after-start.patch b/gnome-base/gnome-control-center/files/3.2.0/0006-Printers-check-state-of-CUPS-after-start.patch
new file mode 100644
index 0000000..9bb12b2
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.2.0/0006-Printers-check-state-of-CUPS-after-start.patch
@@ -0,0 +1,203 @@
+From 8d16ac14a7993e06f41e93b753a7fd7003cb81bc Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik@××××××.com>
+Date: Thu, 29 Sep 2011 14:54:30 +0200
+Subject: [PATCH 10/14] Printers: check state of CUPS after start
+
+Check whether CUPS is running and add regular check for the case
+when it doesn't. Actualize printers list after CUPS' start (#659721).
+---
+ panels/printers/cc-printers-panel.c |  113 ++++++++++++++++++++++++-----------
+ 1 files changed, 79 insertions(+), 34 deletions(-)
+
+diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
+index d220f38..ad7c554 100644
+--- a/panels/printers/cc-printers-panel.c
++++ b/panels/printers/cc-printers-panel.c
+@@ -57,6 +57,8 @@ G_DEFINE_DYNAMIC_TYPE (CcPrintersPanel, cc_printers_panel, CC_TYPE_PANEL)
+ #define CUPS_DBUS_PATH      "/org/cups/cupsd/Notifier"
+ #define CUPS_DBUS_INTERFACE "org.cups.cupsd.Notifier"
+ 
++#define CUPS_STATUS_CHECK_INTERVAL 5
++
+ struct _CcPrintersPanelPrivate
+ {
+   GtkBuilder *builder;
+@@ -87,6 +89,7 @@ struct _CcPrintersPanelPrivate
+   GDBusConnection *cups_bus_connection;
+   gint             subscription_id;
+   guint            subscription_renewal_id;
++  guint            cups_status_check_id;
+ 
+   gpointer dummy;
+ };
+@@ -170,6 +173,9 @@ cc_printers_panel_dispose (GObject *object)
+ 
+   detach_from_cups_notifier (CC_PRINTERS_PANEL (object));
+ 
++  if (priv->cups_status_check_id > 0)
++    g_source_remove (priv->cups_status_check_id);
++
+   G_OBJECT_CLASS (cc_printers_panel_parent_class)->dispose (object);
+ }
+ 
+@@ -339,7 +345,10 @@ renew_subscription (gpointer data)
+                                                    G_N_ELEMENTS (events),
+                                                    SUBSCRIPTION_DURATION);
+ 
+-  return TRUE;
++  if (priv->subscription_id > 0)
++    return TRUE;
++  else
++    return FALSE;
+ }
+ 
+ static void
+@@ -351,38 +360,40 @@ attach_to_cups_notifier (gpointer data)
+ 
+   priv = PRINTERS_PANEL_PRIVATE (self);
+ 
+-  renew_subscription (self);
+-  priv->subscription_renewal_id =
+-    g_timeout_add_seconds (RENEW_INTERVAL, renew_subscription, self);
+-
+-  error = NULL;
+-  priv->cups_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+-                                                    0,
+-                                                    NULL,
+-                                                    CUPS_DBUS_NAME,
+-                                                    CUPS_DBUS_PATH,
+-                                                    CUPS_DBUS_INTERFACE,
+-                                                    NULL,
+-                                                    &error);
+-
+-  if (error)
++  if (renew_subscription (self))
+     {
+-      g_warning ("%s", error->message);
+-      return;
+-    }
++      priv->subscription_renewal_id =
++        g_timeout_add_seconds (RENEW_INTERVAL, renew_subscription, self);
++
++      error = NULL;
++      priv->cups_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
++                                                        0,
++                                                        NULL,
++                                                        CUPS_DBUS_NAME,
++                                                        CUPS_DBUS_PATH,
++                                                        CUPS_DBUS_INTERFACE,
++                                                        NULL,
++                                                        &error);
++
++      if (error)
++        {
++          g_warning ("%s", error->message);
++          return;
++        }
+ 
+-  priv->cups_bus_connection = g_dbus_proxy_get_connection (priv->cups_proxy);
+-
+-  g_dbus_connection_signal_subscribe (priv->cups_bus_connection,
+-                                      NULL,
+-                                      CUPS_DBUS_INTERFACE,
+-                                      NULL,
+-                                      CUPS_DBUS_PATH,
+-                                      NULL,
+-                                      0,
+-                                      on_cups_notification,
+-                                      self,
+-                                      NULL);
++      priv->cups_bus_connection = g_dbus_proxy_get_connection (priv->cups_proxy);
++
++      g_dbus_connection_signal_subscribe (priv->cups_bus_connection,
++                                          NULL,
++                                          CUPS_DBUS_INTERFACE,
++                                          NULL,
++                                          CUPS_DBUS_PATH,
++                                          NULL,
++                                          0,
++                                          on_cups_notification,
++                                          self,
++                                          NULL);
++    }
+ }
+ 
+ static void
+@@ -394,7 +405,7 @@ detach_from_cups_notifier (gpointer data)
+   priv = PRINTERS_PANEL_PRIVATE (self);
+ 
+   cancel_cups_subscription (priv->subscription_id);
+-  priv->subscription_id = -1;
++  priv->subscription_id = 0;
+ 
+   if (priv->subscription_renewal_id != 0) {
+     g_source_remove (priv->subscription_renewal_id);
+@@ -2393,14 +2404,37 @@ switch_to_options_cb (GtkButton *button,
+   gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), NOTEBOOK_OPTIONS_PAGE);
+ }
+ 
++static gboolean
++cups_status_check (gpointer user_data)
++{
++  CcPrintersPanelPrivate  *priv;
++  CcPrintersPanel         *self = (CcPrintersPanel*) user_data;
++  gboolean                 result = TRUE;
++  http_t                  *http;
++
++  priv = self->priv = PRINTERS_PANEL_PRIVATE (self);
++
++  http = httpConnectEncrypt (cupsServer (), ippPort (), cupsEncryption ());
++  if (http)
++    {
++      httpClose (http);
++      actualize_printers_list (self);
++      attach_to_cups_notifier (self);
++      priv->cups_status_check_id = 0;
++      result = FALSE;
++    }
++
++  return result;
++}
++
+ static void
+ cc_printers_panel_init (CcPrintersPanel *self)
+ {
+   CcPrintersPanelPrivate *priv;
+   GtkWidget              *top_widget;
+   GtkWidget              *widget;
+-  GtkWidget              *box;
+   GError                 *error = NULL;
++  http_t                 *http;
+   gchar                  *objects[] = { "main-vbox", NULL };
+   GtkStyleContext        *context;
+ 
+@@ -2424,7 +2458,9 @@ cc_printers_panel_init (CcPrintersPanel *self)
+ 
+   priv->pp_new_printer_dialog = NULL;
+ 
+-  priv->subscription_id = -1;
++  priv->subscription_id = 0;
++  priv->cups_status_check_id = 0;
++  priv->subscription_renewal_id = 0;
+   priv->cups_proxy = NULL;
+   priv->cups_bus_connection = NULL;
+ 
+@@ -2593,6 +2629,15 @@ Please check your installation");
+   populate_allowed_users_list (self);
+   attach_to_cups_notifier (self);
+ 
++  http = httpConnectEncrypt (cupsServer (), ippPort (), cupsEncryption ());
++  if (!http)
++    {
++      priv->cups_status_check_id =
++        g_timeout_add_seconds (CUPS_STATUS_CHECK_INTERVAL, cups_status_check, self);
++    }
++  else
++    httpClose (http);
++
+   gtk_container_add (GTK_CONTAINER (self), top_widget);
+   gtk_widget_show_all (GTK_WIDGET (self));
+ }
+-- 
+1.7.6.1
+

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.2.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.0-r1.ebuild
similarity index 92%
rename from gnome-base/gnome-control-center/gnome-control-center-3.2.0.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.2.0-r1.ebuild
index 26505cf..2678a7d 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.2.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 
-inherit gnome2
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -64,7 +64,9 @@ COMMON_DEPEND="
 		media-libs/gstreamer:0.10
 		>=media-video/cheese-2.91.91.1 )
 	cups? ( >=net-print/cups-1.4[dbus] )
-	networkmanager? ( >=net-misc/networkmanager-0.8.997 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-0.9.1.90
+		>=net-misc/networkmanager-0.8.997 )
 	socialweb? ( net-libs/libsocialweb )"
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
@@ -102,3 +104,9 @@ pkg_setup() {
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+	# Useful upstream patches, will be in next release
+	epatch "${FILESDIR}/${PV}/"*.patch
+}

diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
index 26505cf..f64557f 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -64,7 +64,9 @@ COMMON_DEPEND="
 		media-libs/gstreamer:0.10
 		>=media-video/cheese-2.91.91.1 )
 	cups? ( >=net-print/cups-1.4[dbus] )
-	networkmanager? ( >=net-misc/networkmanager-0.8.997 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-0.9.1.90
+		>=net-misc/networkmanager-0.8.997 )
 	socialweb? ( net-libs/libsocialweb )"
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}