gnome-packagekit r89 - trunk/src

[rhughes svn gnome org]

Author: rhughes
Date: Tue Jan 29 19:26:59 2008
New Revision: 89
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=89&view=rev

Log:
from git

Modified:
   trunk/src/pk-common-gui.c
   trunk/src/pk-smart-icon.c

Modified: trunk/src/pk-common-gui.c
==============================================================================
--- trunk/src/pk-common-gui.c	(original)
+++ trunk/src/pk-common-gui.c	Tue Jan 29 19:26:59 2008
@@ -1132,7 +1132,7 @@
 
 	/* is valid? */
 	if (time_secs == 0) {
-		timestring = g_strdup_printf (_("Zero time"));
+		timestring = g_strdup_printf (_("Now"));
 		return timestring;
 	}
 
@@ -1205,7 +1205,7 @@
 	 ************************************************************/
 	libst_title (test, "time zero");
 	text = pk_time_to_localised_string (0);
-	if (text != NULL && strcmp (text, _("Zero time")) == 0) {
+	if (text != NULL && strcmp (text, _("Now")) == 0) {
 		libst_success (test, NULL);
 	} else {
 		libst_failed (test, "failed, got %s", text);

Modified: trunk/src/pk-smart-icon.c
==============================================================================
--- trunk/src/pk-smart-icon.c	(original)
+++ trunk/src/pk-smart-icon.c	Tue Jan 29 19:26:59 2008
@@ -294,7 +294,9 @@
 
 	g_return_val_if_fail (sicon != NULL, FALSE);
 	g_return_val_if_fail (PK_IS_SMART_ICON (sicon), FALSE);
+	g_return_val_if_fail (sicon->priv->dialog != NULL, FALSE);
 
+	notify_notification_close (sicon->priv->dialog, NULL);
 	notify_notification_show (sicon->priv->dialog, &error);
 	if (error != NULL) {
 		pk_warning ("error: %s", error->message);