rpms/bluez-gnome/F-10 bluez-gnome-fix-icon-visibility.patch, 1.1, 1.2

Thu Feb 19 14:35:40 UTC 2009

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20825

Modified Files:
	bluez-gnome-fix-icon-visibility.patch 
Log Message:
Fix patch, blast!


bluez-gnome-fix-icon-visibility.patch:

Index: bluez-gnome-fix-icon-visibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/F-10/bluez-gnome-fix-icon-visibility.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- bluez-gnome-fix-icon-visibility.patch	19 Feb 2009 14:29:50 -0000	1.1
+++ bluez-gnome-fix-icon-visibility.patch	19 Feb 2009 14:35:39 -0000	1.2
@@ -1,13 +1,61 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www/w3.porg/TR/html4/strict.dtd">
-<!-- git web interface version 1.4.5-rc0.GIT-dirty, (C) 2005-2006, Kay Sievers <kay.sievers at vrfy.org>, Christian Gierke -->
-<!-- git core binaries version 1.6.1.1 -->
-<head>
-<meta http-equiv="content-type" content="; charset=utf-8"/>
-<meta name="generator" content="gitweb/1.4.5-rc0.GIT-dirty git/1.6.1.1"/>
-<meta name="robots" content="index, nofollow"/>
-<meta http-equiv="refresh" content="0"/>
-<title></title>
-</head>
-<body>
-Generating....</body>
-</html>
+From: Marcel Holtmann <marcel at holtmann.org>
+Date: Sun, 26 Oct 2008 20:17:16 +0000 (+0100)
+Subject: Fix allegedly broken icon visibility setting
+X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez-gnome.git;a=commitdiff_plain;h=4d56f10dc2a065d60724ccce8496d173fa0dc85a
+
+Fix allegedly broken icon visibility setting
+---
+
+diff --git a/applet/main.c b/applet/main.c
+index 71f8778..6299375 100644
+--- a/applet/main.c
++++ b/applet/main.c
+@@ -288,6 +288,20 @@ static void adapter_removed(GtkTreeModel *model, GtkTreePath *path,
+ 	}
+ }
+ 
++static void update_icon_visibility()
++{
++	if (icon_policy == ICON_POLICY_NEVER)
++		hide_icon();
++	else if (icon_policy == ICON_POLICY_ALWAYS)
++		show_icon();
++	else if (icon_policy == ICON_POLICY_PRESENT) {
++		if (adapter_present == TRUE)
++			show_icon();
++		else
++			hide_icon();
++	}
++}
++
+ static GConfEnumStringPair icon_policy_enum_map [] = {
+ 	{ ICON_POLICY_NEVER,	"never"		},
+ 	{ ICON_POLICY_ALWAYS,	"always"	},
+@@ -313,16 +327,7 @@ static void gconf_callback(GConfClient *client, guint cnxn_id,
+ 
+ 		gconf_string_to_enum(icon_policy_enum_map, str, &icon_policy);
+ 
+-		if (icon_policy == ICON_POLICY_NEVER)
+-			hide_icon();
+-		else if (icon_policy == ICON_POLICY_ALWAYS)
+-			show_icon();
+-		else if (icon_policy == ICON_POLICY_PRESENT) {
+-			if (adapter_present == TRUE)
+-				show_icon();
+-			else
+-				hide_icon();
+-		}
++		update_icon_visibility();
+ 		return;
+ 	}
+ 
+@@ -410,8 +415,7 @@ int main(int argc, char *argv[])
+ 
+ 	statusicon = init_notification();
+ 
+-	if (icon_policy != ICON_POLICY_ALWAYS && adapter_present == FALSE)
+-		hide_icon();
++	update_icon_visibility();
+ 
+ 	g_signal_connect(statusicon, "activate",
+ 				G_CALLBACK(activate_callback), NULL);


