------------------------------------------------------------ revno: 423 fixes bug(s): https://launchpad.net/bugs/804969 author: klondike <[email protected]> committer: Steven Sheehy <[email protected]> branch nick: trunk timestamp: Thu 2011-07-07 23:40:25 -0500 message: Added a build flag to enable/disable libnotify modified: Changelog.txt Credits.txt SConstruct glade/mainwindow.glade po/linuxdcpp.pot
-- lp:linuxdcpp https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk Your team LinuxDC++ Team is subscribed to branch lp:linuxdcpp. To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk/+edit-subscription
=== modified file 'Changelog.txt' --- Changelog.txt 2011-04-17 17:41:11 +0000 +++ Changelog.txt 2011-07-08 04:40:25 +0000 @@ -1,3 +1,6 @@ +*** 1.x.x 201x-xx-xx *** +[2011-07-07] Added a build flag to enable/disable libnotify. (thanks Francisco Blas Izquierdo Riera) + *** 1.1.0 2011-04-17 *** [2009-02-22] Upgraded the DC++ core to 0.707, adding segmented downloading (thanks Razzloss). [2009-02-28] Upgraded the DC++ core to 0.7091. === modified file 'Credits.txt' --- Credits.txt 2010-10-14 03:51:12 +0000 +++ Credits.txt 2011-07-08 04:40:25 +0000 @@ -47,6 +47,7 @@ Jakh Daven Andrew Browne DjSlash +Francisco Blas Izquierdo Riera <[email protected]> DC++: ----- === modified file 'SConstruct' --- SConstruct 2011-03-28 05:34:08 +0000 +++ SConstruct 2011-07-08 04:40:25 +0000 @@ -106,6 +106,7 @@ vars.AddVariables( BoolVariable('debug', 'Compile the program with debug information', 0), BoolVariable('release', 'Compile the program with optimizations', 0), + BoolVariable('libnotify', 'Enable notifications through libnotify', 1), BoolVariable('profile', 'Compile the program with profiling information', 0), PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir), ('FAKE_ROOT', 'Make scons install the program under a fake root', '') @@ -263,14 +264,15 @@ conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H') # TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies - if not conf.CheckPKG('libnotify >= 0.4.1'): - print '\tlibnotify >= 0.4.1 not found, disabling notifications.' - print '\tNote: You might have the lib but not the headers' - else: - conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY') - conf.env.ParseConfig('pkg-config --libs libnotify') - if conf.CheckPKG('libnotify >= 0.7'): - conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7') + if conf.env.get('libnotify'): + if not conf.CheckPKG('libnotify >= 0.4.1'): + print '\tlibnotify >= 0.4.1 not found, disabling notifications.' + print '\tNote: You might have the lib but not the headers' + else: + conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY') + conf.env.ParseConfig('pkg-config --libs libnotify') + if conf.CheckPKG('libnotify >= 0.7'): + conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7') conf.CheckBZRRevision() === modified file 'glade/mainwindow.glade' --- glade/mainwindow.glade 2011-04-04 16:31:38 +0000 +++ glade/mainwindow.glade 2011-07-08 04:40:25 +0000 @@ -862,6 +862,7 @@ Andrew Browne DjSlash lagalopex + Francisco Blas Izquierdo Riera </property> <property name="artists">Johannes Sjölund</property> <property name="translator_credits" translatable="yes" comments="Please do not translate. Launchpad will automatically replace this text with the names of the translators for the current language.">translator-credits</property> === modified file 'po/linuxdcpp.pot' --- po/linuxdcpp.pot 2011-04-17 00:29:15 +0000 +++ po/linuxdcpp.pot 2011-07-08 04:40:25 +0000 @@ -8,7 +8,7 @@ "#-#-#-#-# glade.pot #-#-#-#-#\n" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://translations.launchpad.net/linuxdcpp\n"; -"POT-Creation-Date: 2011-04-16 19:22-0500\n" +"POT-Creation-Date: 2011-07-07 23:34-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -19,7 +19,7 @@ "#-#-#-#-# linux.pot #-#-#-#-#\n" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://translations.launchpad.net/linuxdcpp\n"; -"POT-Creation-Date: 2011-04-16 19:22-0500\n" +"POT-Creation-Date: 2011-07-07 23:34-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -476,7 +476,7 @@ msgid "Logging" msgstr "" -#: glade/mainwindow.glade:1041 +#: glade/mainwindow.glade:1042 msgid "Magnet Properties" msgstr "" @@ -680,7 +680,7 @@ msgid "Select a Folder" msgstr "" -#: glade/mainwindow.glade:885 +#: glade/mainwindow.glade:886 msgid "Select filelist to browse" msgstr "" @@ -766,7 +766,7 @@ msgid "Use SOCKS5 server to resolve _hostnames" msgstr "" -#: glade/mainwindow.glade:934 +#: glade/mainwindow.glade:935 msgid "User Command Argument" msgstr "" @@ -909,7 +909,7 @@ msgid "_Encoding:" msgstr "" -#: glade/mainwindow.glade:1174 +#: glade/mainwindow.glade:1175 msgid "_Exact size:" msgstr "" @@ -925,7 +925,7 @@ msgid "_File list transfers" msgstr "" -#: glade/mainwindow.glade:1073 +#: glade/mainwindow.glade:1074 msgid "_Filename" msgstr "" @@ -986,7 +986,7 @@ msgid "_Lowest" msgstr "" -#: glade/mainwindow.glade:1060 +#: glade/mainwindow.glade:1061 msgid "_Magnet:" msgstr "" @@ -1160,11 +1160,11 @@ msgid "_Share hidden files" msgstr "" -#: glade/mainwindow.glade:1021 +#: glade/mainwindow.glade:1022 msgid "_Show Interface" msgstr "" -#: glade/mainwindow.glade:1088 +#: glade/mainwindow.glade:1089 msgid "_Size:" msgstr "" @@ -1176,7 +1176,7 @@ msgid "_TCP:" msgstr "" -#: glade/mainwindow.glade:1103 +#: glade/mainwindow.glade:1104 msgid "_TTH:" msgstr "" @@ -1235,7 +1235,7 @@ msgstr "" #. Please do not translate. Launchpad will automatically replace this text with the names of the translators for the current language. -#: glade/mainwindow.glade:867 +#: glade/mainwindow.glade:868 msgid "translator-credits" msgstr ""
_______________________________________________ Mailing list: https://launchpad.net/~linuxdcpp-team Post to : [email protected] Unsubscribe : https://launchpad.net/~linuxdcpp-team More help : https://help.launchpad.net/ListHelp
