Merge lp:~themuso/indicator-datetime/accessible-desc into lp:indicator-datetime/0.3

[Luke Yelavich]

[Ted Gould (ted)]

On Tue, 2011-02-15 at 01:04 +0000, Luke Yelavich wrote:
> @@ -621,6 +623,11 @@
> if (ltime == NULL) {
> g_debug("Error getting local time");
> gtk_label_set_label(self->priv->label, _("Error getting time"));
> + g_signal_emit(G_OBJECT(self),
> + INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID,
> + 0,
> + (IndicatorObjectEntry *)indicator_object_get_entries(INDICATOR_OBJECT(self))->data,
> + TRUE);
> return NULL;
> }
>
> @@ -642,6 +649,12 @@
> self->priv->idle_measure = g_idle_add(idle_measure, io);
> }
>
> + g_signal_emit(G_OBJECT(self),
> + INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID,
> + 0,
> + (IndicatorObjectEntry *)indicator_object_get_entries(INDICATOR_OBJECT(self))->data,
> + TRUE);
> +
> return ltime;
> }

indicator_object_get_entires() returns a new GList of the entires
(though for this one it is only one). So the list needs to be free'd or
there will be a memory leak.

  review needsfixing

review: Needs Fixing

[Luke Yelavich (themuso)]

On Thu, Feb 17, 2011 at 09:22:52AM EST, Ted Gould wrote:
> indicator_object_get_entires() returns a new GList of the entires
> (though for this one it is only one). So the list needs to be free'd or
> there will be a memory leak.

Fixed in revision 43.

 review resubmit

review: Needs Resubmitting

[lp:~themuso/indicator-datetime/accessible-desc]

43. By Luke Yelavich on 2011-02-17

Get the indicator entry data into a separate variable, adn and free it after
we signal a change in the accessible description, to avoid a memory leak.

=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c	2011-02-09 03:37:50 +0000
+++ src/indicator-datetime.c	2011-02-17 00:08:13 +0000
@@ -166,6 +166,7 @@
 static void indicator_datetime_finalize   (GObject *object);
 static GtkLabel * get_label               (IndicatorObject * io);
 static GtkMenu *  get_menu                (IndicatorObject * io);
+static const gchar * get_accessible_desc  (IndicatorObject * io);
 static GVariant * bind_enum_set           (const GValue * value, const GVariantType * type, gpointer user_data);
 static gboolean bind_enum_get             (GValue * value, GVariant * variant, gpointer user_data);
 static gchar * generate_format_string     (IndicatorDatetime * self);
@@ -203,6 +204,7 @@
 
 	io_class->get_label = get_label;
 	io_class->get_menu  = get_menu;
+	io_class->get_accessible_desc = get_accessible_desc;
 
 	g_object_class_install_property (object_class,
 	                                 PROP_TIME_FORMAT,
@@ -608,6 +610,7 @@
 update_label (IndicatorDatetime * io)
 {
 	IndicatorDatetime * self = INDICATOR_DATETIME(io);
+	GList * entry = indicator_object_get_entries(INDICATOR_OBJECT(io));
 
 	if (self->priv->label == NULL) return NULL;
 
@@ -621,6 +624,13 @@
 	if (ltime == NULL) {
 		g_debug("Error getting local time");
 		gtk_label_set_label(self->priv->label, _("Error getting time"));
+
+		g_signal_emit(G_OBJECT(self),
+		              INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID,
+		              0,
+		              entry->data,
+		              TRUE);
+		g_list_free(entry);
 		return NULL;
 	}
 
@@ -642,6 +652,13 @@
 		self->priv->idle_measure = g_idle_add(idle_measure, io);
 	}
 
+	g_signal_emit(G_OBJECT(self),
+	              INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID,
+	              0,
+	              entry->data,
+	              TRUE);
+	g_list_free(entry);
+
 	return ltime;
 }
 
@@ -1313,3 +1330,16 @@
 
 	return GTK_MENU(self->priv->menu);
 }
+
+static const gchar *
+get_accessible_desc (IndicatorObject * io)
+{
+	IndicatorDatetime * self = INDICATOR_DATETIME(io);
+	const gchar * name;
+
+	if (self->priv->label != NULL) {
+		name = gtk_label_get_text(self->priv->label);
+		return name;
+	}
+	return NULL;
+}