Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=d3a45ea2b835a27b9a6feb8f31edeeb8d3154736
commit d3a45ea2b835a27b9a6feb8f31edeeb8d3154736 Author: bouleetbil <bouleet...@frogdev.info> Date: Thu Jan 13 22:55:00 2011 +0100 frugalware-tweak-0.2.4-2-i686 *backport systray fix diff --git a/source/xapps-extra/frugalware-tweak/FrugalBuild b/source/xapps-extra/frugalware-tweak/FrugalBuild index 2fb712d..a8b5c29 100644 --- a/source/xapps-extra/frugalware-tweak/FrugalBuild +++ b/source/xapps-extra/frugalware-tweak/FrugalBuild @@ -8,10 +8,11 @@ USE_FW2DEBUG=${USE_FW2DEBUG:-"n"} pkgname=frugalware-tweak _F_archive_name=frugal-tweak pkgver=0.2.4 -pkgrel=1 +pkgrel=2 url="http://ftp.frugalware.org/pub/other/people/bouleetbil/frugal-tweak/" up2date="Flasttar $url/releases/" -source=($url/releases/$_F_archive_name-$pkgver.tar.bz2) +source=($url/releases/$_F_archive_name-$pkgver.tar.bz2 \ + systray.diff) pkgdesc="Frugalware configuration utility" depends=('mono>=2.8' 'gtk2-sharp' 'notify-sharp' 'webkit-sharp>=0.3' 'vte-python' 'smartirc' 'libindicate-mono') makedepends=('vala') @@ -22,7 +23,8 @@ archs=('i686' 'x86_64' 'ppc') Finclude mono gnome-scriptlet _F_gnome_glib="y" _F_gnome_desktop="y" -sha1sums=('710439a6894b3ac989bc3e3f6bb8e12fd1261d45') +sha1sums=('710439a6894b3ac989bc3e3f6bb8e12fd1261d45' \ + 'ea12bd499d087ebe647a4b87867be304ab5b59af') unset install replaces=('frugal-mono-tools') @@ -63,7 +65,7 @@ build() { Funpack_scm fi Fcd $_F_archive_name - + Fpatchall #pygtk modules #TODO fw-interfaces cd frugal-tweak-python/fw-interfaces/ || Fdie @@ -107,7 +109,8 @@ build() { #basic indicate support Fmkdir usr/share/indicators/messages/applications/ Fcp $_F_archive_name/frugal-mono-tools/indicator/frugalware-tweak usr/share/indicators/messages/applications/ - Fbuild + Fmake + Fmakeinstall #For start it with Xsession Fcp $_F_archive_name/frugal-mono-tools/Data/frugal-tweak.desktop \ diff --git a/source/xapps-extra/frugalware-tweak/systray.diff b/source/xapps-extra/frugalware-tweak/systray.diff new file mode 100644 index 0000000..1e27fc2 --- /dev/null +++ b/source/xapps-extra/frugalware-tweak/systray.diff @@ -0,0 +1,77 @@ +From b513a493dc265854bcfe3b4c784b414f5c0ee0db Mon Sep 17 00:00:00 2001 +From: bouleetbil <bouleet...@frogdev.info> +Date: Thu, 13 Jan 2011 22:02:15 +0100 +Subject: [PATCH] *fixes red icon when system is updated + +--- + frugal-tweak-vala/src/MainClient.vala | 6 +++++- + frugal-tweak-vala/src/systray.vala | 12 ++++++------ + 2 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/frugal-tweak-vala/src/MainClient.vala b/frugal-tweak-vala/src/MainClient.vala +index 12de4f9..576bbc6 100644 +--- a/frugal-tweak-vala/src/MainClient.vala ++++ b/frugal-tweak-vala/src/MainClient.vala +@@ -51,9 +51,13 @@ void* func() + pacman pacmang2 = new pacman(); + if(pacmang2.CheckUpdate()) + { +- //delegateInform InformUpdate = informUpdate; + informUpdate(); + } ++ else ++ { ++ Systray.Change_Ico change_ico = systrayIcon.SetIco; ++ change_ico(Systray.defaultIco); ++ } + } + Thread.usleep(1800000000); //1/2 hour + //roadmap.GetDateRelease(); +diff --git a/frugal-tweak-vala/src/systray.vala b/frugal-tweak-vala/src/systray.vala +index 6108f10..7daa2d1 100644 +--- a/frugal-tweak-vala/src/systray.vala ++++ b/frugal-tweak-vala/src/systray.vala +@@ -22,26 +22,26 @@ using GLib; + + public class Systray + { ++ public static const string defaultIco = "/usr/share/frugalware-tweak/pictures/frugalware-tweak.png"; + private StatusIcon _trayicon ; + private Menu _popup; + private Window _window; +- private string _defaultIco = "/usr/share/frugalware-tweak/pictures/frugalware-tweak.png"; + private string _ico =""; + private Configuration conf = new Configuration(); + public Systray() + { + _window = GtkObj.MainWindow; +- _ico=_defaultIco; ++ _ico=defaultIco; + /* Create tray icon */ + try + { +- _trayicon =new StatusIcon.from_file(_defaultIco); +- _window.set_icon_from_file(_defaultIco); ++ _trayicon =new StatusIcon.from_file(_ico); ++ _window.set_icon_from_file(_ico); + } + catch(GLib.Error err) + { + var msg = new Gtk.MessageDialog(null,Gtk.DialogFlags.MODAL,Gtk.MessageType.ERROR, +- Gtk.ButtonsType.OK,"Failed to load "+_defaultIco+"\n"+err.message); ++ Gtk.ButtonsType.OK,"Failed to load "+_ico+"\n"+err.message); + msg.run(); + msg.destroy(); + } +@@ -103,7 +103,7 @@ public class Systray + catch(GLib.Error err) + { + var msg = new Gtk.MessageDialog(null,Gtk.DialogFlags.MODAL,Gtk.MessageType.ERROR, +- Gtk.ButtonsType.OK,"Failed to load "+_defaultIco+"\n"+err.message); ++ Gtk.ButtonsType.OK,"Failed to load "+_ico+"\n"+err.message); + msg.run(); + } + } +-- +1.6.5.3 + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git