Prefer application properties than hardcoded strings.

resources/install/build.xml

@@ -785,15 +785,18 @@
             value="org.osgi.framework.system.packages.extra= org.growl4j;"/>
 
       <replace file="${macosx.resrc.dir}/felix.client.run.properties"
-            token="reference:file:sc-bundles/swingnotification.jar \">
-      <replacevalue><![CDATA[reference:file:sc-bundles/growlnotification.jar \
- reference:file:sc-bundles/swingnotification.jar \]]></replacevalue>
+            token="swingnotification.jar">
+      <replacevalue><![CDATA[swingnotification.jar reference\:file\:sc-bundles/growlnotification.jar]]></replacevalue>
        </replace>
 
       <!-- Remove the reference to the updatechecker bundle -->
       <replace file="${macosx.resrc.dir}/felix.client.run.properties"
                token="reference:file:sc-bundles/updatechecker.jar"
                value=""/>
+      <!-- colons can be escaped after some modifications -->
+      <replace file="${macosx.resrc.dir}/felix.client.run.properties"
+               token="reference\:file\:sc-bundles/updatechecker.jar"
+               value=""/>
       <replaceregexp file="${macosx.resrc.dir}/felix.client.run.properties"
                 match="^org.osgi.framework.storage=\$\{user.home\}/.sip-communicator/sip-communicator.bin"
                 replace="org.osgi.framework.storage=$\{user.home\}/Library/Application Support/${application.name}/sip-communicator.bin"

src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationServiceImpl.java

@@ -61,15 +61,25 @@ public void start(BundleContext bc)
         if(Growl.isGrowlRunning())
         {
             String[] dict = { "Default", "Welcome message" };
-            byte[] sipIcon = GrowlNotificationActivator.getResources().
-                                    getImageInBytes("service.gui.SIP_COMMUNICATOR_LOGO_45x45");
-            growl = new Growl ("SIP Communicator", "net.sip-communicator", sipIcon, dict, dict);
+            byte[] sipIcon =
+                GrowlNotificationActivator.getResources().
+                    getImageInBytes("service.gui.SIP_COMMUNICATOR_LOGO_45x45");
+            growl = new Growl (
+                GrowlNotificationActivator.getResources()
+                    .getSettingsString("service.gui.APPLICATION_NAME"),
+                "net.sip-communicator",
+                sipIcon,
+                dict,
+                dict);
             growl.addClickedNotificationsListener(this);
 
-            growl.notifyGrowlOf("SIP Communicator",
-                                "http://www.sip-communicator.org/",
-                                "Welcome message",
-                                null, null);
+            growl.notifyGrowlOf(
+                GrowlNotificationActivator.getResources()
+                    .getSettingsString("service.gui.APPLICATION_NAME"),
+                GrowlNotificationActivator.getResources()
+                    .getSettingsString("service.gui.APPLICATION_WEB_SITE"),
+                "Welcome message",
+                null, null);
         }
     }