linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 412
fixes bug(s): https://launchpad.net/bugs/730594
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2011-03-07 18:14:03 -0600
message:
  Fix for libnotify >= 0.7 API breakage
modified:
  SConstruct
  linux/mainwindow.cc
  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 'SConstruct'
--- SConstruct	2011-02-03 07:00:46 +0000
+++ SConstruct	2011-03-08 00:14:03 +0000
@@ -268,6 +268,8 @@
 	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 'linux/mainwindow.cc'
--- linux/mainwindow.cc	2011-02-08 06:21:39 +0000
+++ linux/mainwindow.cc	2011-03-08 00:14:03 +0000
@@ -224,6 +224,10 @@
 
 	gtk_widget_destroy(GTK_WIDGET(window));
 	g_object_unref(statusIcon);
+
+	#ifdef HAVE_LIBNOTIFY
+	notify_uninit();
+	#endif
 }
 
 GtkWidget *MainWindow::getContainer()
@@ -479,11 +483,14 @@
 		notify_init(g_get_application_name());
 
 	NotifyNotification *notification;
+	#ifdef HAVE_LIBNOTIFY_0_7
+	notification = notify_notification_new(title.c_str(), body.c_str(), g_get_prgname());
+	#else
 	notification = notify_notification_new_with_status_icon(title.c_str(), body.c_str(), g_get_prgname(), statusIcon);
+	#endif
 	notify_notification_show(notification, NULL);
 
 	g_object_unref(notification);
-	// TODO: notify_uninit();
 #endif
 }
 

=== modified file 'po/linuxdcpp.pot'
--- po/linuxdcpp.pot	2011-03-05 20:57:50 +0000
+++ po/linuxdcpp.pot	2011-03-08 00:14:03 +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-03-05 14:56-0600\n"
+"POT-Creation-Date: 2011-03-06 23:27-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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-03-02 18:12-0600\n"
+"POT-Creation-Date: 2011-03-07 18:05-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -1244,7 +1244,7 @@
 msgstr ""
 
 #. TRANSLATORS: Notify icon (systray) tooltip
-#: linux/mainwindow.cc:471
+#: linux/mainwindow.cc:475
 #, boost-format
 msgid ""
 "%1%\n"
@@ -1569,7 +1569,7 @@
 msgid "Download failed: %1%"
 msgstr ""
 
-#: linux/mainwindow.cc:1424 linux/publichubs.cc:446 linux/transfers.cc:930
+#: linux/mainwindow.cc:1432 linux/publichubs.cc:446 linux/transfers.cc:930
 #: linux/transfers.cc:1031
 msgid "Download finished"
 msgstr ""
@@ -1621,7 +1621,7 @@
 msgstr ""
 
 #. TRANSLATORS: Appears in a dialog prompt when a user command requires arguments.
-#: linux/mainwindow.cc:751
+#: linux/mainwindow.cc:759
 #, boost-format
 msgid "Enter a value for '%1%'"
 msgstr ""
@@ -1663,7 +1663,7 @@
 msgid "File not available"
 msgstr ""
 
-#: linux/mainwindow.cc:1260
+#: linux/mainwindow.cc:1268
 msgid ""
 "File transfers will not work correctly until the connection settings are "
 "adjusted or any application using the port is closed."
@@ -1804,7 +1804,7 @@
 "share size)"
 msgstr ""
 
-#: linux/mainwindow.cc:1096
+#: linux/mainwindow.cc:1104
 msgid "Loading file list"
 msgstr ""
 
@@ -1996,7 +1996,7 @@
 msgid "Searching too soon, retry in %1% s"
 msgstr ""
 
-#: linux/mainwindow.cc:1274
+#: linux/mainwindow.cc:1282
 msgid ""
 "Searching will not work correctly until the connection settings are adjusted "
 "or any application using the port is closed."
@@ -2166,15 +2166,15 @@
 msgid "Unable to load file list: %1%"
 msgstr ""
 
-#: linux/mainwindow.cc:1084
+#: linux/mainwindow.cc:1092
 msgid "Unable to load file list: Invalid file list name"
 msgstr ""
 
-#: linux/mainwindow.cc:1259
+#: linux/mainwindow.cc:1267
 msgid "Unable to open TCP/TLS port"
 msgstr ""
 
-#: linux/mainwindow.cc:1273
+#: linux/mainwindow.cc:1281
 msgid "Unable to open UDP port"
 msgstr ""