Indicator Applet

Merge lp://staging/~james-w/indicator-applet/messages-cleanups into lp://staging/indicator-applet/messages0.2

  1. messages-cleanups
  2. Merge into messages
Proposed by James Westby
Status: Merged
Merge reported by: Ted Gould
Merged at revision: not available
Proposed branch: lp://staging/~james-w/indicator-applet/messages-cleanups
Merge into: lp://staging/indicator-applet/messages0.2
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~james-w/indicator-applet/messages-cleanups
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+5228@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Hi,

This is just a couple of cleanups for indicator-messages.

The first corrects a copy paste error in autogen.sh.

The second prevents trying to use a NULL appinfo.

Thanks,

James

lp://staging/~james-w/indicator-applet/messages-cleanups updated
100. By James Westby

Keep a reference to the icon so that it is not destroyed before being shown

Revision history for this message
Ted Gould (ted) wrote :

> The first corrects a copy paste error in autogen.sh.
>
> The second prevents trying to use a NULL appinfo.

Cool, thanks, put both of these changes in. Sorry I missed the mail earlier than this.

    --Ted

Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'autogen.sh'
--- autogen.sh 2008-12-05 00:34:45 +0000
+++ autogen.sh 2009-04-05 11:03:12 +0000
@@ -1,6 +1,6 @@
1#!/bin/sh1#!/bin/sh
22
3PKG_NAME="indicator-applet"3PKG_NAME="indicator-messages"
44
5which gnome-autogen.sh || {5which gnome-autogen.sh || {
6 echo "You need gnome-common from GNOME SVN"6 echo "You need gnome-common from GNOME SVN"
77
=== modified file 'src/app-menu-item.c'
--- src/app-menu-item.c 2009-03-18 19:22:08 +0000
+++ src/app-menu-item.c 2009-04-05 11:03:31 +0000
@@ -192,11 +192,11 @@
192 if (priv->count_on_label && !priv->unreadcount < 1) {192 if (priv->count_on_label && !priv->unreadcount < 1) {
193 /* TRANSLATORS: This is the name of the program and the number of indicators. So it193 /* TRANSLATORS: This is the name of the program and the number of indicators. So it
194 would read something like "Mail Client (5)" */194 would read something like "Mail Client (5)" */
195 gchar * label = g_strdup_printf(_("%s (%d)"), g_app_info_get_name(priv->appinfo), priv->unreadcount);195 gchar * label = g_strdup_printf(_("%s (%d)"), app_menu_item_get_name(self), priv->unreadcount);
196 gtk_label_set_text(GTK_LABEL(priv->name), label);196 gtk_label_set_text(GTK_LABEL(priv->name), label);
197 g_free(label);197 g_free(label);
198 } else {198 } else {
199 gtk_label_set_text(GTK_LABEL(priv->name), g_app_info_get_name(priv->appinfo));199 gtk_label_set_text(GTK_LABEL(priv->name), app_menu_item_get_name(self));
200 }200 }
201201
202 return;202 return;
@@ -220,7 +220,7 @@
220 g_return_if_fail(priv->appinfo != NULL);220 g_return_if_fail(priv->appinfo != NULL);
221221
222 update_label(self);222 update_label(self);
223 g_signal_emit(G_OBJECT(self), signals[NAME_CHANGED], 0, g_app_info_get_name(priv->appinfo), TRUE);223 g_signal_emit(G_OBJECT(self), signals[NAME_CHANGED], 0, app_menu_item_get_name(self), TRUE);
224224
225 return;225 return;
226}226}

Subscribers

People subscribed via source and target branches