Ted Gould has proposed merging
lp:~indicator-applet-developers/indicator-applet/applet-packaging into
lp:~ubuntu-core-dev/indicator-applet/ubuntu.
Requested reviews:
Ubuntu Sponsors for main (ubuntu-main-sponsors)
--
https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet-packaging/+merge/4996
Your team Indicator Applet Developers is subscribed to branch
lp:~indicator-applet-developers/indicator-applet/applet-packaging.
=== modified file 'autogen.sh'
--- autogen.sh 2009-02-16 19:29:50 +0000
+++ autogen.sh 2009-03-26 16:27:16 +0000
@@ -9,4 +9,4 @@
USE_GNOME2_MACROS=1 \
USE_COMMON_DOC_BUILD=yes \
-. gnome-autogen.sh
+gnome-autogen.sh --enable-gtk-doc
=== modified file 'configure.ac'
--- configure.ac 2009-03-18 05:12:25 +0000
+++ configure.ac 2009-03-28 04:34:45 +0000
@@ -4,7 +4,7 @@
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-applet, 0.1.3)
+AM_INIT_AUTOMAKE(indicator-applet, 0.1.4)
AM_MAINTAINER_MODE
@@ -39,7 +39,8 @@
DBUS_REQUIRED_VERSION=0.76
PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
- libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION)
+ libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
+ libgnomeui-2.0)
AC_SUBST(APPLET_CFLAGS)
AC_SUBST(APPLET_LIBS)
@@ -90,6 +91,24 @@
###########################
GTK_DOC_CHECK([1.4])
+GNOME_DOC_INIT
+GNOME_COMPILE_WARNINGS
+
+##############################
+# Custom Junk
+##############################
+
+AC_DEFUN([AC_DEFINE_PATH], [
+ test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ ac_define_path=`eval echo [$]$2`
+ ac_define_path=`eval echo [$]ac_define_path`
+ $1="$ac_define_path"
+ AC_SUBST($1)
+ ifelse($3, ,
+ AC_DEFINE_UNQUOTED($1, "$ac_define_path"),
+ AC_DEFINE_UNQUOTED($1, "$ac_define_path", $3))
+])
###########################
# Internationalization
@@ -98,9 +117,39 @@
GETTEXT_PACKAGE=indicator-applet
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default gettext domain])
+AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
AM_GLIB_GNU_GETTEXT
+##############################
+# ./configure Flags messings
+##############################
+
+cflags_set=${CFLAGS+set}
+# find the actual value for $prefix that we'll end up with
+REAL_PREFIX=
+if test "x$prefix" = "xNONE"; then
+ REAL_PREFIX=$ac_default_prefix
+else
+ REAL_PREFIX=$prefix
+fi
+
+# Have to go $sysconfdir->$prefix/etc->/usr/local/etc
+# if you actually know how to code shell then fix this :-)
+SYSCONFDIR_TMP="$sysconfdir"
+old_prefix=$prefix
+prefix=$REAL_PREFIX
+EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
+prefix=$old_prefix
+AC_SUBST(EXPANDED_SYSCONFDIR)
+
+dnl Save flags to aclocal
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
+AC_DEFINE_PATH(PREFIX, "${prefix}", [prefix directory])
+AC_DEFINE_PATH(SYSCONFDIR, "${sysconfdir}", [system configuration dir])
+AC_DEFINE_PATH(LIBDIR, "${libdir}", [system configuration dir])
+
###########################
# Files
###########################
=== modified file 'data/GNOME_IndicatorApplet.server.in.in'
--- data/GNOME_IndicatorApplet.server.in.in 2009-02-18 20:03:42 +0000
+++ data/GNOME_IndicatorApplet.server.in.in 2009-03-27 19:41:02 +0000
@@ -6,8 +6,8 @@
<item value="IDL:Bonobo/GenericFactory:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
- <oaf_attribute name="name" type="string" _value="Indicator Applet Factory"/>
- <oaf_attribute name="description" type="string" _value="Indicator Applet Factory"/>
+ <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/>
+ <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/>
<oaf_attribute name="bonobo:environment" type="stringv">
<item value="DBUS_SESSION_BUS_ADDRESS"/>
</oaf_attribute>
=== modified file 'debian/changelog'
--- debian/changelog 2009-03-25 10:25:37 +0000
+++ debian/changelog 2009-03-28 04:42:04 +0000
@@ -1,3 +1,23 @@
+indicator-applet (0.1.4-0ubuntu1) jaunty; urgency=low
+
+ * New upstream version
+ * Changing the text in the license box to make sense. (LP: #346215)
+ * Call GNOME Program Init to initialize all of the ATK and gettext
+ stuff that needs to be initialized for it all to work. Patch from
+ Eitan Isaacson. (LP: #349031)
+ * Give the indicator applet an ATK name so it can be found by the
+ accessibility frameworks. Patch from Eitan Isaacson. (LP: #349031)
+ * Making it so the 'No Indicators' situation uses a label instead of a
+ desensitized menu item to allow right click through. (LP: #346359)
+ * Remove the making of 'Indicator Applet Factory' translatable.
+ (LP: #349540)
+ * Make sure translations get loaded and make the 'No Indicators' error
+ and the license translatable. Patch from Gabor Kelemen. (LP: #349998)
+ * debian/control: Adding libgnomeui-dev as a dependency as it was added
+ upstream.
+
+ -- Ted Gould <[email protected]> Fri, 27 Mar 2009 23:41:21 -0500
+
indicator-applet (0.1.3-0ubuntu2) jaunty; urgency=low
* debian/control: Add dependency to indicator-messages; the applet is
=== modified file 'debian/control'
--- debian/control 2009-03-25 10:25:19 +0000
+++ debian/control 2009-03-28 04:39:31 +0000
@@ -8,6 +8,7 @@
libpanel-applet2-dev (>= 2.0.0),
libdbus-glib-1-dev,
gnome-doc-utils,
+ libgnomeui-dev,
libtool,
intltool
Standards-Version: 3.8.0
=== modified file 'libindicate/server.c'
--- libindicate/server.c 2009-02-16 03:53:55 +0000
+++ libindicate/server.c 2009-03-27 19:18:38 +0000
@@ -318,7 +318,7 @@
g_return_if_fail(INDICATE_IS_SERVER(server));
IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
- if (priv->visible)
+ if (!priv->visible)
return;
priv->visible = FALSE;
=== modified file 'src/applet-main.c'
--- src/applet-main.c 2009-03-12 17:24:47 +0000
+++ src/applet-main.c 2009-03-28 04:34:45 +0000
@@ -20,7 +20,9 @@
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <panel-applet.h>
+#include <libgnomeui/gnome-ui-init.h>
#define SYMBOL_NAME "get_menu_item"
#define ICONS_DIR (DATADIR G_DIR_SEPARATOR_S "indicator-applet" G_DIR_SEPARATOR_S "icons")
@@ -34,6 +36,13 @@
GdkPixmap *pixmap,
GtkWidget *menubar);
+/* ****************** *
+ * Global Variables *
+ * ****************** */
+
+static GnomeProgram *program = NULL;
+
+
/*************
* main
* ***********/
@@ -117,21 +126,20 @@
};
static gchar *license[] = {
- N_("The Indicator Applet is free software; you can redistribute it and/or modify "
- "it under the terms of the GNU General Public License as published by "
- "the Free Software Foundation; either version 3 of the License."),
- N_("This program is distributed in the hope that it will be useful, "
- "but WITHOUT ANY WARRANTY; without even the implied warranties of "
- "MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR "
- "PURPOSE. See the GNU General Public License for more details."),
- N_("You should have received a copy of the GNU General Public License "
- "along with this program; if not, write to the Free Software "
- "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "),
+ N_("This program is free software: you can redistribute it and/or modify it "
+ "under the terms of the GNU General Public License version 3, as published "
+ "by the Free Software Foundation."),
+ N_("This program is distributed in the hope that it will be useful, but "
+ "WITHOUT ANY WARRANTY; without even the implied warranties of "
+ "MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR "
+ "PURPOSE. See the GNU General Public License for more details."),
+ N_("You should have received a copy of the GNU General Public License along "
+ "with this program. If not, see <http://www.gnu.org/licenses/>."),
NULL
};
gchar *license_i18n;
- license_i18n = g_strjoinv ("\n\n", license);
+ license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL);
gtk_show_about_dialog(NULL,
"version", "0.1",
@@ -173,16 +181,32 @@
gint i;
gint indicators_loaded = 0;
- /* check if we are running stracciatella session */
- if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) {
- g_debug("Running stracciatella GNOME session, disabling myself");
- return TRUE;
- }
+ /* check if we are running stracciatella session */
+ if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) {
+ g_debug("Running stracciatella GNOME session, disabling myself");
+ return TRUE;
+ }
+ static gboolean first_time = FALSE;
+
+ if (!first_time)
+ {
+ gint argc = 1;
+ gchar *argv[2] = { "indicator-applet", NULL};
+
+ first_time = TRUE;
+ program = gnome_program_init ("indicator-applet", "0.1",
+ LIBGNOMEUI_MODULE, argc, argv,
+ GNOME_PROGRAM_STANDARD_PROPERTIES,
+ NULL);
+ }
+
/* Set panel options */
gtk_container_set_border_width(GTK_CONTAINER (applet), 0);
panel_applet_set_flags(applet, PANEL_APPLET_EXPAND_MINOR);
panel_applet_setup_menu(applet, menu_xml, menu_verbs, NULL);
+ atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
+ "indicator-applet");
/* Init some theme/icon stuff */
gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
@@ -207,10 +231,6 @@
g_signal_connect_after(menubar, "expose-event", G_CALLBACK(menubar_on_expose), menubar);
gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);
- gtk_container_add(GTK_CONTAINER(applet), menubar);
- panel_applet_set_background_widget(applet, menubar);
- gtk_widget_show(menubar);
-
/* load 'em */
if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL);
@@ -223,10 +243,14 @@
}
if (indicators_loaded == 0) {
- GtkWidget * item = gtk_menu_item_new_with_label("No Indicators");
- gtk_widget_set_sensitive(item, FALSE);
- gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item);
+ /* A label to allow for click through */
+ GtkWidget * item = gtk_label_new(_("No Indicators"));
+ gtk_container_add(GTK_CONTAINER(applet), item);
gtk_widget_show(item);
+ } else {
+ gtk_container_add(GTK_CONTAINER(applet), menubar);
+ panel_applet_set_background_widget(applet, menubar);
+ gtk_widget_show(menubar);
}
/* Background of applet */
_______________________________________________
Mailing list: https://launchpad.net/~dx-team
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dx-team
More help : https://help.launchpad.net/ListHelp
