[arch-commits] Commit in cinnamon-control-center/trunk (3 files)
Balló György
bgyorgy at nymeria.archlinux.org
Wed Aug 14 21:07:16 UTC 2013
Date: Wednesday, August 14, 2013 @ 23:07:16
Author: bgyorgy
Revision: 95588
upgpkg: cinnamon-control-center 1.8.2-2
* Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8
* Improve idle-delay.patch
Added:
cinnamon-control-center/trunk/remove_obex.patch
Modified:
cinnamon-control-center/trunk/PKGBUILD
cinnamon-control-center/trunk/idle-delay.patch
-------------------+
PKGBUILD | 11 +++--
idle-delay.patch | 107 +++++++++++++++++++++++++++++++++++++++++++++-------
remove_obex.patch | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 207 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-08-14 20:19:05 UTC (rev 95587)
+++ PKGBUILD 2013-08-14 21:07:16 UTC (rev 95588)
@@ -6,7 +6,7 @@
pkgname=cinnamon-control-center
pkgver=1.8.2
-pkgrel=1
+pkgrel=2
pkgdesc="The Control Center for Cinnamon"
arch=('i686' 'x86_64')
depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet')
@@ -18,10 +18,12 @@
options=('!libtool' '!emptydirs')
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
"gnomerrlabeler.patch"
- "idle-delay.patch")
+ "idle-delay.patch"
+ "remove_obex.patch")
sha256sums=('78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f'
'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db'
- '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67')
+ '98227484162071744b5a336a5b3915c211f5eb1559034b3d40e4a9d790fe0e31'
+ '3df65b1f5e691d4a4634c05698da6df79cb23a0ebf71b201f23c48742b75b6e4')
build() {
cd $pkgname-$pkgver
@@ -32,6 +34,9 @@
# Runtime fix for GNOME 3.8
patch -Np1 -i "$srcdir/idle-delay.patch"
+ # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8
+ patch -Np1 -i "$srcdir/remove_obex.patch"
+
autoreconf -fi
./configure --prefix=/usr --sysconfdir=/etc \
Modified: idle-delay.patch
===================================================================
--- idle-delay.patch 2013-08-14 20:19:05 UTC (rev 95587)
+++ idle-delay.patch 2013-08-14 21:07:16 UTC (rev 95588)
@@ -1,10 +1,21 @@
-diff -Naur cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c
---- cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c 2013-04-15 16:04:38.000000000 +0200
-+++ cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c 2013-04-22 05:04:26.466092668 +0200
-@@ -1068,26 +1068,6 @@
+diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c
+--- cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c 2013-08-14 22:10:57.491152667 +0200
++++ cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c 2013-08-14 21:58:36.533247961 +0200
+@@ -978,9 +978,6 @@
+ has_lid = up_client_get_lid_is_present (self->priv->up_client);
+
+ out:
+- gtk_widget_set_visible (WID (priv->builder, "combobox_lid_ac"), has_lid);
+- gtk_widget_set_visible (WID (priv->builder, "label_lid_action"), has_lid);
+- gtk_widget_set_visible (WID (priv->builder, "combobox_lid_battery"), has_batteries && has_lid);
+ gtk_widget_set_visible (WID (priv->builder, "label_header_battery"), has_batteries);
+ gtk_widget_set_visible (WID (priv->builder, "label_header_ac"), has_batteries);
+ gtk_widget_set_visible (WID (priv->builder, "combobox_sleep_battery"), has_batteries);
+@@ -1067,26 +1064,6 @@
+ g_signal_connect (widget, "changed",
G_CALLBACK (combo_enum_changed_cb),
self);
-
+-
- value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action");
- widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
- "combobox_lid_ac"));
@@ -24,14 +35,82 @@
- g_signal_connect (widget, "changed",
- G_CALLBACK (combo_enum_changed_cb),
- self);
--
+
widget = WID (self->priv->builder, "vbox_power");
gtk_widget_reparent (widget, (GtkWidget *) self);
-
-diff -Naur cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c
---- cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c 2013-04-15 16:04:38.000000000 +0200
-+++ cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c 2013-04-22 14:15:28.440488342 +0200
-@@ -351,10 +351,6 @@
+diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/power.ui cinnamon-control-center-1.8.2/panels/power/power.ui
+--- cinnamon-control-center-1.8.2.orig/panels/power/power.ui 2013-05-22 18:25:19.000000000 +0200
++++ cinnamon-control-center-1.8.2/panels/power/power.ui 2013-08-14 21:57:54.872240364 +0200
+@@ -222,50 +222,6 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkLabel" id="label_lid_action">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="halign">end</property>
+- <property name="label" translatable="yes">When the lid is closed</property>
+- </object>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="top_attach">3</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkComboBox" id="combobox_lid_battery">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="model">liststore_lid</property>
+- <property name="hexpand">True</property>
+- <accessibility>
+- <relation type="labelled-by" target="label_header_battery"/>
+- <relation type="labelled-by" target="label_lid_action"/>
+- </accessibility>
+- </object>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="top_attach">3</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkComboBox" id="combobox_lid_ac">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="model">liststore_lid</property>
+- <property name="hexpand">True</property>
+- <accessibility>
+- <relation type="labelled-by" target="label_header_ac"/>
+- <relation type="labelled-by" target="label_lid_action"/>
+- </accessibility>
+- </object>
+- <packing>
+- <property name="left_attach">2</property>
+- <property name="top_attach">3</property>
+- </packing>
+- </child>
+- <child>
+ <object class="GtkSeparator" id="separator_indicator">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+@@ -468,12 +424,10 @@
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup_combos">
+ <widgets>
+- <widget name="combobox_lid_battery"/>
+- <widget name="combobox_lid_ac"/>
+ <widget name="combobox_critical"/>
+ <widget name="combobox_sleep_battery"/>
+ <widget name="combobox_sleep_ac"/>
+ <widget name="combobox_sleep_ac"/>
+ </widgets>
+ </object>
+-</interface>
+\ No newline at end of file
++</interface>
+diff -Naur cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c
+--- cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c 2013-08-14 22:10:57.541153876 +0200
++++ cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c 2013-08-14 21:55:41.905692072 +0200
+@@ -352,10 +352,6 @@
1, &value,
-1);
@@ -42,7 +121,7 @@
set_idle_delay_from_dpms (self, value);
}
-@@ -384,7 +380,7 @@
+@@ -385,7 +381,7 @@
{
GtkTreeIter iter;
GtkTreeModel *model;
@@ -51,7 +130,7 @@
gint value_tmp, value_prev;
gboolean ret;
guint i;
-@@ -399,7 +395,7 @@
+@@ -400,7 +396,7 @@
i = 0;
/* try to make the UI match the AC setting */
@@ -60,7 +139,7 @@
do
{
gtk_tree_model_get (model, &iter,
-@@ -510,7 +506,7 @@
+@@ -511,7 +507,7 @@
/* bind the auto dim checkbox */
widget = WID ("screen_auto_reduce_checkbutton");
g_settings_bind (self->priv->gsd_settings,
Added: remove_obex.patch
===================================================================
--- remove_obex.patch (rev 0)
+++ remove_obex.patch 2013-08-14 21:07:16 UTC (rev 95588)
@@ -0,0 +1,106 @@
+--- a/panels/bluetooth/bluetooth.ui
++++ b/panels/bluetooth/bluetooth.ui
+@@ -543,34 +543,6 @@
+ <property name="position">3</property>
+ </packing>
+ </child>
+- <child>
+- <object class="GtkBox" id="browse_box">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <child>
+- <placeholder/>
+- </child>
+- <child>
+- <object class="GtkButton" id="browse_button">
+- <property name="label" translatable="yes">Browse Files...</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_action_appearance">False</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">4</property>
+- </packing>
+- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+--- a/panels/bluetooth/cc-bluetooth-panel.c
++++ b/panels/bluetooth/cc-bluetooth-panel.c
+@@ -311,7 +311,6 @@ cc_bluetooth_panel_update_properties (Cc
+ gtk_widget_hide (WID ("keyboard_box"));
+ gtk_widget_hide (WID ("sound_box"));
+ gtk_widget_hide (WID ("mouse_box"));
+- gtk_widget_hide (WID ("browse_box"));
+ gtk_widget_hide (WID ("send_box"));
+
+ bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
+@@ -367,10 +366,10 @@ cc_bluetooth_panel_update_properties (Cc
+
+ uuids = (const char **) g_value_get_boxed (&value);
+ for (i = 0; uuids && uuids[i] != NULL; i++) {
+- if (g_str_equal (uuids[i], "OBEXObjectPush"))
++ if (g_str_equal (uuids[i], "OBEXObjectPush")) {
+ gtk_widget_show (WID ("send_box"));
+- else if (g_str_equal (uuids[i], "OBEXFileTransfer"))
+- gtk_widget_show (WID ("browse_box"));
++ break;
++ }
+ }
+ g_value_unset (&value);
+ }
+@@ -538,34 +537,6 @@ send_callback (GtkButton *button,
+ g_free (alias);
+ }
+
+-static void
+-mount_finish_cb (GObject *source_object,
+- GAsyncResult *res,
+- gpointer user_data)
+-{
+- GError *error = NULL;
+-
+- if (bluetooth_browse_address_finish (source_object, res, &error) == FALSE) {
+- g_printerr ("Failed to mount OBEX volume: %s", error->message);
+- g_error_free (error);
+- return;
+- }
+-}
+-
+-static void
+-browse_callback (GtkButton *button,
+- CcBluetoothPanel *self)
+-{
+- char *bdaddr;
+-
+- bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
+-
+- bluetooth_browse_address (G_OBJECT (self), bdaddr,
+- GDK_CURRENT_TIME, mount_finish_cb, NULL);
+-
+- g_free (bdaddr);
+-}
+-
+ /* Visibility/Discoverable */
+ static void discoverable_changed (BluetoothClient *client,
+ GParamSpec *spec,
+@@ -894,8 +865,6 @@ cc_bluetooth_panel_init (CcBluetoothPane
+ G_CALLBACK (keyboard_callback), self);
+ g_signal_connect (G_OBJECT (WID ("sound_link")), "activate-link",
+ G_CALLBACK (sound_callback), self);
+- g_signal_connect (G_OBJECT (WID ("browse_button")), "clicked",
+- G_CALLBACK (browse_callback), self);
+ g_signal_connect (G_OBJECT (WID ("send_button")), "clicked",
+ G_CALLBACK (send_callback), self);
+ g_signal_connect (G_OBJECT (WID ("switch_connection")), "notify::active",
+
More information about the arch-commits
mailing list