From eab2ebe5b34569ada5f5fda64b9e313b1d9cccca Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Sep 2010 11:42:39 -0500 Subject: Adding a new library line for configure so that we don't end up with extra libs in the library. --- configure.ac | 7 +++++++ src/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0ecea51..f1ae2ea 100644 --- a/configure.ac +++ b/configure.ac @@ -52,6 +52,13 @@ PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION AC_SUBST(INDICATOR_CFLAGS) AC_SUBST(INDICATOR_LIBS) +PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) + +AC_SUBST(LIBRARY_CFLAGS) +AC_SUBST(LIBRARY_LIBS) + ########################### # GObject Introspection ########################### diff --git a/src/Makefile.am b/src/Makefile.am index 1c4e7ae..091f0f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -108,12 +108,12 @@ libappindicator_la_LDFLAGS = \ -export-symbols-regex "^[^_d].*" libappindicator_la_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -DG_LOG_DOMAIN=\"libappindicator\" libappindicator_la_LIBADD = \ - $(INDICATOR_LIBS) + $(LIBRARY_LIBS) ################################## # DBus Specs -- cgit v1.2.3 From de1ea7a175f0913b5a5421e666dd2d38d864fe47 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Nov 2010 11:19:19 -0500 Subject: Adding an API function to build the menu from a desktop file --- src/app-indicator.c | 15 +++++++++++++++ src/app-indicator.h | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 4f7daa8..4734b80 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -2106,3 +2106,18 @@ app_indicator_get_ordering_index (AppIndicator *self) } } +/** + app_indicator_build_menu_from_desktop: + @self: The #AppIndicator object to use + @desktop_file: A path to the desktop file to build the menu from + + This function allows for building the Application Indicator menu + from a static desktop file. +*/ +void +app_indicator_build_menu_from_desktop (AppIndicator * self, const gchar * desktop_file) +{ + + + +} diff --git a/src/app-indicator.h b/src/app-indicator.h index ce152bb..cfc9565 100644 --- a/src/app-indicator.h +++ b/src/app-indicator.h @@ -280,6 +280,10 @@ const gchar * app_indicator_get_label (AppIndicator * const gchar * app_indicator_get_label_guide (AppIndicator *self); guint32 app_indicator_get_ordering_index (AppIndicator *self); +/* Helpers */ +void app_indicator_build_menu_from_desktop (AppIndicator * self, + const gchar * desktop_file); + G_END_DECLS /** -- cgit v1.2.3 From d2427bba3a731af3db25878f7e63fd2a83a3243e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Nov 2010 11:25:40 -0500 Subject: Adding the profile in there --- src/app-indicator.c | 2 +- src/app-indicator.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 4734b80..1805bd5 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -2115,7 +2115,7 @@ app_indicator_get_ordering_index (AppIndicator *self) from a static desktop file. */ void -app_indicator_build_menu_from_desktop (AppIndicator * self, const gchar * desktop_file) +app_indicator_build_menu_from_desktop (AppIndicator * self, const gchar * desktop_file, const gchar * desktop_profile) { diff --git a/src/app-indicator.h b/src/app-indicator.h index cfc9565..3e159db 100644 --- a/src/app-indicator.h +++ b/src/app-indicator.h @@ -282,7 +282,8 @@ guint32 app_indicator_get_ordering_index (AppIndicator * /* Helpers */ void app_indicator_build_menu_from_desktop (AppIndicator * self, - const gchar * desktop_file); + const gchar * desktop_file, + const gchar * desktop_profile); G_END_DECLS -- cgit v1.2.3 From 8d9b6e921d45ba5f4153e7c1fd784eef64c3d80e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Nov 2010 11:47:52 -0500 Subject: Adding in a couple of desktop tests --- tests/test-libappindicator.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 8d12ac5..202c5e1 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -291,6 +291,22 @@ test_libappindicator_label_signals (void) g_assert(label_signals_count == 1); return; +} + +void +test_libappindicator_desktop_menu (void) +{ + + + +} + +void +test_libappindicator_desktop_menu_bad (void) +{ + + + } void @@ -302,6 +318,8 @@ test_libappindicator_props_suite (void) g_test_add_func ("/indicator-application/libappindicator/prop_signals", test_libappindicator_prop_signals); g_test_add_func ("/indicator-application/libappindicator/set_label", test_libappindicator_set_label); g_test_add_func ("/indicator-application/libappindicator/label_signals", test_libappindicator_label_signals); + g_test_add_func ("/indicator-application/libappindicator/desktop_menu", test_libappindicator_desktop_menu); + g_test_add_func ("/indicator-application/libappindicator/desktop_menu_bad",test_libappindicator_desktop_menu_bad); return; } -- cgit v1.2.3 From 145fd40be09045eb775dd5cdf754623ae7fc210b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Nov 2010 11:49:27 -0500 Subject: Adding a desktop file for testing --- tests/Makefile.am | 4 +++- tests/test-libappindicator.desktop | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 tests/test-libappindicator.desktop diff --git a/tests/Makefile.am b/tests/Makefile.am index f2bdbb2..f52b78b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,7 +13,9 @@ check_PROGRAMS = \ TESTS = DISTCLEANFILES = $(TESTS) -EXTRA_DIST = run-xvfb.sh +EXTRA_DIST = \ + run-xvfb.sh \ + test-libappindicator.desktop ######################################### ## test-libappindicator diff --git a/tests/test-libappindicator.desktop b/tests/test-libappindicator.desktop new file mode 100644 index 0000000..59be810 --- /dev/null +++ b/tests/test-libappindicator.desktop @@ -0,0 +1,23 @@ +[Desktop Entry] +Name=AppIndicator Test +GenericName=Test +Comment=This is only a test +Exec=/usr/bin/false +Terminal=false +Type=Application +X-Ayatana-Desktop-Shortcuts=Short1;Short2;Short3; + +[Short1 Shortcut Group] +Name=Shortcut 1 +Exec=/usr/bin/true +OnlyShowIn=Test Program; + +[Short2 Shortcut Group] +Name=Shortcut 2 +Exec=/usr/bin/true +OnlyShowIn=Test Program; + +[Short3 Shortcut Group] +Name=Shortcut 3 +Exec=/usr/bin/true +OnlyShowIn=Test Program; -- cgit v1.2.3 From 2e1b3533b988c227f5699bc88dc5df0e67669430 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Nov 2010 11:49:47 -0500 Subject: Adding the srcdir to the build command line --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index f52b78b..9cecd5e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,6 +26,7 @@ test_libappindicator_SOURCES = \ test_libappindicator_CFLAGS = \ $(INDICATOR_CFLAGS) \ + -DSRCDIR="\"$(srcdir)\"" \ -Wall -Werror \ -I$(top_srcdir)/src -- cgit v1.2.3 From 52c706605c23a2b3b06e5f4262d5ea1ab1577567 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Nov 2010 12:10:46 -0500 Subject: Adding a test to check the number of items in the desktop file --- tests/test-libappindicator.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 202c5e1..f340a67 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -296,9 +296,26 @@ test_libappindicator_label_signals (void) void test_libappindicator_desktop_menu (void) { + AppIndicator * ci = app_indicator_new ("my-id", + "my-name", + APP_INDICATOR_CATEGORY_APPLICATION_STATUS); + g_assert(ci != NULL); + g_assert(app_indicator_get_label(ci) == NULL); + g_assert(app_indicator_get_label_guide(ci) == NULL); + app_indicator_build_menu_from_desktop(ci, SRCDIR "/test-libappindicator.desktop", "Test Program"); + GtkMenu * menu = app_indicator_get_menu(ci); + g_assert(menu != NULL); + + GList * children = gtk_container_get_children(GTK_CONTAINER(menu)); + g_assert(children != NULL); + g_assert(g_list_length(children) == 3); + + g_object_unref(G_OBJECT(ci)); + + return; } void -- cgit v1.2.3 From 02e634b42f174aaf771eaed445b6ddf0b690692a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 9 Nov 2010 16:52:06 -0600 Subject: Adding in an icon and passing it's path to the build --- example/Makefile.am | 4 ++++ example/simple-client-test-icon.png | Bin 0 -> 3310 bytes 2 files changed, 4 insertions(+) create mode 100644 example/simple-client-test-icon.png diff --git a/example/Makefile.am b/example/Makefile.am index f4f2ab2..0659174 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -11,9 +11,13 @@ simple_client_SOURCES = \ simple_client_CFLAGS = \ $(INDICATOR_CFLAGS) \ + -DLOCAL_ICON="\"$(abs_srcdir)/simple-client-test-icon.png\"" \ -Wall -Werror \ -I$(top_srcdir)/src simple_client_LDADD = \ $(INDICATOR_LIBS) \ $(top_builddir)/src/libappindicator.la + +EXTRA_DIST = \ + simple-client-test-icon.png diff --git a/example/simple-client-test-icon.png b/example/simple-client-test-icon.png new file mode 100644 index 0000000..30dbb9d Binary files /dev/null and b/example/simple-client-test-icon.png differ -- cgit v1.2.3 From 40c2ed841e817647a7f9bf0798815bbf8279769c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 9 Nov 2010 17:01:37 -0600 Subject: Add a menu item to use the local icon --- example/simple-client.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/example/simple-client.c b/example/simple-client.c index f2fac6f..734aff6 100644 --- a/example/simple-client.c +++ b/example/simple-client.c @@ -59,6 +59,20 @@ activate_clicked_cb (GtkWidget *widget, gpointer data) } +static void +local_icon_toggle_cb (GtkWidget *widget, gpointer data) +{ + AppIndicator * ci = APP_INDICATOR(data); + + if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) { + app_indicator_set_icon(ci, LOCAL_ICON); + } else { + app_indicator_set_icon(ci, "indicator-messages"); + } + + return; +} + static void item_clicked_cb (GtkWidget *widget, gpointer data) { @@ -192,6 +206,12 @@ main (int argc, char ** argv) gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show(item); + item = gtk_check_menu_item_new_with_label ("Set Local Icon"); + g_signal_connect (item, "activate", + G_CALLBACK (local_icon_toggle_cb), ci); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show(item); + app_indicator_set_menu (ci, GTK_MENU (menu)); mainloop = g_main_loop_new(NULL, FALSE); -- cgit v1.2.3 From 8eb4f8efd00978a1680ac7ebdd1907aa55eaba30 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 16:22:22 -0600 Subject: Adding a dependency for the library on libindicator --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index f1ae2ea..cabaedd 100644 --- a/configure.ac +++ b/configure.ac @@ -53,6 +53,7 @@ AC_SUBST(INDICATOR_CFLAGS) AC_SUBST(INDICATOR_LIBS) PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) -- cgit v1.2.3 From 9f0ec1f915156311d8de7a629782252a4bce6e41 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 16:57:22 -0600 Subject: Start to flesh out the nicks side of building the menu items --- src/app-indicator.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 1805bd5..dc88e9b 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -37,6 +37,8 @@ License version 3 and version 2.1 along with this program. If not, see #include #include +#include + #include "app-indicator.h" #include "app-indicator-enum-types.h" #include "application-service-marshal.h" @@ -2106,6 +2108,18 @@ app_indicator_get_ordering_index (AppIndicator *self) } } +#define APP_INDICATOR_SHORTY_NICK "app-indicator-shorty-nick" + +/* Callback when an item from the desktop shortcuts gets + called. */ +static void +shorty_activated_cb (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data) +{ + + + return; +} + /** app_indicator_build_menu_from_desktop: @self: The #AppIndicator object to use @@ -2118,6 +2132,30 @@ void app_indicator_build_menu_from_desktop (AppIndicator * self, const gchar * desktop_file, const gchar * desktop_profile) { + /* Build a new shortcuts object */ + IndicatorDesktopShortcuts * shorties = indicator_desktop_shortcuts_new(desktop_file, desktop_profile); + g_return_if_fail(shorties != NULL); + const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(shorties); + int nick_num; + /* Place the items on a dbusmenu */ + DbusmenuMenuitem * root = dbusmenu_menuitem_new(); + + for (nick_num = 0; nicks[nick_num] != NULL; nick_num++) { + DbusmenuMenuitem * item = dbusmenu_menuitem_new(); + g_object_set_data(G_OBJECT(item), APP_INDICATOR_SHORTY_NICK, (gpointer)nicks[nick_num]); + + gchar * name = indicator_desktop_shortcuts_nick_get_name(shorties, nicks[nick_num]); + dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, name); + g_free(name); + + g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(shorty_activated_cb), self); + + dbusmenu_menuitem_child_append(root, item); + } + + /* Swap it if needed */ + + return; } -- cgit v1.2.3 From 1ec2b70ac16b031a4c7cc5398e9fb7a17bef4e4c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 20:10:54 -0600 Subject: Create a property for the dbusmenu server --- src/app-indicator.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 4f7daa8..25599a7 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -34,6 +34,7 @@ License version 3 and version 2.1 along with this program. If not, see #include #include +#include #include #include @@ -121,7 +122,8 @@ enum { PROP_X_LABEL, PROP_X_LABEL_GUIDE, PROP_ORDERING_INDEX, - PROP_X_ORDERING_INDEX + PROP_X_ORDERING_INDEX, + PROP_DBUS_MENU_SERVER }; /* The strings so that they can be slowly looked up. */ @@ -139,6 +141,7 @@ enum { #define PROP_X_LABEL_GUIDE_S ("x-ayatana-" PROP_LABEL_GUIDE_S) #define PROP_ORDERING_INDEX_S "ordering-index" #define PROP_X_ORDERING_INDEX_S ("x-ayatana-" PROP_ORDERING_INDEX_S) +#define PROP_DBUS_MENU_SERVER_S "dbus-menu-server" /* Private macro, shhhh! */ #define APP_INDICATOR_GET_PRIVATE(o) \ @@ -406,6 +409,19 @@ app_indicator_class_init (AppIndicatorClass *klass) "A wrapper, please don't use.", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** + AppIndicator:dbus-menu-server: + + A way to get the internal dbusmenu server if it is available. + This should only be used for testing. + */ + g_object_class_install_property(object_class, + PROP_DBUS_MENU_SERVER, + g_param_spec_object (PROP_DBUS_MENU_SERVER_S, + "The internal DBusmenu Server", + "DBusmenu server which is available for testing the application indicators.", + DBUSMENU_TYPE_MENUITEM, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* Signals */ -- cgit v1.2.3 From 00758f364ae486352c0e2aa076710ae74e3ce190 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 20:17:51 -0600 Subject: Set and Get for the dbusmenu server property --- src/app-indicator.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 25599a7..fd035ac 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -810,6 +810,14 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu priv->ordering_index = g_value_get_uint(value); break; + case PROP_DBUS_MENU_SERVER: + if (priv->menuservice != NULL) { + g_object_unref (priv->menuservice); + } + gpointer val = g_value_dup_object(value); + priv->menuservice = DBUSMENU_SERVER(val); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -882,6 +890,10 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa g_value_set_uint(value, priv->ordering_index); break; + case PROP_DBUS_MENU_SERVER: + g_value_set_object(value, priv->menuservice); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -- cgit v1.2.3 From 53d10c22f2df62a7ee96f7effa9f641bf638a627 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 21:05:29 -0600 Subject: Test setting the menu and verify it comes out --- tests/test-libappindicator.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 8d12ac5..7a1976c 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -25,6 +25,9 @@ with this program. If not, see . #include +#include +#include + void test_libappindicator_prop_signals_status_helper (AppIndicator * ci, gchar * status, gboolean * signalactivated) { @@ -224,6 +227,50 @@ test_libappindicator_set_label (void) return; } +void +test_libappindicator_set_menu (void) +{ + AppIndicator * ci = app_indicator_new ("my-id", + "my-name", + APP_INDICATOR_CATEGORY_APPLICATION_STATUS); + + g_assert(ci != NULL); + + GtkMenu * menu = GTK_MENU(gtk_menu_new()); + + GtkMenuItem * item = GTK_MENU_ITEM(gtk_menu_item_new_with_label("Test Label")); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(item)); + gtk_widget_show(GTK_WIDGET(item)); + + app_indicator_set_menu(ci, menu); + + g_assert(app_indicator_get_menu(ci) != NULL); + + GValue serverval = {0}; + g_value_init(&serverval, DBUSMENU_TYPE_SERVER); + g_object_get_property(G_OBJECT(ci), "dbus-menu-server", &serverval); + + DbusmenuServer * server = DBUSMENU_SERVER(g_value_get_object(&serverval)); + g_assert(server != NULL); + + GValue rootval = {0}; + g_value_init(&rootval, DBUSMENU_TYPE_MENUITEM); + g_object_get_property(G_OBJECT(server), DBUSMENU_SERVER_PROP_ROOT_NODE, &rootval); + DbusmenuMenuitem * root = DBUSMENU_MENUITEM(g_value_get_object(&rootval)); + g_assert(root != NULL); + + GList * children = dbusmenu_menuitem_get_children(root); + g_assert(children != NULL); + g_assert(g_list_length(children) == 1); + + const gchar * label = dbusmenu_menuitem_property_get(DBUSMENU_MENUITEM(children->data), DBUSMENU_MENUITEM_PROP_LABEL); + g_assert(label != NULL); + g_assert(g_strcmp0(label, "Test Label") == 0); + + g_object_unref(G_OBJECT(ci)); + return; +} + void label_signals_cb (AppIndicator * appindicator, gchar * label, gchar * guide, gpointer user_data) { @@ -301,6 +348,7 @@ test_libappindicator_props_suite (void) g_test_add_func ("/indicator-application/libappindicator/init_set_props", test_libappindicator_init_set_props); g_test_add_func ("/indicator-application/libappindicator/prop_signals", test_libappindicator_prop_signals); g_test_add_func ("/indicator-application/libappindicator/set_label", test_libappindicator_set_label); + g_test_add_func ("/indicator-application/libappindicator/set_menu", test_libappindicator_set_menu); g_test_add_func ("/indicator-application/libappindicator/label_signals", test_libappindicator_label_signals); return; -- cgit v1.2.3 From 8b57d12c54ec1befb09711439e40eac7ed93dbcd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 21:05:39 -0600 Subject: Set the property type correctly. --- src/app-indicator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index fd035ac..78d784a 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -420,7 +420,7 @@ app_indicator_class_init (AppIndicatorClass *klass) g_param_spec_object (PROP_DBUS_MENU_SERVER_S, "The internal DBusmenu Server", "DBusmenu server which is available for testing the application indicators.", - DBUSMENU_TYPE_MENUITEM, + DBUSMENU_TYPE_SERVER, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* Signals */ -- cgit v1.2.3 From d089c385b260d54d7521c277ebc875a3017d7f96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 21:25:00 -0600 Subject: Switching to be dbusmenu based instead of GTK menu based --- tests/test-libappindicator.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 82f3d05..00a8f19 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -353,15 +353,26 @@ test_libappindicator_desktop_menu (void) app_indicator_build_menu_from_desktop(ci, SRCDIR "/test-libappindicator.desktop", "Test Program"); - GtkMenu * menu = app_indicator_get_menu(ci); - g_assert(menu != NULL); + GValue serverval = {0}; + g_value_init(&serverval, DBUSMENU_TYPE_SERVER); + g_object_get_property(G_OBJECT(ci), "dbus-menu-server", &serverval); + + DbusmenuServer * server = DBUSMENU_SERVER(g_value_get_object(&serverval)); + g_assert(server != NULL); + + GValue rootval = {0}; + g_value_init(&rootval, DBUSMENU_TYPE_MENUITEM); + g_object_get_property(G_OBJECT(server), DBUSMENU_SERVER_PROP_ROOT_NODE, &rootval); + DbusmenuMenuitem * root = DBUSMENU_MENUITEM(g_value_get_object(&rootval)); + g_assert(root != NULL); - GList * children = gtk_container_get_children(GTK_CONTAINER(menu)); + GList * children = dbusmenu_menuitem_get_children(root); g_assert(children != NULL); g_assert(g_list_length(children) == 3); - g_object_unref(G_OBJECT(ci)); + + g_object_unref(G_OBJECT(ci)); return; } -- cgit v1.2.3 From 1d3ca65fb6f35c8b25f373d988d777fd6f8ce6f0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 21:32:01 -0600 Subject: Adding shorties as a private variable --- src/app-indicator.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 318a056..138498c 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -91,6 +91,9 @@ struct _AppIndicatorPrivate { DBusGProxy *watcher_proxy; DBusGConnection *connection; DBusGProxy * dbus_proxy; + + /* Might be used */ + IndicatorDesktopShortcuts * shorties; }; /* Signals Stuff */ @@ -568,6 +571,8 @@ app_indicator_init (AppIndicator *self) priv->status_icon = NULL; priv->fallback_timer = 0; + priv->shorties = NULL; + /* Put the object on DBus */ GError * error = NULL; priv->connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error); @@ -594,6 +599,11 @@ app_indicator_dispose (GObject *object) AppIndicator *self = APP_INDICATOR (object); AppIndicatorPrivate *priv = self->priv; + if (priv->shorties != NULL) { + g_object_unref(G_OBJECT(priv->shorties)); + priv->shorties = NULL; + } + if (priv->status != APP_INDICATOR_STATUS_PASSIVE) { app_indicator_set_status(self, APP_INDICATOR_STATUS_PASSIVE); } -- cgit v1.2.3 From 5c687d9de8dd774742a6a0e06ea443042fe91541 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 21:37:18 -0600 Subject: Switching to use the private variable for the shorties --- src/app-indicator.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 138498c..4643931 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -2169,12 +2169,18 @@ shorty_activated_cb (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data) void app_indicator_build_menu_from_desktop (AppIndicator * self, const gchar * desktop_file, const gchar * desktop_profile) { + g_return_if_fail(IS_APP_INDICATOR(self)); + AppIndicatorPrivate *priv = self->priv; /* Build a new shortcuts object */ - IndicatorDesktopShortcuts * shorties = indicator_desktop_shortcuts_new(desktop_file, desktop_profile); - g_return_if_fail(shorties != NULL); + if (priv->shorties != NULL) { + g_object_unref(priv->shorties); + priv->shorties = NULL; + } + priv->shorties = indicator_desktop_shortcuts_new(desktop_file, desktop_profile); + g_return_if_fail(priv->shorties != NULL); - const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(shorties); + const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(priv->shorties); int nick_num; /* Place the items on a dbusmenu */ @@ -2184,7 +2190,7 @@ app_indicator_build_menu_from_desktop (AppIndicator * self, const gchar * deskto DbusmenuMenuitem * item = dbusmenu_menuitem_new(); g_object_set_data(G_OBJECT(item), APP_INDICATOR_SHORTY_NICK, (gpointer)nicks[nick_num]); - gchar * name = indicator_desktop_shortcuts_nick_get_name(shorties, nicks[nick_num]); + gchar * name = indicator_desktop_shortcuts_nick_get_name(priv->shorties, nicks[nick_num]); dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, name); g_free(name); -- cgit v1.2.3 From 2d87c7a295d0eb4681ed65a709c77ef47a421bf7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 21:48:35 -0600 Subject: Setup the menu as a dbusmenu if we build it --- src/app-indicator.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 4643931..ee18cad 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -2200,6 +2200,18 @@ app_indicator_build_menu_from_desktop (AppIndicator * self, const gchar * deskto } /* Swap it if needed */ + if (priv->menuservice == NULL) { + gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->clean_id); + priv->menuservice = dbusmenu_server_new (path); + g_free(path); + } + + dbusmenu_server_set_root (priv->menuservice, root); + + if (priv->menu != NULL) { + g_object_unref(G_OBJECT(priv->menu)); + priv->menu = NULL; + } return; } -- cgit v1.2.3 From 9bde70f2f1b96fe335dc11c941f64784c8f258f0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 21:52:59 -0600 Subject: Filling out the activate function. --- src/app-indicator.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index ee18cad..199e256 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -2153,7 +2153,16 @@ app_indicator_get_ordering_index (AppIndicator *self) static void shorty_activated_cb (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data) { + gchar * nick = g_object_get_data(G_OBJECT(mi), APP_INDICATOR_SHORTY_NICK); + g_return_if_fail(nick != NULL); + g_return_if_fail(IS_APP_INDICATOR(user_data)); + AppIndicator * self = APP_INDICATOR(user_data); + AppIndicatorPrivate *priv = self->priv; + + g_return_if_fail(priv->shorties != NULL); + + indicator_desktop_shortcuts_nick_exec(priv->shorties, nick); return; } -- cgit v1.2.3 From 178f821b27fd31a5059d76a9ccc0cf9ff551e35b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 22:11:03 -0600 Subject: Clearing the events before unrefing --- tests/test-libappindicator.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 7a1976c..ece2df0 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -267,6 +267,13 @@ test_libappindicator_set_menu (void) g_assert(label != NULL); g_assert(g_strcmp0(label, "Test Label") == 0); + /* Interesting, eh? We need this because we send out events on the bus + but they don't come back until the idle is run. So we need those + events to clear before removing the object */ + while (g_main_context_pending(NULL)) { + g_main_context_iteration(NULL, TRUE); + } + g_object_unref(G_OBJECT(ci)); return; } -- cgit v1.2.3 From ca62d8c2fa745e4d033a9b6c79b146b1bbb86a2f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 22:18:55 -0600 Subject: Changing the ID to ensure we get different paths --- tests/test-libappindicator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 3860b69..46460f0 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -350,7 +350,7 @@ test_libappindicator_label_signals (void) void test_libappindicator_desktop_menu (void) { - AppIndicator * ci = app_indicator_new ("my-id", + AppIndicator * ci = app_indicator_new ("my-id-desktop-menu", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS); -- cgit v1.2.3 From aad192611ca84bfabc036658066ea584385f0982 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 22:21:11 -0600 Subject: Fleshing out a function to see if an invalid name results in no entries --- tests/test-libappindicator.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 46460f0..cadf783 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -386,9 +386,34 @@ test_libappindicator_desktop_menu (void) void test_libappindicator_desktop_menu_bad (void) { + AppIndicator * ci = app_indicator_new ("my-id-desktop-menu-bad", + "my-name", + APP_INDICATOR_CATEGORY_APPLICATION_STATUS); + + g_assert(ci != NULL); + g_assert(app_indicator_get_label(ci) == NULL); + g_assert(app_indicator_get_label_guide(ci) == NULL); + + app_indicator_build_menu_from_desktop(ci, SRCDIR "/test-libappindicator.desktop", "Not Test Program"); + + GValue serverval = {0}; + g_value_init(&serverval, DBUSMENU_TYPE_SERVER); + g_object_get_property(G_OBJECT(ci), "dbus-menu-server", &serverval); + DbusmenuServer * server = DBUSMENU_SERVER(g_value_get_object(&serverval)); + g_assert(server != NULL); + GValue rootval = {0}; + g_value_init(&rootval, DBUSMENU_TYPE_MENUITEM); + g_object_get_property(G_OBJECT(server), DBUSMENU_SERVER_PROP_ROOT_NODE, &rootval); + DbusmenuMenuitem * root = DBUSMENU_MENUITEM(g_value_get_object(&rootval)); + g_assert(root != NULL); + + GList * children = dbusmenu_menuitem_get_children(root); + g_assert(g_list_length(children) == 0); + g_object_unref(G_OBJECT(ci)); + return; } void -- cgit v1.2.3 From c2e08e008bd9ea4f43a15390e6e4116cc714521a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 22:29:42 -0600 Subject: Documentation fixes for distcheck --- docs/reference/libappindicator-sections.txt | 1 + src/app-indicator.c | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/reference/libappindicator-sections.txt b/docs/reference/libappindicator-sections.txt index e0effd1..41ff7fa 100644 --- a/docs/reference/libappindicator-sections.txt +++ b/docs/reference/libappindicator-sections.txt @@ -38,5 +38,6 @@ app_indicator_get_menu app_indicator_get_label app_indicator_get_label_guide app_indicator_get_ordering_index +app_indicator_build_menu_from_desktop diff --git a/src/app-indicator.c b/src/app-indicator.c index 199e256..146bee2 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -2171,6 +2171,7 @@ shorty_activated_cb (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data) app_indicator_build_menu_from_desktop: @self: The #AppIndicator object to use @desktop_file: A path to the desktop file to build the menu from + @desktop_profile: Which entries should be used from the desktop file This function allows for building the Application Indicator menu from a static desktop file. -- cgit v1.2.3 From f8e822fde727d44471a7ad31d16458c92cb9af49 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:35:51 -0600 Subject: Promoting the LGPLv3 --- COPYING | 827 +++++++++++---------------------------------------------- COPYING.LGPL.3 | 165 ------------ 2 files changed, 159 insertions(+), 833 deletions(-) delete mode 100644 COPYING.LGPL.3 diff --git a/COPYING b/COPYING index 94a9ed0..fc8a5de 100644 --- a/COPYING +++ b/COPYING @@ -1,674 +1,165 @@ - GNU GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program 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, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/COPYING.LGPL.3 b/COPYING.LGPL.3 deleted file mode 100644 index fc8a5de..0000000 --- a/COPYING.LGPL.3 +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. -- cgit v1.2.3 From 2367242bfbfca9adfb5e445c04166cd2df7cdde2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:37:25 -0600 Subject: Changing the name to libappindicator in the base build files --- autogen.sh | 2 +- configure.ac | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index e8fc803..2058d34 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh -PKG_NAME="indicator-application" +PKG_NAME="liappindicator" which gnome-autogen.sh || { echo "You need gnome-common from GNOME SVN" diff --git a/configure.ac b/configure.ac index 0ecea51..e3c3fdf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.2.9, ted@canonical.com) +AC_INIT(libappindicator, 0.2.90, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.2.9) +AM_INIT_AUTOMAKE(libappindicator, 0.2.90) AM_MAINTAINER_MODE @@ -213,7 +213,7 @@ docs/reference/libappindicator-docs.sgml AC_MSG_NOTICE([ -Application Indicator Configuration: +Libappindicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR -- cgit v1.2.3 From e9a363f2e84e101199cc3c2ab38b00cbe2ac8da2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:38:40 -0600 Subject: Removing data directory --- Makefile.am | 5 ++--- configure.ac | 1 - data/Makefile.am | 17 ----------------- data/indicator-application.service.in | 3 --- data/ordering-override.keyfile | 5 ----- 5 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 data/Makefile.am delete mode 100644 data/indicator-application.service.in delete mode 100644 data/ordering-override.keyfile diff --git a/Makefile.am b/Makefile.am index 98e4a88..0de0f59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = data \ - src \ +SUBDIRS = \ + src \ bindings \ example \ tests \ @@ -12,7 +12,6 @@ EXTRA_DIST = \ xmldocs.make \ autogen.sh \ COPYING.LGPL.2.1 \ - COPYING.LGPL.3 \ ChangeLog DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-localinstall --enable-introspection diff --git a/configure.ac b/configure.ac index e3c3fdf..4346b0e 100644 --- a/configure.ac +++ b/configure.ac @@ -198,7 +198,6 @@ bindings/mono/appindicator-sharp-0.1.pc bindings/mono/examples/Makefile bindings/mono/examples/indicator-example bindings/python/Makefile -data/Makefile tests/Makefile example/Makefile docs/Makefile diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index c142c4e..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ - -dbus_servicesdir = $(DBUSSERVICEDIR) -dbus_services_DATA = indicator-application.service - -%.service: %.service.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - -overridedir = $(pkgdatadir) -override_DATA = ordering-override.keyfile - -EXTRA_DIST = \ - indicator-application.service.in \ - ordering-override.keyfile - -CLEANFILES = \ - indicator-application.service - diff --git a/data/indicator-application.service.in b/data/indicator-application.service.in deleted file mode 100644 index 83e430a..0000000 --- a/data/indicator-application.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.ayatana.indicator.application -Exec=@libexecdir@/indicator-application-service diff --git a/data/ordering-override.keyfile b/data/ordering-override.keyfile deleted file mode 100644 index 71d7c1a..0000000 --- a/data/ordering-override.keyfile +++ /dev/null @@ -1,5 +0,0 @@ -[Ordering Index Overrides] -gnome-power-manager=1 -gst-keyboard-xkb=2 -gsd-keyboard-xkb=3 -ibus=4 -- cgit v1.2.3 From 1dc185e7c8d76f717a2a3bc21410ca280687b521 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:42:29 -0600 Subject: Removing the INDICATOR based compiler fun --- configure.ac | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/configure.ac b/configure.ac index 325713e..fbccf0a 100644 --- a/configure.ac +++ b/configure.ac @@ -40,18 +40,8 @@ AC_CONFIG_MACRO_DIR(m4) GTK_REQUIRED_VERSION=2.12 INDICATOR_REQUIRED_VERSION=0.3.5 DBUSMENUGTK_REQUIRED_VERSION=0.2.2 -JSON_GLIB_REQUIRED_VERSION=0.7.6 DBUS_GLIB_REQUIRED_VERSION=0.82 -PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) - -AC_SUBST(INDICATOR_CFLAGS) -AC_SUBST(INDICATOR_LIBS) - PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) -- cgit v1.2.3 From e1a62d349773dcda39e65fac9698f21c0f331e45 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:46:50 -0600 Subject: Dropping the service and indicator files --- src/Makefile.am | 62 -- src/application-service-appstore.c | 1305 ------------------------------------ src/application-service-appstore.h | 73 -- src/application-service-watcher.c | 302 --------- src/application-service-watcher.h | 61 -- src/application-service.c | 78 --- src/application-service.xml | 59 -- src/dbus-properties.xml | 23 - src/indicator-application.c | 872 ------------------------ src/notification-approver.xml | 29 - 10 files changed, 2864 deletions(-) delete mode 100644 src/application-service-appstore.c delete mode 100644 src/application-service-appstore.h delete mode 100644 src/application-service-watcher.c delete mode 100644 src/application-service-watcher.h delete mode 100644 src/application-service.c delete mode 100644 src/application-service.xml delete mode 100644 src/dbus-properties.xml delete mode 100644 src/indicator-application.c delete mode 100644 src/notification-approver.xml diff --git a/src/Makefile.am b/src/Makefile.am index 091f0f2..c85f0e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,65 +6,6 @@ EXTRA_DIST = appindicator-0.1.pc.in include $(top_srcdir)/Makefile.am.enum include $(top_srcdir)/Makefile.am.marshal -################################## -# Indicator -################################## - -applicationlibdir = $(INDICATORDIR) -applicationlib_LTLIBRARIES = libapplication.la -libapplication_la_SOURCES = \ - application-service-marshal.c \ - dbus-shared.h \ - indicator-application.c -libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \ - -Wall \ - -Wl,-Bsymbolic-functions \ - -Wl,-z,defs \ - -Wl,--as-needed \ - -Werror \ - -DG_LOG_DOMAIN=\"Indicator-Application\" -libapplication_la_LIBADD = $(INDICATOR_LIBS) -libapplication_la_LDFLAGS = -module -avoid-version - -################################## -# Service -################################## - -libexec_PROGRAMS = indicator-application-service - -BUILT_SOURCES += \ - application-service-server.h \ - application-service-marshal.h \ - application-service-marshal.c \ - dbus-properties-client.h \ - notification-item-client.h \ - notification-watcher-server.h - -indicator_application_service_SOURCES = \ - application-service.c \ - application-service-appstore.h \ - application-service-appstore.c \ - application-service-marshal.c \ - application-service-watcher.h \ - application-service-watcher.c \ - app-indicator-enum-types.c \ - dbus-shared.h \ - generate-id.h \ - generate-id.c - -indicator_application_service_CFLAGS = \ - $(INDICATOR_CFLAGS) \ - -DDATADIR="\"$(pkgdatadir)\"" \ - -Wall -Werror \ - -DG_LOG_DOMAIN=\"indicator-application-service\" - -indicator_application_service_LDADD = \ - $(INDICATOR_LIBS) \ - libappindicator.la - -glib_marshal_list = application-service-marshal.list -glib_marshal_prefix = _application_service_marshal - ################################## # Library ################################## @@ -120,9 +61,6 @@ libappindicator_la_LIBADD = \ ################################## DBUS_SPECS = \ - dbus-properties.xml \ - application-service.xml \ - notification-approver.xml \ notification-item.xml \ notification-watcher.xml diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c deleted file mode 100644 index e3befff..0000000 --- a/src/application-service-appstore.c +++ /dev/null @@ -1,1305 +0,0 @@ -/* -An object that stores the registration of all the application -indicators. It also communicates this to the indicator visualization. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould - -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. - -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. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include "app-indicator.h" -#include "app-indicator-enum-types.h" -#include "application-service-appstore.h" -#include "application-service-marshal.h" -#include "dbus-properties-client.h" -#include "dbus-shared.h" -#include "notification-approver-client.h" -#include "generate-id.h" - -/* DBus Prototypes */ -static gboolean _application_service_server_get_applications (ApplicationServiceAppstore * appstore, GPtrArray ** apps, GError ** error); - -#include "application-service-server.h" - -#define NOTIFICATION_ITEM_PROP_ID "Id" -#define NOTIFICATION_ITEM_PROP_CATEGORY "Category" -#define NOTIFICATION_ITEM_PROP_STATUS "Status" -#define NOTIFICATION_ITEM_PROP_ICON_NAME "IconName" -#define NOTIFICATION_ITEM_PROP_AICON_NAME "AttentionIconName" -#define NOTIFICATION_ITEM_PROP_ICON_THEME_PATH "IconThemePath" -#define NOTIFICATION_ITEM_PROP_MENU "Menu" -#define NOTIFICATION_ITEM_PROP_LABEL "XAyatanaLabel" -#define NOTIFICATION_ITEM_PROP_LABEL_GUIDE "XAyatanaLabelGuide" -#define NOTIFICATION_ITEM_PROP_ORDERING_INDEX "XAyatanaOrderingIndex" - -#define NOTIFICATION_ITEM_SIG_NEW_ICON "NewIcon" -#define NOTIFICATION_ITEM_SIG_NEW_AICON "NewAttentionIcon" -#define NOTIFICATION_ITEM_SIG_NEW_STATUS "NewStatus" -#define NOTIFICATION_ITEM_SIG_NEW_LABEL "XAyatanaNewLabel" -#define NOTIFICATION_ITEM_SIG_NEW_ICON_THEME_PATH "NewIconThemePath" - -#define OVERRIDE_GROUP_NAME "Ordering Index Overrides" -#define OVERRIDE_FILE_NAME "ordering-override.keyfile" - -/* Private Stuff */ -struct _ApplicationServiceAppstorePrivate { - DBusGConnection * bus; - GList * applications; - GList * approvers; - GHashTable * ordering_overrides; -}; - -typedef enum { - VISIBLE_STATE_HIDDEN, - VISIBLE_STATE_SHOWN -} visible_state_t; - -#define STATE2STRING(x) ((x) == VISIBLE_STATE_HIDDEN ? "hidden" : "visible") - -typedef struct _Approver Approver; -struct _Approver { - DBusGProxy * proxy; - gboolean destroy_by_proxy; -}; - -typedef struct _Application Application; -struct _Application { - gchar * id; - gchar * category; - gchar * dbus_name; - gchar * dbus_object; - ApplicationServiceAppstore * appstore; /* not ref'd */ - DBusGProxy * dbus_proxy; - DBusGProxy * prop_proxy; - gboolean validated; /* Whether we've gotten all the parameters and they look good. */ - AppIndicatorStatus status; - gchar * icon; - gchar * aicon; - gchar * menu; - gchar * icon_theme_path; - gchar * label; - gchar * guide; - gboolean currently_free; - guint ordering_index; - GList * approved_by; - visible_state_t visible_state; -}; - -#define APPLICATION_SERVICE_APPSTORE_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstorePrivate)) - -/* Signals Stuff */ -enum { - APPLICATION_ADDED, - APPLICATION_REMOVED, - APPLICATION_ICON_CHANGED, - APPLICATION_LABEL_CHANGED, - APPLICATION_ICON_THEME_PATH_CHANGED, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - -/* GObject stuff */ -static void application_service_appstore_class_init (ApplicationServiceAppstoreClass *klass); -static void application_service_appstore_init (ApplicationServiceAppstore *self); -static void application_service_appstore_dispose (GObject *object); -static void application_service_appstore_finalize (GObject *object); -static gint app_sort_func (gconstpointer a, gconstpointer b, gpointer userdata); -static void load_override_file (GHashTable * hash, const gchar * filename); -static AppIndicatorStatus string_to_status(const gchar * status_string); -static void apply_status (Application * app); -static AppIndicatorCategory string_to_cat(const gchar * cat_string); -static void approver_free (gpointer papprover, gpointer user_data); -static void check_with_new_approver (gpointer papp, gpointer papprove); -static void check_with_old_approver (gpointer papprove, gpointer papp); -static Application * find_application (ApplicationServiceAppstore * appstore, const gchar * address, const gchar * object); - -G_DEFINE_TYPE (ApplicationServiceAppstore, application_service_appstore, G_TYPE_OBJECT); - -static void -application_service_appstore_class_init (ApplicationServiceAppstoreClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (ApplicationServiceAppstorePrivate)); - - object_class->dispose = application_service_appstore_dispose; - object_class->finalize = application_service_appstore_finalize; - - signals[APPLICATION_ADDED] = g_signal_new ("application-added", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_added), - NULL, NULL, - _application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING, - G_TYPE_NONE, 7, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_NONE); - signals[APPLICATION_REMOVED] = g_signal_new ("application-removed", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_removed), - NULL, NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, 1, G_TYPE_INT, G_TYPE_NONE); - signals[APPLICATION_ICON_CHANGED] = g_signal_new ("application-icon-changed", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_icon_changed), - NULL, NULL, - _application_service_marshal_VOID__INT_STRING, - G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING, G_TYPE_NONE); - signals[APPLICATION_ICON_THEME_PATH_CHANGED] = g_signal_new ("application-icon-theme-path-changed", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_icon_theme_path_changed), - NULL, NULL, - _application_service_marshal_VOID__INT_STRING, - G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING, G_TYPE_NONE); - signals[APPLICATION_LABEL_CHANGED] = g_signal_new ("application-label-changed", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_label_changed), - NULL, NULL, - _application_service_marshal_VOID__INT_STRING_STRING, - G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_NONE); - - dbus_g_object_register_marshaller(_application_service_marshal_VOID__STRING_STRING, - G_TYPE_NONE, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_object_register_marshaller(_application_service_marshal_VOID__BOOLEAN_STRING_OBJECT, - G_TYPE_NONE, - G_TYPE_BOOLEAN, - G_TYPE_STRING, - G_TYPE_OBJECT, - G_TYPE_INVALID); - - dbus_g_object_type_install_info(APPLICATION_SERVICE_APPSTORE_TYPE, - &dbus_glib__application_service_server_object_info); - - return; -} - -static void -application_service_appstore_init (ApplicationServiceAppstore *self) -{ - - ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE_GET_PRIVATE (self); - - priv->applications = NULL; - priv->approvers = NULL; - - priv->ordering_overrides = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); - - load_override_file(priv->ordering_overrides, DATADIR "/" OVERRIDE_FILE_NAME); - gchar * userfile = g_build_filename(g_get_user_data_dir(), "indicators", "application", OVERRIDE_FILE_NAME, NULL); - load_override_file(priv->ordering_overrides, userfile); - g_free(userfile); - - GError * error = NULL; - priv->bus = dbus_g_bus_get(DBUS_BUS_STARTER, &error); - if (error != NULL) { - g_error("Unable to get session bus: %s", error->message); - g_error_free(error); - return; - } - - dbus_g_connection_register_g_object(priv->bus, - INDICATOR_APPLICATION_DBUS_OBJ, - G_OBJECT(self)); - - self->priv = priv; - - return; -} - -static void -application_service_appstore_dispose (GObject *object) -{ - ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE(object)->priv; - - while (priv->applications != NULL) { - application_service_appstore_application_remove(APPLICATION_SERVICE_APPSTORE(object), - ((Application *)priv->applications->data)->dbus_name, - ((Application *)priv->applications->data)->dbus_object); - } - - if (priv->approvers != NULL) { - g_list_foreach(priv->approvers, approver_free, object); - g_list_free(priv->approvers); - priv->approvers = NULL; - } - - G_OBJECT_CLASS (application_service_appstore_parent_class)->dispose (object); - return; -} - -static void -application_service_appstore_finalize (GObject *object) -{ - ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE(object)->priv; - - if (priv->ordering_overrides != NULL) { - g_hash_table_destroy(priv->ordering_overrides); - priv->ordering_overrides = NULL; - } - - G_OBJECT_CLASS (application_service_appstore_parent_class)->finalize (object); - return; -} - -/* Loads the file and adds the override entries to the table - of overrides */ -static void -load_override_file (GHashTable * hash, const gchar * filename) -{ - g_return_if_fail(hash != NULL); - g_return_if_fail(filename != NULL); - - if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { - return; - } - - g_debug("Loading overrides from: '%s'", filename); - - GError * error = NULL; - GKeyFile * keyfile = g_key_file_new(); - g_key_file_load_from_file(keyfile, filename, G_KEY_FILE_NONE, &error); - - if (error != NULL) { - g_warning("Unable to load keyfile '%s' because: %s", filename, error->message); - g_error_free(error); - g_key_file_free(keyfile); - return; - } - - gchar ** keys = g_key_file_get_keys(keyfile, OVERRIDE_GROUP_NAME, NULL, &error); - if (error != NULL) { - g_warning("Unable to get keys from keyfile '%s' because: %s", filename, error->message); - g_error_free(error); - g_key_file_free(keyfile); - return; - } - - gchar * key = keys[0]; - gint i; - - for (i = 0; (key = keys[i]) != NULL; i++) { - GError * valerror = NULL; - gint val = g_key_file_get_integer(keyfile, OVERRIDE_GROUP_NAME, key, &valerror); - - if (valerror != NULL) { - g_warning("Unable to get key '%s' out of file '%s' because: %s", key, filename, valerror->message); - g_error_free(valerror); - continue; - } - g_debug("%s: override '%s' with value '%d'", filename, key, val); - - g_hash_table_insert(hash, g_strdup(key), GINT_TO_POINTER(val)); - } - g_strfreev(keys); - g_key_file_free(keyfile); - - return; -} - -/* Return from getting the properties from the item. We're looking at those - and making sure we have everythign that we need. If we do, then we'll - move on up to sending this onto the indicator. */ -static void -get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data) -{ - if (error != NULL) { - g_warning("Unable to get properties: %s", error->message); - /* TODO: We need to free all the application data here */ - return; - } - - Application * app = (Application *)data; - - if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU) == NULL || - g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ID) == NULL || - g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_CATEGORY) == NULL || - g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_STATUS) == NULL || - g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME) == NULL) { - g_warning("Notification Item on object %s of %s doesn't have enough properties.", app->dbus_object, app->dbus_name); - g_free(app); // Need to do more than this, but it gives the idea of the flow we're going for. - return; - } - - app->validated = TRUE; - - app->id = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ID)); - app->category = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_CATEGORY)); - app->status = string_to_status(g_value_get_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_STATUS))); - - ApplicationServiceAppstorePrivate * priv = app->appstore->priv; - - app->icon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME)); - - GValue * menuval = (GValue *)g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU); - if (G_VALUE_TYPE(menuval) == G_TYPE_STRING) { - /* This is here to support an older version where we - were using strings instea of object paths. */ - app->menu = g_value_dup_string(menuval); - } else { - app->menu = g_strdup((gchar *)g_value_get_boxed(menuval)); - } - - if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME) != NULL) { - app->aicon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME)); - } - - gpointer icon_theme_path_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_THEME_PATH); - if (icon_theme_path_data != NULL) { - app->icon_theme_path = g_value_dup_string((GValue *)icon_theme_path_data); - } else { - app->icon_theme_path = g_strdup(""); - } - - gpointer ordering_index_over = g_hash_table_lookup(priv->ordering_overrides, app->id); - if (ordering_index_over == NULL) { - gpointer ordering_index_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ORDERING_INDEX); - if (ordering_index_data == NULL || g_value_get_uint(ordering_index_data) == 0) { - app->ordering_index = generate_id(string_to_cat(app->category), app->id); - } else { - app->ordering_index = g_value_get_uint(ordering_index_data); - } - } else { - app->ordering_index = GPOINTER_TO_UINT(ordering_index_over); - } - g_debug("'%s' ordering index is '%X'", app->id, app->ordering_index); - - gpointer label_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_LABEL); - if (label_data != NULL) { - app->label = g_value_dup_string((GValue *)label_data); - } else { - app->label = g_strdup(""); - } - - gpointer guide_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_LABEL_GUIDE); - if (guide_data != NULL) { - app->guide = g_value_dup_string((GValue *)guide_data); - } else { - app->guide = g_strdup(""); - } - - priv->applications = g_list_insert_sorted_with_data (priv->applications, app, app_sort_func, NULL); - g_list_foreach(priv->approvers, check_with_old_approver, app); - - apply_status(app); - - return; -} - -/* Check the application against an approver */ -static void -check_with_old_approver (gpointer papprove, gpointer papp) -{ - /* Funny the parallels, eh? */ - check_with_new_approver(papp, papprove); - return; -} - -/* Simple translation function -- could be optimized */ -static AppIndicatorStatus -string_to_status(const gchar * status_string) -{ - GEnumClass * klass = G_ENUM_CLASS(g_type_class_ref(APP_INDICATOR_TYPE_INDICATOR_STATUS)); - g_return_val_if_fail(klass != NULL, APP_INDICATOR_STATUS_PASSIVE); - - AppIndicatorStatus retval = APP_INDICATOR_STATUS_PASSIVE; - - GEnumValue * val = g_enum_get_value_by_nick(klass, status_string); - if (val == NULL) { - g_warning("Unrecognized status '%s' assuming passive.", status_string); - } else { - retval = (AppIndicatorStatus)val->value; - } - - g_type_class_unref(klass); - - return retval; -} - -/* Simple translation function -- could be optimized */ -static AppIndicatorCategory -string_to_cat(const gchar * cat_string) -{ - GEnumClass * klass = G_ENUM_CLASS(g_type_class_ref(APP_INDICATOR_TYPE_INDICATOR_CATEGORY)); - g_return_val_if_fail(klass != NULL, APP_INDICATOR_CATEGORY_OTHER); - - AppIndicatorCategory retval = APP_INDICATOR_CATEGORY_OTHER; - - GEnumValue * val = g_enum_get_value_by_nick(klass, cat_string); - if (val == NULL) { - g_warning("Unrecognized status '%s' assuming other.", cat_string); - } else { - retval = (AppIndicatorCategory)val->value; - } - - g_type_class_unref(klass); - - return retval; -} - - -/* A small helper function to get the position of an application - in the app list of the applications that are visible. */ -static gint -get_position (Application * app) { - ApplicationServiceAppstore * appstore = app->appstore; - ApplicationServiceAppstorePrivate * priv = appstore->priv; - - GList * lapp; - gint count; - - /* Go through the list and try to find ours */ - for (lapp = priv->applications, count = 0; lapp != NULL; lapp = g_list_next(lapp), count++) { - if (lapp->data == app) { - break; - } - - /* If the selected app isn't visible let's not - count it's position */ - Application * thisapp = (Application *)(lapp->data); - if (thisapp->visible_state == VISIBLE_STATE_HIDDEN) { - count--; - } - } - - if (lapp == NULL) { - g_warning("Unable to find position for app '%s'", app->id); - return -1; - } - - return count; -} - -/* A simple global function for dealing with freeing the information - in an Application structure */ -static void -application_free (Application * app) -{ - if (app == NULL) return; - g_debug("Application free '%s'", app->id); - - /* Handle the case where this could be called by unref'ing one of - the proxy objects. */ - if (app->currently_free) return; - app->currently_free = TRUE; - - if (app->dbus_proxy) { - g_object_unref(app->dbus_proxy); - } - if (app->prop_proxy) { - g_object_unref(app->prop_proxy); - } - - if (app->id != NULL) { - g_free(app->id); - } - if (app->category != NULL) { - g_free(app->category); - } - if (app->dbus_name != NULL) { - g_free(app->dbus_name); - } - if (app->dbus_object != NULL) { - g_free(app->dbus_object); - } - if (app->icon != NULL) { - g_free(app->icon); - } - if (app->aicon != NULL) { - g_free(app->aicon); - } - if (app->menu != NULL) { - g_free(app->menu); - } - if (app->icon_theme_path != NULL) { - g_free(app->icon_theme_path); - } - if (app->label != NULL) { - g_free(app->label); - } - if (app->guide != NULL) { - g_free(app->guide); - } - if (app->approved_by != NULL) { - g_list_free(app->approved_by); - } - - g_free(app); - return; -} - -/* Gets called when the proxy is destroyed, which is usually when it - drops off of the bus. */ -static void -application_removed_cb (DBusGProxy * proxy, gpointer userdata) -{ - Application * app = (Application *)userdata; - g_debug("Application proxy destroyed '%s'", app->id); - - /* Remove from the panel */ - app->status = APP_INDICATOR_STATUS_PASSIVE; - apply_status(app); - - /* Remove from the application list */ - app->appstore->priv->applications = g_list_remove(app->appstore->priv->applications, app); - - /* Destroy the data */ - application_free(app); - return; -} - -/* This function takes two Application structure - pointers and uses their ordering index to compare them. */ -static gint -app_sort_func (gconstpointer a, gconstpointer b, gpointer userdata) -{ - Application * appa = (Application *)a; - Application * appb = (Application *)b; - return (appb->ordering_index/2) - (appa->ordering_index/2); -} - -/* Change the status of the application. If we're going passive - it removes it from the panel. If we're coming online, then - it add it to the panel. Otherwise it changes the icon. */ -static void -apply_status (Application * app) -{ - ApplicationServiceAppstore * appstore = app->appstore; - ApplicationServiceAppstorePrivate * priv = appstore->priv; - - /* g_debug("Applying status. Status: %d Approved by: %d Approvers: %d Visible: %d", app->status, g_list_length(app->approved_by), g_list_length(priv->approvers), app->visible_state); */ - - visible_state_t goal_state = VISIBLE_STATE_HIDDEN; - - if (app->status != APP_INDICATOR_STATUS_PASSIVE && - g_list_length(app->approved_by) >= g_list_length(priv->approvers)) { - goal_state = VISIBLE_STATE_SHOWN; - } - - /* Nothing needs to change, we're good */ - if (app->visible_state == goal_state /* ) { */ - && goal_state == VISIBLE_STATE_HIDDEN) { - /* TODO: Uhg, this is a little wrong in that we're going to - send an icon every time the status changes and the indicator - is visible even though it might not be updating. But, at - this point we need a small patch that is harmless. In the - future we need to track which icon is shown and remove the - duplicate message. */ - return; - } - - g_debug("Changing app '%s' state from %s to %s", app->id, STATE2STRING(app->visible_state), STATE2STRING(goal_state)); - - /* This means we're going off line */ - if (goal_state == VISIBLE_STATE_HIDDEN) { - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(G_OBJECT(appstore), - signals[APPLICATION_REMOVED], 0, - position, TRUE); - } else { - /* Figure out which icon we should be using */ - gchar * newicon = app->icon; - if (app->status == APP_INDICATOR_STATUS_ATTENTION && app->aicon != NULL && app->aicon[0] != '\0') { - newicon = app->aicon; - } - - /* Determine whether we're already shown or not */ - if (app->visible_state == VISIBLE_STATE_HIDDEN) { - /* Put on panel */ - g_signal_emit(G_OBJECT(app->appstore), - signals[APPLICATION_ADDED], 0, - newicon, - get_position(app), /* Position */ - app->dbus_name, - app->menu, - app->icon_theme_path, - app->label, - app->guide, - TRUE); - } else { - /* Icon update */ - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(G_OBJECT(appstore), - signals[APPLICATION_ICON_CHANGED], 0, - position, newicon, TRUE); - } - } - - app->visible_state = goal_state; - - return; -} - -/* Gets the data back on an updated icon signal. Hopefully - a new fun icon. */ -static void -new_icon_cb (DBusGProxy * proxy, GValue value, GError * error, gpointer userdata) -{ - /* Check for errors */ - if (error != NULL) { - g_warning("Unable to get updated icon name: %s", error->message); - return; - } - - /* Grab the icon and make sure we have one */ - const gchar * newicon = g_value_get_string(&value); - if (newicon == NULL) { - g_warning("Bad new icon :("); - return; - } - - Application * app = (Application *) userdata; - - if (g_strcmp0(newicon, app->icon)) { - /* If the new icon is actually a new icon */ - if (app->icon != NULL) g_free(app->icon); - app->icon = g_strdup(newicon); - - if (app->visible_state == VISIBLE_STATE_SHOWN && app->status == APP_INDICATOR_STATUS_ACTIVE) { - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(G_OBJECT(app->appstore), - signals[APPLICATION_ICON_CHANGED], 0, - position, newicon, TRUE); - } - } - - return; -} - -/* Gets the data back on an updated aicon signal. Hopefully - a new fun icon. */ -static void -new_aicon_cb (DBusGProxy * proxy, GValue value, GError * error, gpointer userdata) -{ - /* Check for errors */ - if (error != NULL) { - g_warning("Unable to get updated icon name: %s", error->message); - return; - } - - /* Grab the icon and make sure we have one */ - const gchar * newicon = g_value_get_string(&value); - if (newicon == NULL) { - g_warning("Bad new icon :("); - return; - } - - Application * app = (Application *) userdata; - - if (g_strcmp0(newicon, app->aicon)) { - /* If the new icon is actually a new icon */ - if (app->aicon != NULL) g_free(app->aicon); - app->aicon = g_strdup(newicon); - - if (app->visible_state == VISIBLE_STATE_SHOWN && app->status == APP_INDICATOR_STATUS_ATTENTION) { - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(G_OBJECT(app->appstore), - signals[APPLICATION_ICON_CHANGED], 0, - position, newicon, TRUE); - } - } - - return; -} - -/* Called when the Notification Item signals that it - has a new icon. */ -static void -new_icon (DBusGProxy * proxy, gpointer data) -{ - Application * app = (Application *)data; - if (!app->validated) return; - - org_freedesktop_DBus_Properties_get_async(app->prop_proxy, - NOTIFICATION_ITEM_DBUS_IFACE, - NOTIFICATION_ITEM_PROP_ICON_NAME, - new_icon_cb, - app); - return; -} - -/* Called when the Notification Item signals that it - has a new attention icon. */ -static void -new_aicon (DBusGProxy * proxy, gpointer data) -{ - Application * app = (Application *)data; - if (!app->validated) return; - - org_freedesktop_DBus_Properties_get_async(app->prop_proxy, - NOTIFICATION_ITEM_DBUS_IFACE, - NOTIFICATION_ITEM_PROP_AICON_NAME, - new_aicon_cb, - app); - - return; -} - -/* Called when the Notification Item signals that it - has a new status. */ -static void -new_status (DBusGProxy * proxy, const gchar * status, gpointer data) -{ - Application * app = (Application *)data; - if (!app->validated) return; - - app->status = string_to_status(status); - apply_status(app); - - return; -} - -/* Called when the Notification Item signals that it - has a new icon theme path. */ -static void -new_icon_theme_path (DBusGProxy * proxy, const gchar * icon_theme_path, gpointer data) -{ - Application * app = (Application *)data; - if (!app->validated) return; - - if (g_strcmp0(icon_theme_path, app->icon_theme_path)) { - /* If the new icon theme path is actually a new icon theme path */ - if (app->icon_theme_path != NULL) g_free(app->icon_theme_path); - app->icon_theme_path = g_strdup(icon_theme_path); - - if (app->visible_state != VISIBLE_STATE_HIDDEN) { - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(G_OBJECT(app->appstore), - signals[APPLICATION_ICON_THEME_PATH_CHANGED], 0, - position, app->icon_theme_path, TRUE); - } - } - - return; -} - -/* Called when the Notification Item signals that it - has a new label. */ -static void -new_label (DBusGProxy * proxy, const gchar * label, const gchar * guide, gpointer data) -{ - Application * app = (Application *)data; - if (!app->validated) return; - - gboolean changed = FALSE; - - if (g_strcmp0(app->label, label) != 0) { - changed = TRUE; - if (app->label != NULL) { - g_free(app->label); - app->label = NULL; - } - app->label = g_strdup(label); - } - - if (g_strcmp0(app->guide, guide) != 0) { - changed = TRUE; - if (app->guide != NULL) { - g_free(app->guide); - app->guide = NULL; - } - app->guide = g_strdup(guide); - } - - if (changed) { - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(app->appstore, signals[APPLICATION_LABEL_CHANGED], 0, - position, - app->label != NULL ? app->label : "", - app->guide != NULL ? app->guide : "", - TRUE); - } - - return; -} - -/* Adding a new NotificationItem object from DBus in to the - appstore. First, we need to get the information on it - though. */ -void -application_service_appstore_application_add (ApplicationServiceAppstore * appstore, const gchar * dbus_name, const gchar * dbus_object) -{ - g_debug("Adding new application: %s:%s", dbus_name, dbus_object); - - /* Make sure we got a sensible request */ - g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(appstore)); - g_return_if_fail(dbus_name != NULL && dbus_name[0] != '\0'); - g_return_if_fail(dbus_object != NULL && dbus_object[0] != '\0'); - ApplicationServiceAppstorePrivate * priv = appstore->priv; - Application * app = find_application(appstore, dbus_name, dbus_object); - - if (app != NULL) { - g_warning("Application already exists! Rerequesting properties."); - org_freedesktop_DBus_Properties_get_all_async(app->prop_proxy, - NOTIFICATION_ITEM_DBUS_IFACE, - get_all_properties_cb, - app); - return; - } - - /* Build the application entry. This will be carried - along until we're sure we've got everything. */ - app = g_new0(Application, 1); - - app->validated = FALSE; - app->dbus_name = g_strdup(dbus_name); - app->dbus_object = g_strdup(dbus_object); - app->appstore = appstore; - app->status = APP_INDICATOR_STATUS_PASSIVE; - app->icon = NULL; - app->aicon = NULL; - app->menu = NULL; - app->icon_theme_path = NULL; - app->label = NULL; - app->guide = NULL; - app->currently_free = FALSE; - app->ordering_index = 0; - app->approved_by = NULL; - app->visible_state = VISIBLE_STATE_HIDDEN; - - /* Get the DBus proxy for the NotificationItem interface */ - GError * error = NULL; - app->dbus_proxy = dbus_g_proxy_new_for_name_owner(priv->bus, - app->dbus_name, - app->dbus_object, - NOTIFICATION_ITEM_DBUS_IFACE, - &error); - - if (error != NULL) { - g_warning("Unable to get notification item proxy for object '%s' on host '%s': %s", dbus_object, dbus_name, error->message); - g_error_free(error); - g_free(app); - return; - } - - /* We've got it, let's watch it for destruction */ - g_signal_connect(G_OBJECT(app->dbus_proxy), "destroy", G_CALLBACK(application_removed_cb), app); - - /* Grab the property proxy interface */ - app->prop_proxy = dbus_g_proxy_new_for_name_owner(priv->bus, - app->dbus_name, - app->dbus_object, - DBUS_INTERFACE_PROPERTIES, - &error); - - if (error != NULL) { - g_warning("Unable to get property proxy for object '%s' on host '%s': %s", dbus_object, dbus_name, error->message); - g_error_free(error); - g_object_unref(app->dbus_proxy); - g_free(app); - return; - } - - /* Connect to signals */ - dbus_g_proxy_add_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_ICON, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_AICON, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_STATUS, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_ICON_THEME_PATH, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_LABEL, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - - dbus_g_proxy_connect_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_ICON, - G_CALLBACK(new_icon), - app, - NULL); - dbus_g_proxy_connect_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_AICON, - G_CALLBACK(new_aicon), - app, - NULL); - dbus_g_proxy_connect_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_STATUS, - G_CALLBACK(new_status), - app, - NULL); - dbus_g_proxy_connect_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_ICON_THEME_PATH, - G_CALLBACK(new_icon_theme_path), - app, - NULL); - dbus_g_proxy_connect_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_LABEL, - G_CALLBACK(new_label), - app, - NULL); - - /* Get all the propertiees */ - org_freedesktop_DBus_Properties_get_all_async(app->prop_proxy, - NOTIFICATION_ITEM_DBUS_IFACE, - get_all_properties_cb, - app); - - /* We're returning, nothing is yet added until the properties - come back and give us more info. */ - return; -} - -/* Looks for an application in the list of applications */ -static Application * -find_application (ApplicationServiceAppstore * appstore, const gchar * address, const gchar * object) -{ - ApplicationServiceAppstorePrivate * priv = appstore->priv; - GList * listpntr; - - for (listpntr = priv->applications; listpntr != NULL; listpntr = g_list_next(listpntr)) { - Application * app = (Application *)listpntr->data; - - if (!g_strcmp0(app->dbus_name, address) && !g_strcmp0(app->dbus_object, object)) { - return app; - } - } - - return NULL; -} - -/* Removes an application. Currently only works for the apps - that are shown. */ -void -application_service_appstore_application_remove (ApplicationServiceAppstore * appstore, const gchar * dbus_name, const gchar * dbus_object) -{ - g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(appstore)); - g_return_if_fail(dbus_name != NULL && dbus_name[0] != '\0'); - g_return_if_fail(dbus_object != NULL && dbus_object[0] != '\0'); - - Application * app = find_application(appstore, dbus_name, dbus_object); - if (app != NULL) { - application_removed_cb(NULL, app); - } else { - g_warning("Unable to find application %s:%s", dbus_name, dbus_object); - } - - return; -} - -gchar** -application_service_appstore_application_get_list (ApplicationServiceAppstore * appstore) -{ - ApplicationServiceAppstorePrivate * priv = appstore->priv; - gchar ** out; - gchar ** outpntr; - GList * listpntr; - - out = g_new(gchar*, g_list_length(priv->applications) + 1); - - for (listpntr = priv->applications, outpntr = out; listpntr != NULL; listpntr = g_list_next(listpntr), ++outpntr) { - Application * app = (Application *)listpntr->data; - *outpntr = g_strdup_printf("%s%s", app->dbus_name, app->dbus_object); - } - *outpntr = 0; - return out; -} - -/* Creates a basic appstore object and attaches the - LRU file object to it. */ -ApplicationServiceAppstore * -application_service_appstore_new (void) -{ - ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(g_object_new(APPLICATION_SERVICE_APPSTORE_TYPE, NULL)); - return appstore; -} - -/* DBus Interface */ -static gboolean -_application_service_server_get_applications (ApplicationServiceAppstore * appstore, GPtrArray ** apps, GError ** error) -{ - ApplicationServiceAppstorePrivate * priv = appstore->priv; - - *apps = g_ptr_array_new(); - GList * listpntr; - gint position = 0; - - for (listpntr = priv->applications; listpntr != NULL; listpntr = g_list_next(listpntr)) { - Application * app = (Application *)listpntr->data; - if (app->visible_state == VISIBLE_STATE_HIDDEN) { - continue; - } - - GValueArray * values = g_value_array_new(5); - - GValue value = {0}; - - /* Icon name */ - g_value_init(&value, G_TYPE_STRING); - g_value_set_string(&value, app->icon); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* Position */ - g_value_init(&value, G_TYPE_INT); - g_value_set_int(&value, position++); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* DBus Address */ - g_value_init(&value, G_TYPE_STRING); - g_value_set_string(&value, app->dbus_name); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* DBus Object */ - g_value_init(&value, DBUS_TYPE_G_OBJECT_PATH); - g_value_set_static_boxed(&value, app->menu); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* Icon path */ - g_value_init(&value, G_TYPE_STRING); - g_value_set_string(&value, app->icon_theme_path); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* Label */ - g_value_init(&value, G_TYPE_STRING); - g_value_set_string(&value, app->label); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* Guide */ - g_value_init(&value, G_TYPE_STRING); - g_value_set_string(&value, app->guide); - g_value_array_append(values, &value); - g_value_unset(&value); - - g_ptr_array_add(*apps, values); - } - - return TRUE; -} - -/* Removes and approver from our list of approvers and - then sees if that changes our status. Most likely this - could make us visible if this approver rejected us. */ -static void -remove_approver (gpointer papp, gpointer pproxy) -{ - Application * app = (Application *)papp; - app->approved_by = g_list_remove(app->approved_by, pproxy); - apply_status(app); - return; -} - -/* Frees the data associated with an approver */ -static void -approver_free (gpointer papprover, gpointer user_data) -{ - Approver * approver = (Approver *)papprover; - g_return_if_fail(approver != NULL); - - ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(user_data); - g_list_foreach(appstore->priv->applications, remove_approver, approver->proxy); - - if (approver->proxy != NULL) { - if (!approver->destroy_by_proxy) { - g_object_unref(approver->proxy); - } - approver->proxy = NULL; - } - - g_free(approver); - return; -} - -/* What did the approver tell us? */ -static void -approver_request_cb (DBusGProxy *proxy, gboolean OUT_approved, GError *error, gpointer userdata) -{ - if (error == NULL) { - g_debug("Approver responded: %s", OUT_approved ? "approve" : "rejected"); - } else { - g_debug("Approver responded error: %s", error->message); - } - - Application * app = (Application *)userdata; - - if (OUT_approved || error != NULL) { - app->approved_by = g_list_prepend(app->approved_by, proxy); - } else { - app->approved_by = g_list_remove(app->approved_by, proxy); - } - - apply_status(app); - return; -} - -/* Run the applications through the new approver */ -static void -check_with_new_approver (gpointer papp, gpointer papprove) -{ - Application * app = (Application *)papp; - Approver * approver = (Approver *)papprove; - - org_ayatana_StatusNotifierApprover_approve_item_async(approver->proxy, - app->id, - app->category, - 0, - app->dbus_name, - app->dbus_object, - approver_request_cb, - app); - - return; -} - -/* Look through all the approvers and find the one with a given - proxy. */ -static gint -approver_find_by_proxy (gconstpointer papprover, gconstpointer pproxy) -{ - Approver * approver = (Approver *)papprover; - - if (approver->proxy == pproxy) { - return 0; - } - - return -1; -} - -/* Tracks when a proxy gets destroyed so that we know that the - approver has dropped off the bus. */ -static void -approver_destroyed (gpointer pproxy, gpointer pappstore) -{ - ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(pappstore); - - GList * lapprover = g_list_find_custom(appstore->priv->approvers, pproxy, approver_find_by_proxy); - if (lapprover == NULL) { - g_warning("Approver proxy died, but we don't seem to have that approver."); - return; - } - - Approver * approver = (Approver *)lapprover->data; - approver->destroy_by_proxy = TRUE; - - appstore->priv->approvers = g_list_remove(appstore->priv->approvers, approver); - approver_free(approver, appstore); - - return; -} - -/* A signal when an approver changes the why that it thinks about - a particular indicator. */ -void -approver_revise_judgement (DBusGProxy * proxy, gboolean new_status, gchar * address, DBusGProxy * get_path, gpointer user_data) -{ - g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(user_data)); - g_return_if_fail(address != NULL && address[0] != '\0'); - g_return_if_fail(get_path != NULL); - const gchar * path = dbus_g_proxy_get_path(get_path); - g_return_if_fail(path != NULL && path[0] != '\0'); - - ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(user_data); - - Application * app = find_application(appstore, address, path); - - if (app == NULL) { - g_warning("Unable to update approver status of application (%s:%s) as it was not found", address, path); - return; - } - - if (new_status) { - app->approved_by = g_list_prepend(app->approved_by, proxy); - } else { - app->approved_by = g_list_remove(app->approved_by, proxy); - } - apply_status(app); - - return; -} - -/* Adds a new approver to the app store */ -void -application_service_appstore_approver_add (ApplicationServiceAppstore * appstore, const gchar * dbus_name, const gchar * dbus_object) -{ - g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(appstore)); - g_return_if_fail(dbus_name != NULL); - g_return_if_fail(dbus_object != NULL); - ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE_GET_PRIVATE (appstore); - - Approver * approver = g_new0(Approver, 1); - approver->destroy_by_proxy = FALSE; - - GError * error = NULL; - approver->proxy = dbus_g_proxy_new_for_name_owner(priv->bus, - dbus_name, - dbus_object, - NOTIFICATION_APPROVER_DBUS_IFACE, - &error); - if (error != NULL) { - g_warning("Unable to get approver interface on '%s:%s' : %s", dbus_name, dbus_object, error->message); - g_error_free(error); - g_free(approver); - return; - } - - g_signal_connect(G_OBJECT(approver->proxy), "destroy", G_CALLBACK(approver_destroyed), appstore); - - dbus_g_proxy_add_signal(approver->proxy, - "ReviseJudgement", - G_TYPE_BOOLEAN, - G_TYPE_STRING, - DBUS_TYPE_G_OBJECT_PATH, - G_TYPE_INVALID); - dbus_g_proxy_connect_signal(approver->proxy, - "ReviseJudgement", - G_CALLBACK(approver_revise_judgement), - appstore, - NULL); - - priv->approvers = g_list_prepend(priv->approvers, approver); - - g_list_foreach(priv->applications, check_with_new_approver, approver); - - return; -} - diff --git a/src/application-service-appstore.h b/src/application-service-appstore.h deleted file mode 100644 index aa2824b..0000000 --- a/src/application-service-appstore.h +++ /dev/null @@ -1,73 +0,0 @@ -/* -An object that stores the registration of all the application -indicators. It also communicates this to the indicator visualization. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould - -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. - -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. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . -*/ - -#ifndef __APPLICATION_SERVICE_APPSTORE_H__ -#define __APPLICATION_SERVICE_APPSTORE_H__ - -#include -#include - -G_BEGIN_DECLS - -#define APPLICATION_SERVICE_APPSTORE_TYPE (application_service_appstore_get_type ()) -#define APPLICATION_SERVICE_APPSTORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstore)) -#define APPLICATION_SERVICE_APPSTORE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstoreClass)) -#define IS_APPLICATION_SERVICE_APPSTORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APPLICATION_SERVICE_APPSTORE_TYPE)) -#define IS_APPLICATION_SERVICE_APPSTORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), APPLICATION_SERVICE_APPSTORE_TYPE)) -#define APPLICATION_SERVICE_APPSTORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstoreClass)) - -typedef struct _ApplicationServiceAppstore ApplicationServiceAppstore; -typedef struct _ApplicationServiceAppstoreClass ApplicationServiceAppstoreClass; -typedef struct _ApplicationServiceAppstorePrivate ApplicationServiceAppstorePrivate; - -struct _ApplicationServiceAppstoreClass { - GObjectClass parent_class; - - void (*application_added) (ApplicationServiceAppstore * appstore, gchar *, gint, gchar *, gchar *, gpointer); - void (*application_removed) (ApplicationServiceAppstore * appstore, gint, gpointer); - void (*application_icon_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, gpointer); - void (*application_icon_theme_path_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, gpointer); - void (*application_label_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, const gchar *, gpointer); -}; - -struct _ApplicationServiceAppstore { - GObject parent; - - ApplicationServiceAppstorePrivate * priv; -}; - -ApplicationServiceAppstore * application_service_appstore_new (void); -GType application_service_appstore_get_type (void); -void application_service_appstore_application_add (ApplicationServiceAppstore * appstore, - const gchar * dbus_name, - const gchar * dbus_object); -void application_service_appstore_application_remove (ApplicationServiceAppstore * appstore, - const gchar * dbus_name, - const gchar * dbus_object); -void application_service_appstore_approver_add (ApplicationServiceAppstore * appstore, - const gchar * dbus_name, - const gchar * dbus_object); -gchar** application_service_appstore_application_get_list (ApplicationServiceAppstore * appstore); - -G_END_DECLS - -#endif diff --git a/src/application-service-watcher.c b/src/application-service-watcher.c deleted file mode 100644 index 50b0be9..0000000 --- a/src/application-service-watcher.c +++ /dev/null @@ -1,302 +0,0 @@ -/* -An object implementing the NotificationWatcher interface and passes -the information into the app-store. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould - -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. - -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. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include "application-service-watcher.h" -#include "dbus-shared.h" - -/* Enum for the properties so that they can be quickly - found and looked up. */ -enum { - PROP_0, - PROP_PROTOCOL_VERSION, - PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED, - PROP_REGISTERED_STATUS_NOTIFIER_ITEMS -}; - -/* The strings so that they can be slowly looked up. */ -#define PROP_PROTOCOL_VERSION_S "protocol-version" -#define PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED_S "is-status-notifier-host-registered" -#define PROP_REGISTERED_STATUS_NOTIFIER_ITEMS_S "registered-status-notifier-items" - -#define CURRENT_PROTOCOL_VERSION 0 - -static gboolean _notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method); -static gboolean _notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host); -static gboolean _notification_watcher_server_x_ayatana_register_notification_approver (ApplicationServiceWatcher * appwatcher, const gchar * path, const GArray * categories, DBusGMethodInvocation * method); -static void get_name_cb (DBusGProxy * proxy, guint status, GError * error, gpointer data); - -#include "notification-watcher-server.h" - -/* Private Stuff */ -typedef struct _ApplicationServiceWatcherPrivate ApplicationServiceWatcherPrivate; -struct _ApplicationServiceWatcherPrivate { - ApplicationServiceAppstore * appstore; - DBusGProxy * dbus_proxy; -}; - -#define APPLICATION_SERVICE_WATCHER_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcherPrivate)) - -/* Signals Stuff */ -enum { - STATUS_NOTIFIER_ITEM_REGISTERED, - STATUS_NOTIFIER_ITEM_UNREGISTERED, - STATUS_NOTIFIER_HOST_REGISTERED, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - -/* GObject stuff */ -static void application_service_watcher_class_init (ApplicationServiceWatcherClass *klass); -static void application_service_watcher_init (ApplicationServiceWatcher *self); -static void application_service_watcher_dispose (GObject *object); -static void application_service_watcher_finalize (GObject *object); -static void application_service_watcher_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); -static void application_service_watcher_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); - -G_DEFINE_TYPE (ApplicationServiceWatcher, application_service_watcher, G_TYPE_OBJECT); - -static void -application_service_watcher_class_init (ApplicationServiceWatcherClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (ApplicationServiceWatcherPrivate)); - - object_class->dispose = application_service_watcher_dispose; - object_class->finalize = application_service_watcher_finalize; - - /* Property funcs */ - object_class->set_property = application_service_watcher_set_property; - object_class->get_property = application_service_watcher_get_property; - - /* Properties */ - g_object_class_install_property (object_class, - PROP_PROTOCOL_VERSION, - g_param_spec_int(PROP_PROTOCOL_VERSION_S, - "Protocol Version", - "Which version of the StatusNotifierProtocol this watcher implements", - 0, G_MAXINT, - CURRENT_PROTOCOL_VERSION, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (object_class, - PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED, - g_param_spec_boolean(PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED_S, - "Is StatusNotifierHost Registered", - "True if there is at least one StatusNotifierHost registered", - FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (object_class, - PROP_REGISTERED_STATUS_NOTIFIER_ITEMS, - g_param_spec_boxed(PROP_REGISTERED_STATUS_NOTIFIER_ITEMS_S, - "Registered StatusNotifierItems", - "The list of StatusNotifierItems registered to this watcher", - G_TYPE_STRV, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - /* Signals */ - signals[STATUS_NOTIFIER_ITEM_REGISTERED] = g_signal_new ("status-notifier-item-registered", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_item_registered), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, G_TYPE_STRING, G_TYPE_NONE); - signals[STATUS_NOTIFIER_ITEM_UNREGISTERED] = g_signal_new ("status-notifier-item-unregistered", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_item_unregistered), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, G_TYPE_STRING, G_TYPE_NONE); - signals[STATUS_NOTIFIER_HOST_REGISTERED] = g_signal_new ("status-notifier-host-registered", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_host_registered), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0, G_TYPE_NONE); - - dbus_g_object_type_install_info(APPLICATION_SERVICE_WATCHER_TYPE, - &dbus_glib__notification_watcher_server_object_info); - - return; -} - -static void -application_service_watcher_init (ApplicationServiceWatcher *self) -{ - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(self); - - priv->appstore = NULL; - - GError * error = NULL; - DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); - if (error != NULL) { - g_error("Unable to get session bus: %s", error->message); - g_error_free(error); - return; - } - - dbus_g_connection_register_g_object(session_bus, - NOTIFICATION_WATCHER_DBUS_OBJ, - G_OBJECT(self)); - - priv->dbus_proxy = dbus_g_proxy_new_for_name_owner(session_bus, - DBUS_SERVICE_DBUS, - DBUS_PATH_DBUS, - DBUS_INTERFACE_DBUS, - &error); - if (error != NULL) { - g_error("Ah, can't get proxy to dbus: %s", error->message); - g_error_free(error); - return; - } - - org_freedesktop_DBus_request_name_async(priv->dbus_proxy, - NOTIFICATION_WATCHER_DBUS_ADDR, - DBUS_NAME_FLAG_DO_NOT_QUEUE, - get_name_cb, - self); - - return; -} - -static void -application_service_watcher_dispose (GObject *object) -{ - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(object); - - if (priv->appstore != NULL) { - g_object_unref(G_OBJECT(priv->appstore)); - priv->appstore = NULL; - } - - G_OBJECT_CLASS (application_service_watcher_parent_class)->dispose (object); - return; -} - -static void -application_service_watcher_finalize (GObject *object) -{ - - G_OBJECT_CLASS (application_service_watcher_parent_class)->finalize (object); - return; -} - -static void -application_service_watcher_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) -{ - /* There are no writable properties for now */ -} - -static void -application_service_watcher_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) -{ - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(object); - switch (prop_id) { - case PROP_PROTOCOL_VERSION: - g_value_set_int (value, CURRENT_PROTOCOL_VERSION); - break; - case PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED: - g_value_set_boolean (value, TRUE); - break; - case PROP_REGISTERED_STATUS_NOTIFIER_ITEMS: - g_value_set_boxed (value, application_service_appstore_application_get_list(priv->appstore)); - break; - } -} - -ApplicationServiceWatcher * -application_service_watcher_new (ApplicationServiceAppstore * appstore) -{ - GObject * obj = g_object_new(APPLICATION_SERVICE_WATCHER_TYPE, NULL); - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(obj); - priv->appstore = appstore; - g_object_ref(G_OBJECT(priv->appstore)); - return APPLICATION_SERVICE_WATCHER(obj); -} - -static gboolean -_notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method) -{ - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher); - - if (service[0] == '/') { - application_service_appstore_application_add(priv->appstore, - dbus_g_method_get_sender(method), - service); - } else { - application_service_appstore_application_add(priv->appstore, - service, - NOTIFICATION_ITEM_DEFAULT_OBJ); - } - - dbus_g_method_return(method, G_TYPE_NONE); - return TRUE; -} - -static gboolean -_notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host) -{ - - return FALSE; -} - -/* Function to handle the return of the get name. There isn't a whole - lot that can be done, but we're atleast going to tell people. */ -static void -get_name_cb (DBusGProxy * proxy, guint status, GError * error, gpointer data) -{ - if (error != NULL) { - g_warning("Unable to get watcher name '%s' because: %s", NOTIFICATION_WATCHER_DBUS_ADDR, error->message); - return; - } - - if (status != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER && - status != DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER) { - g_warning("Unable to get watcher name '%s'", NOTIFICATION_WATCHER_DBUS_ADDR); - return; - } - - return; -} - -static gboolean -_notification_watcher_server_x_ayatana_register_notification_approver (ApplicationServiceWatcher * appwatcher, const gchar * path, const GArray * categories, DBusGMethodInvocation * method) -{ - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher); - - application_service_appstore_approver_add(priv->appstore, - dbus_g_method_get_sender(method), - path); - - dbus_g_method_return(method, G_TYPE_NONE); - return TRUE; -} diff --git a/src/application-service-watcher.h b/src/application-service-watcher.h deleted file mode 100644 index 6c430db..0000000 --- a/src/application-service-watcher.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -An object implementing the NotificationWatcher interface and passes -the information into the app-store. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould - -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. - -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. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . -*/ - -#ifndef __APPLICATION_SERVICE_WATCHER_H__ -#define __APPLICATION_SERVICE_WATCHER_H__ - -#include -#include - -#include "application-service-appstore.h" - -G_BEGIN_DECLS - -#define APPLICATION_SERVICE_WATCHER_TYPE (application_service_watcher_get_type ()) -#define APPLICATION_SERVICE_WATCHER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcher)) -#define APPLICATION_SERVICE_WATCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcherClass)) -#define IS_APPLICATION_SERVICE_WATCHER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APPLICATION_SERVICE_WATCHER_TYPE)) -#define IS_APPLICATION_SERVICE_WATCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), APPLICATION_SERVICE_WATCHER_TYPE)) -#define APPLICATION_SERVICE_WATCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcherClass)) - -typedef struct _ApplicationServiceWatcher ApplicationServiceWatcher; -typedef struct _ApplicationServiceWatcherClass ApplicationServiceWatcherClass; - -struct _ApplicationServiceWatcherClass { - GObjectClass parent_class; - - /* Signals */ - void (*status_notifier_item_registered) (ApplicationServiceWatcher * watcher, gchar * object, gpointer data); - void (*status_notifier_item_unregistered) (ApplicationServiceWatcher * watcher, gchar * object, gpointer data); - void (*status_notifier_host_registered) (ApplicationServiceWatcher * watcher, gpointer data); -}; - -struct _ApplicationServiceWatcher { - GObject parent; -}; - -GType application_service_watcher_get_type (void); -ApplicationServiceWatcher * application_service_watcher_new (ApplicationServiceAppstore * appstore); - -G_END_DECLS - -#endif diff --git a/src/application-service.c b/src/application-service.c deleted file mode 100644 index 94e7d2e..0000000 --- a/src/application-service.c +++ /dev/null @@ -1,78 +0,0 @@ -/* -The core file for the service that starts up all the objects we need -and houses our main loop. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould - -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. - -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. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . -*/ - - -#include "libindicator/indicator-service.h" -#include "notification-item-client.h" -#include "application-service-appstore.h" -#include "application-service-watcher.h" -#include "dbus-shared.h" - -/* The base main loop */ -static GMainLoop * mainloop = NULL; -/* Where the application registry lives */ -static ApplicationServiceAppstore * appstore = NULL; -/* Interface for applications */ -static ApplicationServiceWatcher * watcher = NULL; -/* The service management interface */ -static IndicatorService * service = NULL; - -/* Recieves the disonnection signal from the service - object and closes the mainloop. */ -static void -service_disconnected (IndicatorService * service, gpointer data) -{ - g_debug("Service disconnected"); - if (mainloop != NULL) { - g_main_loop_quit(mainloop); - } - return; -} - -/* Builds up the core objects and puts us spinning into - a main loop. */ -int -main (int argc, char ** argv) -{ - g_type_init(); - - /* Bring us up as a basic indicator service */ - service = indicator_service_new(INDICATOR_APPLICATION_DBUS_ADDR); - g_signal_connect(G_OBJECT(service), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_disconnected), NULL); - - /* Building our app store */ - appstore = application_service_appstore_new(); - - /* Adding a watcher for the Apps coming up */ - watcher = application_service_watcher_new(appstore); - - /* Building and executing our main loop */ - mainloop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(mainloop); - - /* Unref'ing all the objects */ - g_object_unref(G_OBJECT(watcher)); - g_object_unref(G_OBJECT(appstore)); - g_object_unref(G_OBJECT(service)); - - return 0; -} diff --git a/src/application-service.xml b/src/application-service.xml deleted file mode 100644 index 031bf68..0000000 --- a/src/application-service.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/dbus-properties.xml b/src/dbus-properties.xml deleted file mode 100644 index c172895..0000000 --- a/src/dbus-properties.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/indicator-application.c b/src/indicator-application.c deleted file mode 100644 index 36e1446..0000000 --- a/src/indicator-application.c +++ /dev/null @@ -1,872 +0,0 @@ -/* -The indicator application visualization object. It takes the information -given by the service and turns it into real-world pixels that users can -actually use. Well, GTK does that, but this asks nicely. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould - -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. - -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. - -You should have received a copy of the GNU General Public License along -with this program. If not, see . -*/ - - -/* G Stuff */ -#include -#include -#include - -/* DBus Stuff */ -#include -#include - -/* Indicator Stuff */ -#include -#include -#include -#include - -/* Local Stuff */ -#include "dbus-shared.h" -#include "application-service-client.h" -#include "application-service-marshal.h" - -#define PANEL_ICON_SUFFIX "panel" - -#define INDICATOR_APPLICATION_TYPE (indicator_application_get_type ()) -#define INDICATOR_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_APPLICATION_TYPE, IndicatorApplication)) -#define INDICATOR_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_APPLICATION_TYPE, IndicatorApplicationClass)) -#define IS_INDICATOR_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_APPLICATION_TYPE)) -#define IS_INDICATOR_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_APPLICATION_TYPE)) -#define INDICATOR_APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_APPLICATION_TYPE, IndicatorApplicationClass)) - -typedef struct _IndicatorApplication IndicatorApplication; -typedef struct _IndicatorApplicationClass IndicatorApplicationClass; - -struct _IndicatorApplicationClass { - IndicatorObjectClass parent_class; -}; - -struct _IndicatorApplication { - IndicatorObject parent; -}; - -GType indicator_application_get_type (void); - -INDICATOR_SET_VERSION -INDICATOR_SET_TYPE(INDICATOR_APPLICATION_TYPE) - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -typedef struct _IndicatorApplicationPrivate IndicatorApplicationPrivate; -struct _IndicatorApplicationPrivate { - IndicatorServiceManager * sm; - DBusGConnection * bus; - DBusGProxy * service_proxy; - GList * applications; - GHashTable * theme_dirs; - guint disconnect_kill; -}; - -typedef struct _ApplicationEntry ApplicationEntry; -struct _ApplicationEntry { - IndicatorObjectEntry entry; - gchar * icon_theme_path; - gboolean old_service; - gchar * dbusobject; - gchar * dbusaddress; - gchar * guide; - gchar * longname; -}; - -#define INDICATOR_APPLICATION_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_APPLICATION_TYPE, IndicatorApplicationPrivate)) - -static void indicator_application_class_init (IndicatorApplicationClass *klass); -static void indicator_application_init (IndicatorApplication *self); -static void indicator_application_dispose (GObject *object); -static void indicator_application_finalize (GObject *object); -static GList * get_entries (IndicatorObject * io); -static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry); -void connection_changed (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application); -static void connected (IndicatorApplication * application); -static void disconnected (IndicatorApplication * application); -static void disconnected_helper (gpointer data, gpointer user_data); -static gboolean disconnected_kill (gpointer user_data); -static void disconnected_kill_helper (gpointer data, gpointer user_data); -static void application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, IndicatorApplication * application); -static void application_removed (DBusGProxy * proxy, gint position , IndicatorApplication * application); -static void application_label_changed (DBusGProxy * proxy, gint position, const gchar * label, const gchar * guide, IndicatorApplication * application); -static void application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application); -static void application_icon_theme_path_changed (DBusGProxy * proxy, gint position, const gchar * icon_theme_path, IndicatorApplication * application); -static void get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error, gpointer userdata); -static void get_applications_helper (gpointer data, gpointer user_data); -static void theme_dir_unref(IndicatorApplication * ia, const gchar * dir); -static void theme_dir_ref(IndicatorApplication * ia, const gchar * dir); - -G_DEFINE_TYPE (IndicatorApplication, indicator_application, INDICATOR_OBJECT_TYPE); - -static void -indicator_application_class_init (IndicatorApplicationClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (IndicatorApplicationPrivate)); - - object_class->dispose = indicator_application_dispose; - object_class->finalize = indicator_application_finalize; - - IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); - - io_class->get_entries = get_entries; - io_class->get_location = get_location; - - dbus_g_object_register_marshaller(_application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING, - G_TYPE_NONE, - G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_object_register_marshaller(_application_service_marshal_VOID__INT_STRING, - G_TYPE_NONE, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_object_register_marshaller(_application_service_marshal_VOID__INT_STRING_STRING, - G_TYPE_NONE, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - - return; -} - -static void -indicator_application_init (IndicatorApplication *self) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(self); - - /* These are built in the connection phase */ - priv->bus = NULL; - priv->service_proxy = NULL; - priv->theme_dirs = NULL; - priv->disconnect_kill = 0; - - priv->sm = indicator_service_manager_new(INDICATOR_APPLICATION_DBUS_ADDR); - g_signal_connect(G_OBJECT(priv->sm), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self); - - priv->applications = NULL; - - priv->theme_dirs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); - - return; -} - -static void -indicator_application_dispose (GObject *object) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(object); - - if (priv->disconnect_kill != 0) { - g_source_remove(priv->disconnect_kill); - } - - while (priv->applications != NULL) { - application_removed(priv->service_proxy, - 0, - INDICATOR_APPLICATION(object)); - } - - if (priv->sm != NULL) { - g_object_unref(priv->sm); - priv->sm = NULL; - } - - if (priv->bus != NULL) { - /* We're not incrementing the ref count on this one. */ - priv->bus = NULL; - } - - if (priv->service_proxy != NULL) { - g_object_unref(G_OBJECT(priv->service_proxy)); - priv->service_proxy = NULL; - } - - if (priv->theme_dirs != NULL) { - while (g_hash_table_size(priv->theme_dirs)) { - GList * keys = g_hash_table_get_keys(priv->theme_dirs); - theme_dir_unref(INDICATOR_APPLICATION(object), (gchar *)keys->data); - } - g_hash_table_destroy(priv->theme_dirs); - priv->theme_dirs = NULL; - } - - G_OBJECT_CLASS (indicator_application_parent_class)->dispose (object); - return; -} - -static void -indicator_application_finalize (GObject *object) -{ - - G_OBJECT_CLASS (indicator_application_parent_class)->finalize (object); - return; -} - -/* Responds to connection change event from the service manager and - splits it into two. */ -void -connection_changed (IndicatorServiceManager * sm, gboolean connect, IndicatorApplication * application) -{ - g_return_if_fail(IS_INDICATOR_APPLICATION(application)); - if (connect) { - connected(application); - } else { - disconnected(application); - } - return; -} - -/* Brings up the connection to a service that has just come onto the - bus, or is atleast new to us. */ -void -connected (IndicatorApplication * application) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - g_debug("Connected to Application Indicator Service."); - - GError * error = NULL; - - /* Grab the session bus */ - if (priv->bus == NULL) { - priv->bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); - - if (error != NULL) { - g_error("Unable to get session bus: %s", error->message); - g_error_free(error); - return; - } - } - - if (priv->service_proxy == NULL) { - /* Build the service proxy */ - priv->service_proxy = dbus_g_proxy_new_for_name(priv->bus, - INDICATOR_APPLICATION_DBUS_ADDR, - INDICATOR_APPLICATION_DBUS_OBJ, - INDICATOR_APPLICATION_DBUS_IFACE); - - /* Set up proxy signals */ - g_debug("Setup proxy signals"); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationAdded", - G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationRemoved", - G_TYPE_INT, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationIconChanged", - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationIconThemePathChanged", - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationLabelChanged", - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - - /* Connect to them */ - g_debug("Connect to them."); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationAdded", - G_CALLBACK(application_added), - application, - NULL /* Disconnection Signal */); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationRemoved", - G_CALLBACK(application_removed), - application, - NULL /* Disconnection Signal */); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationIconChanged", - G_CALLBACK(application_icon_changed), - application, - NULL /* Disconnection Signal */); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationIconThemePathChanged", - G_CALLBACK(application_icon_theme_path_changed), - application, - NULL /* Disconnection Signal */); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationLabelChanged", - G_CALLBACK(application_label_changed), - application, - NULL /* Disconnection Signal */); - } - - /* Query it for existing applications */ - g_debug("Request current apps"); - org_ayatana_indicator_application_service_get_applications_async(priv->service_proxy, - get_applications, - application); - - return; -} - -/* Marks every current application as belonging to the old - service so that we can delete it if it doesn't come back. - Also, sets up a timeout on comming back. */ -static void -disconnected (IndicatorApplication * application) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - g_list_foreach(priv->applications, disconnected_helper, application); - /* I'll like this to be a little shorter, but it's a bit - inpractical to make it so. This means that the user will - probably notice a visible glitch. Though, if applications - are disappearing there isn't much we can do. */ - priv->disconnect_kill = g_timeout_add(250, disconnected_kill, application); - return; -} - -/* Marks an entry as being from the old service */ -static void -disconnected_helper (gpointer data, gpointer user_data) -{ - ApplicationEntry * entry = (ApplicationEntry *)data; - entry->old_service = TRUE; - return; -} - -/* Makes sure the old applications that don't come back - get dropped. */ -static gboolean -disconnected_kill (gpointer user_data) -{ - g_return_val_if_fail(IS_INDICATOR_APPLICATION(user_data), FALSE); - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data); - priv->disconnect_kill = 0; - g_list_foreach(priv->applications, disconnected_kill_helper, user_data); - return FALSE; -} - -/* Looks for entries that are still associated with the - old service and removes them. */ -static void -disconnected_kill_helper (gpointer data, gpointer user_data) -{ - g_return_if_fail(IS_INDICATOR_APPLICATION(user_data)); - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data); - ApplicationEntry * entry = (ApplicationEntry *)data; - if (entry->old_service) { - application_removed(NULL, g_list_index(priv->applications, data), INDICATOR_APPLICATION(user_data)); - } - return; -} - -/* Goes through the list of applications that we're maintaining and - pulls out the IndicatorObjectEntry and returns that in a list - for the caller. */ -static GList * -get_entries (IndicatorObject * io) -{ - g_return_val_if_fail(IS_INDICATOR_APPLICATION(io), NULL); - - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(io); - GList * retval = NULL; - GList * apppointer = NULL; - - for (apppointer = priv->applications; apppointer != NULL; apppointer = g_list_next(apppointer)) { - IndicatorObjectEntry * entry = &(((ApplicationEntry *)apppointer->data)->entry); - retval = g_list_prepend(retval, entry); - } - - if (retval != NULL) { - retval = g_list_reverse(retval); - } - - return retval; -} - -/* Finds the location of a specific entry */ -static guint -get_location (IndicatorObject * io, IndicatorObjectEntry * entry) -{ - g_return_val_if_fail(IS_INDICATOR_APPLICATION(io), 0); - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(io); - return g_list_index(priv->applications, entry); -} - -/* Searching for ApplicationEntries where the dbusobject and - address are the same. */ -static gint -application_added_search (gconstpointer a, gconstpointer b) -{ - ApplicationEntry * appa = (ApplicationEntry *)a; - ApplicationEntry * appb = (ApplicationEntry *)b; - - if (g_strcmp0(appa->dbusaddress, appb->dbusaddress) == 0 && - g_strcmp0(appa->dbusobject, appb->dbusobject) == 0) { - return 0; - } - - return -1; -} - -/* Does a quick meausre of how big the string is in - pixels with a Pango layout */ -static gint -measure_string (GtkStyle * style, PangoContext * context, const gchar * string) -{ - PangoLayout * layout = pango_layout_new(context); - pango_layout_set_text(layout, string, -1); - pango_layout_set_font_description(layout, style->font_desc); - - gint width; - pango_layout_get_pixel_size(layout, &width, NULL); - g_object_unref(layout); - return width; -} - -/* Try to get a good guess at what a maximum width of the entire - string would be. */ -static void -guess_label_size (ApplicationEntry * app) -{ - /* This is during startup. */ - if (app->entry.label == NULL) return; - - GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(app->entry.label)); - PangoContext * context = gtk_widget_get_pango_context(GTK_WIDGET(app->entry.label)); - - gint length = measure_string(style, context, gtk_label_get_text(app->entry.label)); - - if (app->guide != NULL) { - gint guidelen = measure_string(style, context, app->guide); - if (guidelen > length) { - length = guidelen; - } - } - - gtk_widget_set_size_request(GTK_WIDGET(app->entry.label), length, -1); - - return; -} - -/* Here we respond to new applications by building up the - ApplicationEntry and signaling the indicator host that - we've got a new indicator. */ -static void -application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, IndicatorApplication * application) -{ - g_return_if_fail(IS_INDICATOR_APPLICATION(application)); - g_debug("Building new application entry: %s with icon: %s", dbusaddress, iconname); - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - - /* First search to see if we already have this entry */ - ApplicationEntry searchapp; - searchapp.dbusaddress = (gchar *)dbusaddress; /* Casting off const, but it's okay, we're not changing it */ - searchapp.dbusobject = (gchar *)dbusobject; /* Casting off const, but it's okay, we're not changing it */ - - GList * searchpointer = g_list_find_custom(priv->applications, &searchapp, application_added_search); - if (searchpointer != NULL) { - g_debug("\t...Already have that one."); - ApplicationEntry * app = (ApplicationEntry *)searchpointer->data; - app->old_service = FALSE; - return; - } - - ApplicationEntry * app = g_new(ApplicationEntry, 1); - - app->old_service = FALSE; - app->icon_theme_path = NULL; - if (icon_theme_path != NULL && icon_theme_path[0] != '\0') { - app->icon_theme_path = g_strdup(icon_theme_path); - theme_dir_ref(application, icon_theme_path); - } - - app->dbusaddress = g_strdup(dbusaddress); - app->dbusobject = g_strdup(dbusobject); - app->guide = NULL; - - /* We make a long name using the suffix, and if that - icon is available we want to use it. Otherwise we'll - just use the name we were given. */ - app->longname = NULL; - if (!g_str_has_suffix(iconname, PANEL_ICON_SUFFIX)) { - app->longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX); - } else { - app->longname = g_strdup(iconname); - } - app->entry.image = indicator_image_helper(app->longname); - - if (label == NULL || label[0] == '\0') { - app->entry.label = NULL; - } else { - app->entry.label = GTK_LABEL(gtk_label_new(label)); - g_object_ref(G_OBJECT(app->entry.label)); - gtk_widget_show(GTK_WIDGET(app->entry.label)); - - if (app->guide != NULL) { - g_free(app->guide); - app->guide = NULL; - } - - if (guide != NULL) { - app->guide = g_strdup(guide); - } - - guess_label_size(app); - } - - app->entry.menu = GTK_MENU(dbusmenu_gtkmenu_new((gchar *)dbusaddress, (gchar *)dbusobject)); - - /* Keep copies of these for ourself, just in case. */ - g_object_ref(app->entry.image); - g_object_ref(app->entry.menu); - - gtk_widget_show(GTK_WIDGET(app->entry.image)); - - priv->applications = g_list_insert(priv->applications, app, position); - - g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, &(app->entry), TRUE); - return; -} - -/* This removes the application from the list and free's all - of the memory associated with it. */ -static void -application_removed (DBusGProxy * proxy, gint position, IndicatorApplication * application) -{ - g_return_if_fail(IS_INDICATOR_APPLICATION(application)); - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position); - - if (app == NULL) { - g_warning("Unable to find application at position: %d", position); - return; - } - - priv->applications = g_list_remove(priv->applications, app); - g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, &(app->entry), TRUE); - - if (app->icon_theme_path != NULL) { - theme_dir_unref(application, app->icon_theme_path); - g_free(app->icon_theme_path); - } - if (app->dbusaddress != NULL) { - g_free(app->dbusaddress); - } - if (app->dbusobject != NULL) { - g_free(app->dbusobject); - } - if (app->guide != NULL) { - g_free(app->guide); - } - if (app->longname != NULL) { - g_free(app->longname); - } - if (app->entry.image != NULL) { - g_object_unref(G_OBJECT(app->entry.image)); - } - if (app->entry.label != NULL) { - g_object_unref(G_OBJECT(app->entry.label)); - } - if (app->entry.menu != NULL) { - g_object_unref(G_OBJECT(app->entry.menu)); - } - g_free(app); - - return; -} - -/* The callback for the signal that the label for an application - has changed. */ -static void -application_label_changed (DBusGProxy * proxy, gint position, const gchar * label, const gchar * guide, IndicatorApplication * application) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position); - gboolean signal_reload = FALSE; - - if (app == NULL) { - g_warning("Unable to find application at position: %d", position); - return; - } - - if (label == NULL || label[0] == '\0') { - /* No label, let's see if we need to delete the old one */ - if (app->entry.label != NULL) { - g_object_unref(G_OBJECT(app->entry.label)); - app->entry.label = NULL; - - signal_reload = TRUE; - } - } else { - /* We've got a label, is this just an update or is - it a new thing. */ - if (app->entry.label != NULL) { - gtk_label_set_text(app->entry.label, label); - } else { - app->entry.label = GTK_LABEL(gtk_label_new(label)); - g_object_ref(G_OBJECT(app->entry.label)); - gtk_widget_show(GTK_WIDGET(app->entry.label)); - - signal_reload = TRUE; - } - } - - /* Copy the guide if we have one */ - if (app->guide != NULL) { - g_free(app->guide); - app->guide = NULL; - } - - if (guide != NULL && guide[0] != '\0') { - app->guide = g_strdup(guide); - } - - /* Protected against not having a label */ - guess_label_size(app); - - if (signal_reload) { - /* Telling the listener that this has been removed, and then - readded to make it reparse the entry. */ - if (app->entry.label != NULL) { - gtk_widget_hide(GTK_WIDGET(app->entry.label)); - } - - if (app->entry.image != NULL) { - gtk_widget_hide(GTK_WIDGET(app->entry.image)); - } - - if (app->entry.menu != NULL) { - gtk_menu_detach(app->entry.menu); - } - - g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, &(app->entry), TRUE); - - if (app->entry.label != NULL) { - gtk_widget_show(GTK_WIDGET(app->entry.label)); - } - - if (app->entry.image != NULL) { - indicator_image_helper_update(app->entry.image, app->longname); - gtk_widget_show(GTK_WIDGET(app->entry.image)); - } - - g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, &(app->entry), TRUE); - } - - return; -} - -/* The callback for the signal that the icon for an application - has changed. */ -static void -application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position); - - if (app == NULL) { - g_warning("Unable to find application at position: %d", position); - return; - } - - /* We make a long name using the suffix, and if that - icon is available we want to use it. Otherwise we'll - just use the name we were given. */ - if (app->longname != NULL) { - g_free(app->longname); - app->longname = NULL; - } - if (!g_str_has_suffix(iconname, PANEL_ICON_SUFFIX)) { - app->longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX); - } else { - app->longname = g_strdup(iconname); - } - indicator_image_helper_update(app->entry.image, app->longname); - - return; -} - -/* The callback for the signal that the icon theme path for an application - has changed. */ -static void -application_icon_theme_path_changed (DBusGProxy * proxy, gint position, const gchar * icon_theme_path, IndicatorApplication * application) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position); - - if (app == NULL) { - g_warning("Unable to find application at position: %d", position); - return; - } - - if (g_strcmp0(icon_theme_path, app->icon_theme_path) != 0) { - if(app->icon_theme_path != NULL) { - theme_dir_unref(application, app->icon_theme_path); - g_free(app->icon_theme_path); - app->icon_theme_path = NULL; - } - if (icon_theme_path != NULL && icon_theme_path[0] != '\0') { - app->icon_theme_path = g_strdup(icon_theme_path); - theme_dir_ref(application, app->icon_theme_path); - } - indicator_image_helper_update(app->entry.image, app->longname); - } - - return; -} - -/* This repsonds to the list of applications that the service - has and calls application_added on each one of them. */ -static void -get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error, gpointer userdata) -{ - if (error != NULL) { - g_warning("Unable to get application list: %s", error->message); - return; - } - g_ptr_array_foreach(OUT_applications, get_applications_helper, userdata); - - return; -} - -/* A little helper that takes apart the DBus structure and calls - application_added on every entry in the list. */ -static void -get_applications_helper (gpointer data, gpointer user_data) -{ - GValueArray * array = (GValueArray *)data; - - g_return_if_fail(array->n_values == 7); - - const gchar * icon_name = g_value_get_string(g_value_array_get_nth(array, 0)); - gint position = g_value_get_int(g_value_array_get_nth(array, 1)); - const gchar * dbus_address = g_value_get_string(g_value_array_get_nth(array, 2)); - const gchar * dbus_object = g_value_get_boxed(g_value_array_get_nth(array, 3)); - const gchar * icon_theme_path = g_value_get_string(g_value_array_get_nth(array, 4)); - const gchar * label = g_value_get_string(g_value_array_get_nth(array, 5)); - const gchar * guide = g_value_get_string(g_value_array_get_nth(array, 6)); - - return application_added(NULL, icon_name, position, dbus_address, dbus_object, icon_theme_path, label, guide, user_data); -} - -/* Unrefs a theme directory. This may involve removing it from - the search path. */ -static void -theme_dir_unref(IndicatorApplication * ia, const gchar * dir) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(ia); - - /* Grab the count for this dir */ - int count = GPOINTER_TO_INT(g_hash_table_lookup(priv->theme_dirs, dir)); - - /* Is this a simple deprecation, if so, we can just lower the - number and move on. */ - if (count > 1) { - count--; - g_hash_table_insert(priv->theme_dirs, g_strdup(dir), GINT_TO_POINTER(count)); - return; - } - - /* Try to remove it from the hash table, this makes sure - that it existed */ - if (!g_hash_table_remove(priv->theme_dirs, dir)) { - g_warning("Unref'd a directory that wasn't in the theme dir hash table."); - return; - } - - GtkIconTheme * icon_theme = gtk_icon_theme_get_default(); - gchar ** paths; - gint path_count; - - gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count); - - gint i; - gboolean found = FALSE; - for (i = 0; i < path_count; i++) { - if (found) { - /* If we've already found the right entry */ - paths[i - 1] = paths[i]; - } else { - /* We're still looking, is this the one? */ - if (!g_strcmp0(paths[i], dir)) { - found = TRUE; - /* We're freeing this here as it won't be captured by the - g_strfreev() below as it's out of the array. */ - g_free(paths[i]); - } - } - } - - /* If we found one we need to reset the path to - accomidate the changes */ - if (found) { - paths[path_count - 1] = NULL; /* Clear the last one */ - gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, path_count - 1); - } - - g_strfreev(paths); - - return; -} - -/* Refs a theme directory, and it may add it to the search - path */ -static void -theme_dir_ref(IndicatorApplication * ia, const gchar * dir) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(ia); - - int count = 0; - if ((count = GPOINTER_TO_INT(g_hash_table_lookup(priv->theme_dirs, dir))) != 0) { - /* It exists so what we need to do is increase the ref - count of this dir. */ - count++; - } else { - /* It doesn't exist, so we need to add it to the table - and to the search path. */ - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), dir); - g_debug("\tAppending search path: %s", dir); - count = 1; - } - - g_hash_table_insert(priv->theme_dirs, g_strdup(dir), GINT_TO_POINTER(count)); - - return; -} - diff --git a/src/notification-approver.xml b/src/notification-approver.xml deleted file mode 100644 index 4a8e39b..0000000 --- a/src/notification-approver.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 7123c74faabca0af8fbe51eb74ec8b310b6ba20a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:49:54 -0600 Subject: Adding back in the support for generating marshallers --- src/Makefile.am | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index c85f0e8..b1353a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,17 @@ EXTRA_DIST = appindicator-0.1.pc.in include $(top_srcdir)/Makefile.am.enum include $(top_srcdir)/Makefile.am.marshal +################################## +# Marshallers +################################## + +BUILT_SOURCES += \ + application-service-marshal.h \ + application-service-marshal.c + +glib_marshal_list = application-service-marshal.list +glib_marshal_prefix = _application_service_marshal + ################################## # Library ################################## -- cgit v1.2.3 From f664f48d3547ff1410f2b457c99f3b4d1b6ce4d3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:53:45 -0600 Subject: Removing the approver test and switching the build flags --- tests/Makefile.am | 60 +++++------------ tests/test-approver.c | 179 -------------------------------------------------- 2 files changed, 16 insertions(+), 223 deletions(-) delete mode 100644 tests/test-approver.c diff --git a/tests/Makefile.am b/tests/Makefile.am index f2bdbb2..5b7879c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,5 @@ check_PROGRAMS = \ - test-approver \ test-libappindicator \ test-libappindicator-dbus-client \ test-libappindicator-dbus-server \ @@ -23,12 +22,12 @@ test_libappindicator_SOURCES = \ test-libappindicator.c test_libappindicator_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -40,12 +39,12 @@ test_libappindicator_dbus_client_SOURCES = \ test-libappindicator-dbus-client.c test_libappindicator_dbus_client_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_dbus_client_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -57,12 +56,12 @@ test_libappindicator_dbus_server_SOURCES = \ test-libappindicator-dbus-server.c test_libappindicator_dbus_server_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_dbus_server_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -74,12 +73,12 @@ test_libappindicator_status_client_SOURCES = \ test-libappindicator-status-client.c test_libappindicator_status_client_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_status_client_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -91,41 +90,14 @@ test_libappindicator_status_server_SOURCES = \ test-libappindicator-status-server.c test_libappindicator_status_server_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_status_server_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la -######################################### -## test-approver -######################################### - -test_approver_SOURCES = \ - test-approver.c - -test_approver_CFLAGS = \ - $(INDICATOR_CFLAGS) \ - -Wall -Werror \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src - -test_approver_LDADD = \ - $(INDICATOR_LIBS) \ - $(top_builddir)/src/libappindicator.la - -test-approver-tester: test-approver Makefile.am - @echo "#!/bin/bash" > $@ - @echo export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=1000 >> $@ - @echo . $(srcdir)/run-xvfb.sh >> $@ - @echo $(DBUS_RUNNER) --task $(builddir)/test-approver --task-name Approver --task $(top_builddir)/src/indicator-application-service --task-name Service --ignore-return >> $@ - @chmod +x $@ - -TESTS += test-approver-tester - - ######################################### ## test-libappindicator-fallback ######################################### @@ -134,24 +106,24 @@ test_libappindicator_fallback_watcher_SOURCES = \ test-libappindicator-fallback-watcher.c test_libappindicator_fallback_watcher_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_fallback_watcher_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la test_libappindicator_fallback_item_SOURCES = \ test-libappindicator-fallback-item.c test_libappindicator_fallback_item_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_fallback_item_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am @@ -210,11 +182,11 @@ test_simple_app_SOURCES = \ test-simple-app.c test_simple_app_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_simple_app_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la diff --git a/tests/test-approver.c b/tests/test-approver.c deleted file mode 100644 index 2665505..0000000 --- a/tests/test-approver.c +++ /dev/null @@ -1,179 +0,0 @@ -#include -#include - -#include - -#include "notification-watcher-client.h" -#include "dbus-shared.h" -#include "app-indicator.h" - -#define APPROVER_PATH "/my/approver" - -#define INDICATOR_ID "test-indicator-id" -#define INDICATOR_ICON "test-indicator-icon-name" -#define INDICATOR_CATEGORY APP_INDICATOR_CATEGORY_APPLICATION_STATUS - -#define TEST_APPROVER_TYPE (test_approver_get_type ()) -#define TEST_APPROVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_APPROVER_TYPE, TestApprover)) -#define TEST_APPROVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TEST_APPROVER_TYPE, TestApproverClass)) -#define IS_TEST_APPROVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_APPROVER_TYPE)) -#define IS_TEST_APPROVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TEST_APPROVER_TYPE)) -#define TEST_APPROVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TEST_APPROVER_TYPE, TestApproverClass)) - -typedef struct _TestApprover TestApprover; -typedef struct _TestApproverClass TestApproverClass; - -struct _TestApproverClass { - GObjectClass parent_class; -}; - -struct _TestApprover { - GObject parent; -}; - -GType test_approver_get_type (void); - -static void test_approver_class_init (TestApproverClass *klass); -static void test_approver_init (TestApprover *self); -static gboolean _notification_approver_server_approve_item (TestApprover * ta, const gchar * id, const gchar * category, guint pid, const gchar * address, const gchar * path, gboolean * approved, GError ** error); - -#include "../src/notification-approver-server.h" - -GMainLoop * main_loop = NULL; -DBusGConnection * session_bus = NULL; -DBusGProxy * bus_proxy = NULL; -AppIndicator * app_indicator = NULL; -gboolean passed = FALSE; - -G_DEFINE_TYPE (TestApprover, test_approver, G_TYPE_OBJECT); - -static void -test_approver_class_init (TestApproverClass *klass) -{ - dbus_g_object_type_install_info(TEST_APPROVER_TYPE, - &dbus_glib__notification_approver_server_object_info); - - return; -} - -static void -test_approver_init (TestApprover *self) -{ - dbus_g_connection_register_g_object(session_bus, - APPROVER_PATH, - G_OBJECT(self)); - - return; -} - -static gboolean -_notification_approver_server_approve_item (TestApprover * ta, const gchar * id, const gchar * category, guint pid, const gchar * address, const gchar * path, gboolean * approved, GError ** error) -{ - *approved = TRUE; - g_debug("Asked to approve indicator"); - - if (g_strcmp0(id, INDICATOR_ID) == 0) { - passed = TRUE; - } - - g_main_loop_quit(main_loop); - - return TRUE; -} - -static void -register_cb (DBusGProxy * proxy, GError * error, gpointer user_data) -{ - if (error != NULL) { - g_warning("Unable to register approver: %s", error->message); - g_error_free(error); - g_main_loop_quit(main_loop); - return; - } - - g_debug("Building App Indicator"); - app_indicator = app_indicator_new(INDICATOR_ID, INDICATOR_ICON, INDICATOR_CATEGORY); - - GtkWidget * menu = gtk_menu_new(); - GtkWidget * mi = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); - - app_indicator_set_menu(app_indicator, GTK_MENU(menu)); - - return; -} - -gint owner_count = 0; -gboolean -check_for_service (gpointer user_data) -{ - g_debug("Checking for Watcher"); - - if (owner_count > 100) { - g_warning("Couldn't find watcher after 100 tries."); - g_main_loop_quit(main_loop); - return FALSE; - } - - owner_count++; - - gboolean has_owner = FALSE; - org_freedesktop_DBus_name_has_owner(bus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, &has_owner, NULL); - - if (has_owner) { - const char * cats = NULL; - DBusGProxy * proxy = dbus_g_proxy_new_for_name(session_bus, - NOTIFICATION_WATCHER_DBUS_ADDR, - NOTIFICATION_WATCHER_DBUS_OBJ, - NOTIFICATION_WATCHER_DBUS_IFACE); - - g_debug("Registering Approver"); - org_kde_StatusNotifierWatcher_x_ayatana_register_notification_approver_async (proxy, APPROVER_PATH, &cats, register_cb, NULL); - - return FALSE; - } - - return TRUE; -} - -gboolean -fail_timeout (gpointer user_data) -{ - g_debug("Failure timeout initiated."); - g_main_loop_quit(main_loop); - return FALSE; -} - -int -main (int argc, char ** argv) -{ - GError * error = NULL; - - gtk_init(&argc, &argv); - g_debug("Initing"); - - session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); - if (error != NULL) { - g_warning("Unable to get session bus: %s", error->message); - g_error_free(error); - return -1; - } - - TestApprover * approver = g_object_new(TEST_APPROVER_TYPE, NULL); - - bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); - - g_timeout_add(100, check_for_service, NULL); - g_timeout_add_seconds(2, fail_timeout, NULL); - - main_loop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(main_loop); - - g_object_unref(approver); - - if (!passed) { - return -1; - } - - return 0; -} -- cgit v1.2.3 From dd21c709028f6f1b96f702713acef3ac79f82f81 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:55:10 -0600 Subject: Changing more of the bulid directives over to be library based --- docs/reference/Makefile.am | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index d2ef3bb..948549a 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -90,7 +90,7 @@ expand_content_files= # signals and properties. # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(INDICATOR_CFLAGS) +GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS) GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/src/Makefile.am b/src/Makefile.am index b1353a0..e591129 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -118,7 +118,7 @@ AppIndicator-0.1.gir: libappindicator.la $(glib_enum_h) AppIndicator_0_1_gir_INCLUDES = \ GObject-2.0 \ Gtk-2.0 -AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir) -I$(top_builddir)/src +AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src AppIndicator_0_1_gir_LIBS = libappindicator.la AppIndicator_0_1_gir_FILES = $(introspection_sources) -- cgit v1.2.3 From 185a2a9f6169928726c0710f77b440818ee582ce Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:56:14 -0600 Subject: Dropping a lib that should have never been there! --- docs/reference/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 948549a..e793da7 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -91,7 +91,7 @@ expand_content_files= # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la +GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.local.make -- cgit v1.2.3 From 03dbdec884967325fc7e9135fbc336962ff2d6bf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 15:06:45 -0600 Subject: Migrating to the LIBRARY flags --- example/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/Makefile.am b/example/Makefile.am index f4f2ab2..ae468f7 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -10,10 +10,10 @@ simple_client_SOURCES = \ simple-client.c simple_client_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src simple_client_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la -- cgit v1.2.3 From d2a48b2530f5218ca71673ab072b707e374ad0c6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 15:17:54 -0600 Subject: Oops, someone has to bring dbus-shared.h into the tarball now --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index e591129..dc81059 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,6 +51,7 @@ libappindicator_la_SOURCES = \ app-indicator-enum-types.c \ app-indicator.c \ application-service-marshal.c \ + dbus-shared.h \ generate-id.h \ generate-id.c -- cgit v1.2.3 From 4d2b723c0c6095e07cdbd908971edcfc37128920 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 09:09:01 -0600 Subject: Dropping dbus-glib and checking for a GIO version --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 03eeae4..1d60bbe 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,7 @@ AC_CONFIG_MACRO_DIR(m4) GTK_REQUIRED_VERSION=2.18 GTK3_REQUIRED_VERSION=2.91 +GIO_REQUIRED_VERSION=2.26 INDICATOR_REQUIRED_VERSION=0.3.5 DBUSMENUGTK_REQUIRED_VERSION=0.2.2 DBUS_GLIB_REQUIRED_VERSION=0.82 @@ -50,8 +51,8 @@ AC_ARG_WITH([gtk], [with_gtk=2]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBRARAY, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION indicator3 >= $INDICATOR_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(LIBRARY_CFLAGS) AC_SUBST(LIBRARY_LIBS) @@ -59,8 +60,8 @@ AS_IF([test "x$with_gtk" = x3], ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(LIBRARY_CFLAGS) AC_SUBST(LIBRARY_LIBS) -- cgit v1.2.3 From d797092764eb9d3f2907706487bdcd94f9d2cfb8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 09:09:29 -0600 Subject: No indicator directory without the service --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 03eeae4..fd64573 100644 --- a/configure.ac +++ b/configure.ac @@ -214,6 +214,5 @@ AC_MSG_NOTICE([ Libappindicator Configuration: Prefix: $prefix - Indicator Dir: $INDICATORDIR GTK+ Version: $with_gtk ]) -- cgit v1.2.3 From 2209cb8604a929a6f1af5cec4991388ad32a7d1c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 09:50:21 -0600 Subject: Changing to not use the dbus binding tool but to instead turn the XML files into pseudo-C --- src/Makefile.am | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 073fc41..ce83951 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,10 +54,6 @@ libappindicatorinclude_HEADERS = \ $(libappindicator_headers) \ $(glib_enum_h) -BUILT_SOURCES += \ - notification-watcher-client.h \ - notification-item-server.h - libappindicator_la_SOURCES = \ $(libappindicator_headers) \ app-indicator-enum-types.c \ @@ -65,7 +61,11 @@ libappindicator_la_SOURCES = \ application-service-marshal.c \ dbus-shared.h \ generate-id.h \ - generate-id.c + generate-id.c \ + notification-item.xml.h \ + notification-item.xml.c \ + notification-watcher.xml.h \ + notification-watcher.xml.c libappindicator_la_LDFLAGS = \ -version-info 1:0:0 \ @@ -99,25 +99,17 @@ DBUS_SPECS = \ notification-item.xml \ notification-watcher.xml -%-client.h: %.xml - dbus-binding-tool \ - --prefix=_$(notdir $(subst -,_,$(<:.xml=)))_client \ - --mode=glib-client \ - --output=$@ \ - $< - -%-server.h: %.xml - dbus-binding-tool \ - --prefix=_$(notdir $(subst -,_,$(<:.xml=)))_server \ - --mode=glib-server \ - --output=$@ \ - $< +%.xml.h: %.xml + echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@ -BUILT_SOURCES += \ - $(DBUS_SPECS:.xml=-client.h) \ - $(DBUS_SPECS:.xml=-server.h) +%.xml.c: %.xml + echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@ + sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ + echo ";" >> $@ -CLEANFILES += $(BUILT_SOURCES) +CLEANFILES += \ + $(DBUS_SPECS:.xml=.xml.h) \ + $(DBUS_SPECS:.xml=.xml.c) EXTRA_DIST += $(DBUS_SPECS) -- cgit v1.2.3 From f590403207e1f675983c90188c1d8d24ebb1d0c1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 10:07:01 -0600 Subject: Entirely unsure why this makes things better, but well, it does. --- src/Makefile.am | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ce83951..673938b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,12 +100,20 @@ DBUS_SPECS = \ notification-watcher.xml %.xml.h: %.xml - echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@ + @echo "Building $@ from $<" + @echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@ %.xml.c: %.xml - echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@ - sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ - echo ";" >> $@ + @echo "Building $@ from $<" + @echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@ + @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ + @echo ";" >> $@ + +BUILT_SOURCES += \ + notification-item.xml.c \ + notification-item.xml.h \ + notification-watcher.xml.c \ + notification-watcher.xml.h CLEANFILES += \ $(DBUS_SPECS:.xml=.xml.h) \ -- cgit v1.2.3 From 9287e2084f137024fc5d519a241f83ade387f3b0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 11:13:54 -0600 Subject: Building up the base inforation for the dbus interfaces as static globals --- src/app-indicator.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 4886605..6403a9b 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -48,8 +48,8 @@ License version 3 and version 2.1 along with this program. If not, see #include "app-indicator-enum-types.h" #include "application-service-marshal.h" -#include "notification-item-server.h" -#include "notification-watcher-client.h" +#include "notification-watcher.xml.h" +#include "notification-item.xml.h" #include "dbus-shared.h" #include "generate-id.h" @@ -165,6 +165,12 @@ enum { /* More constants */ #define DEFAULT_FALLBACK_TIMER 100 /* in milliseconds */ +/* Globals */ +static GDBusNodeInfo * item_node_info = NULL; +static GDBusInterfaceInfo * item_interface_info = NULL; +static GDBusNodeInfo * watcher_node_info = NULL; +static GDBusInterfaceInfo * watcher_interface_info = NULL; + /* Boiler plate */ static void app_indicator_class_init (AppIndicatorClass *klass); static void app_indicator_init (AppIndicator *self); @@ -542,6 +548,43 @@ app_indicator_class_init (AppIndicatorClass *klass) g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); + /* DBus interfaces */ + if (item_node_info == NULL) { + GError * error = NULL; + + item_node_info = g_dbus_node_info_new_for_xml(notification_item_xml, &error); + if (error != NULL) { + g_error("Unable to parse Notification Item DBus interface: %s", error->message); + g_error_free(error); + } + } + + if (item_interface_info == NULL && item_node_info != NULL) { + item_interface_info = g_dbus_node_info_lookup_interface(item_node_info, NOTIFICATION_ITEM_DBUS_IFACE); + + if (item_interface_info == NULL) { + g_error("Unable to find interface '" NOTIFICATION_ITEM_DBUS_IFACE "'"); + } + } + + if (watcher_node_info == NULL) { + GError * error = NULL; + + watcher_node_info = g_dbus_node_info_new_for_xml(notification_watcher_xml, &error); + if (error != NULL) { + g_error("Unable to parse Notification Item DBus interface: %s", error->message); + g_error_free(error); + } + } + + if (watcher_interface_info == NULL && watcher_node_info != NULL) { + watcher_interface_info = g_dbus_node_info_lookup_interface(watcher_node_info, NOTIFICATION_WATCHER_DBUS_IFACE); + + if (watcher_interface_info == NULL) { + g_error("Unable to find interface '" NOTIFICATION_WATCHER_DBUS_IFACE "'"); + } + } + /* Initialize the object as a DBus type */ dbus_g_object_type_install_info(APP_INDICATOR_TYPE, &dbus_glib__notification_item_server_object_info); -- cgit v1.2.3 From 589bebb75b236729cdce2e139f4aa2da2317c495 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 11:21:26 -0600 Subject: Dropping the registration of the type of the object in the dbus-glib way --- src/app-indicator.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 6403a9b..76b5dd1 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -585,10 +585,6 @@ app_indicator_class_init (AppIndicatorClass *klass) } } - /* Initialize the object as a DBus type */ - dbus_g_object_type_install_info(APP_INDICATOR_TYPE, - &dbus_glib__notification_item_server_object_info); - return; } -- cgit v1.2.3 From c1f18c7a8731c9381075a4ddf1645a6feb591ad1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 11:45:27 -0600 Subject: Switching the dbus object registration to us GDBus --- src/app-indicator.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 76b5dd1..b18ac36 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -95,6 +95,7 @@ struct _AppIndicatorPrivate { DBusGProxy *watcher_proxy; DBusGConnection *connection; DBusGProxy * dbus_proxy; + guint dbus_registration; /* Might be used */ IndicatorDesktopShortcuts * shorties; @@ -194,8 +195,14 @@ static gchar * append_panel_icon_suffix (const gchar * icon_name); static void watcher_proxy_destroyed (GObject * object, gpointer data); static void client_menu_changed (GtkWidget *widget, GtkWidget *child, AppIndicator *indicator); static void submenu_changed (GtkWidget *widget, GtkWidget *child, gpointer data); - static void theme_changed_cb (GtkIconTheme * theme, gpointer user_data); +static GVariant * bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * property, GError ** error, gpointer user_data); + +static const GDBusInterfaceVTable item_interface_table = { + method_call: NULL, /* No methods on this object */ + get_property: bus_get_prop, + set_property: NULL /* No properties that can be set */ +}; /* GObject type */ G_DEFINE_TYPE (AppIndicator, app_indicator, G_TYPE_OBJECT); @@ -610,6 +617,7 @@ app_indicator_init (AppIndicator *self) priv->watcher_proxy = NULL; priv->connection = NULL; priv->dbus_proxy = NULL; + priv->dbus_registration = 0; priv->status_icon = NULL; priv->fallback_timer = 0; @@ -642,6 +650,11 @@ app_indicator_dispose (GObject *object) AppIndicator *self = APP_INDICATOR (object); AppIndicatorPrivate *priv = self->priv; + if (priv->dbus_registration != 0) { + g_dbus_connection_unregister_object(priv->connection, priv->dbus_registration); + priv->dbus_registration = 0; + } + if (priv->shorties != NULL) { g_object_unref(G_OBJECT(priv->shorties)); priv->shorties = NULL; @@ -1012,11 +1025,21 @@ check_connect (AppIndicator *self) gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id); - dbus_g_connection_register_g_object(priv->connection, - path, - G_OBJECT(self)); - GError * error = NULL; + priv->dbus_registration = g_dbus_connection_register_object(priv->connection, + path, + item_interface_info, + &item_interface_table, + self, + NULL, + &error); + if (error != NULL) { + g_warning("Unable to register object on path '%s': %s", path, error->message); + g_error_free(error); + g_free(path); + return; + } + priv->watcher_proxy = dbus_g_proxy_new_for_name_owner(priv->connection, NOTIFICATION_WATCHER_DBUS_ADDR, NOTIFICATION_WATCHER_DBUS_OBJ, -- cgit v1.2.3 From 6a4266ba2927f856235b3788938333e9377c0e89 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 12:25:07 -0600 Subject: Changing the connection to be a GDBus connection and making aquiring it async --- src/app-indicator.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index b18ac36..9715817 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -93,7 +93,7 @@ struct _AppIndicatorPrivate { /* Fun stuff */ DBusGProxy *watcher_proxy; - DBusGConnection *connection; + GDBusConnection *connection; DBusGProxy * dbus_proxy; guint dbus_registration; @@ -197,6 +197,7 @@ static void client_menu_changed (GtkWidget *widget, GtkWidget *child, AppIndicat static void submenu_changed (GtkWidget *widget, GtkWidget *child, gpointer data); static void theme_changed_cb (GtkIconTheme * theme, gpointer user_data); static GVariant * bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * property, GError ** error, gpointer user_data); +static void bus_creation (GObject * obj, GAsyncResult * res, gpointer user_data); static const GDBusInterfaceVTable item_interface_table = { method_call: NULL, /* No methods on this object */ @@ -624,15 +625,8 @@ app_indicator_init (AppIndicator *self) priv->shorties = NULL; - /* Put the object on DBus */ - GError * error = NULL; - priv->connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error); - if (error != NULL) { - g_error("Unable to connect to the session bus when creating application indicator: %s", error->message); - g_error_free(error); - return; - } - dbus_g_connection_ref(priv->connection); + /* Start getting the session bus */ + g_bus_get(G_BUS_TYPE_SESSION, NULL, bus_creation, self); g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()), "changed", G_CALLBACK(theme_changed_cb), self); @@ -765,6 +759,11 @@ app_indicator_finalize (GObject *object) priv->label_guide = NULL; } + if (priv->connection != NULL) { + g_object_unref(G_OBJECT(priv->connection)); + priv->connection = NULL; + } + G_OBJECT_CLASS (app_indicator_parent_class)->finalize (object); return; } @@ -970,6 +969,29 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa return; } +/* DBus bus has been created, well maybe, but we got a call + back about it so we need to check into it. */ +static void +bus_creation (GObject * obj, GAsyncResult * res, gpointer user_data) +{ + GError * error = NULL; + + GDBusConnection * connection = g_bus_get_finish(res, &error); + if (error != NULL) { + g_warning("Unable to get the session bus: %s", error->message); + g_error_free(error); + return; + } + + AppIndicator * app = APP_INDICATOR(user_data); + app->priv->connection = connection; + + /* If the connection was blocking the exporting of the + object this function will export everything. */ + check_connect(app); + return; +} + /* Sends the label changed signal and resets the source ID */ static gboolean signal_label_change_idle (gpointer user_data) @@ -1015,6 +1037,9 @@ check_connect (AppIndicator *self) { AppIndicatorPrivate *priv = self->priv; + /* Do we have a connection? */ + if (priv->connection == NULL) return; + /* We're alreadying connecting or trying to connect. */ if (priv->watcher_proxy != NULL) return; -- cgit v1.2.3 From 47a57ebf6440359988dc321a124dad7078b83287 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 12:27:15 -0600 Subject: Blacklisting some new files --- .bzrignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bzrignore b/.bzrignore index 6f66217..7fa0f3f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -115,3 +115,11 @@ bindings/mono/policy.0.0.appindicator-sharp.config bindings/mono/policy.0.0.appindicator-sharp.dll src/libapplication_la-generate-id.lo src/libappindicator_la-generate-id.lo +bindings/mono/app-indicator.c +bindings/mono/policy.0.1.appindicator-sharp.config +bindings/mono/policy.0.1.appindicator-sharp.dll +src/appindicator3-0.1.pc +src/notification-item.xml.c +src/notification-item.xml.h +src/notification-watcher.xml.c +src/notification-watcher.xml.h -- cgit v1.2.3 From 6e078ce032712912c87fafa641051248c8b43d57 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 14:36:57 -0600 Subject: Readjusting how the proxy is setup, called back, and the registration occurs. --- src/app-indicator.c | 151 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 113 insertions(+), 38 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 9715817..2a8eb2f 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -92,10 +92,11 @@ struct _AppIndicatorPrivate { gint fallback_timer; /* Fun stuff */ - DBusGProxy *watcher_proxy; + GDBusProxy *watcher_proxy; GDBusConnection *connection; DBusGProxy * dbus_proxy; guint dbus_registration; + gchar * path; /* Might be used */ IndicatorDesktopShortcuts * shorties; @@ -198,6 +199,7 @@ static void submenu_changed (GtkWidget *widget, GtkWidget *child, gpointer data) static void theme_changed_cb (GtkIconTheme * theme, gpointer user_data); static GVariant * bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * property, GError ** error, gpointer user_data); static void bus_creation (GObject * obj, GAsyncResult * res, gpointer user_data); +static void bus_watcher_ready (GObject * obj, GAsyncResult * res, gpointer user_data); static const GDBusInterfaceVTable item_interface_table = { method_call: NULL, /* No methods on this object */ @@ -619,6 +621,7 @@ app_indicator_init (AppIndicator *self) priv->connection = NULL; priv->dbus_proxy = NULL; priv->dbus_registration = 0; + priv->path = NULL; priv->status_icon = NULL; priv->fallback_timer = 0; @@ -694,7 +697,6 @@ app_indicator_dispose (GObject *object) } if (priv->watcher_proxy != NULL) { - dbus_g_connection_flush(priv->connection); g_signal_handlers_disconnect_by_func(G_OBJECT(priv->watcher_proxy), watcher_proxy_destroyed, self); g_object_unref(G_OBJECT(priv->watcher_proxy)); priv->watcher_proxy = NULL; @@ -704,7 +706,7 @@ app_indicator_dispose (GObject *object) } if (priv->connection != NULL) { - dbus_g_connection_unref(priv->connection); + g_object_unref(G_OBJECT(priv->connection)); priv->connection = NULL; } @@ -717,8 +719,8 @@ app_indicator_dispose (GObject *object) static void app_indicator_finalize (GObject *object) { - AppIndicator * self = APP_INDICATOR(object); - AppIndicatorPrivate *priv = self->priv; + AppIndicator * self = APP_INDICATOR(object); + AppIndicatorPrivate *priv = self->priv; if (priv->status != APP_INDICATOR_STATUS_PASSIVE) { g_warning("Finalizing Application Status with the status set to: %d", priv->status); @@ -759,9 +761,9 @@ app_indicator_finalize (GObject *object) priv->label_guide = NULL; } - if (priv->connection != NULL) { - g_object_unref(G_OBJECT(priv->connection)); - priv->connection = NULL; + if (priv->path != NULL) { + g_free(priv->path); + priv->path = NULL; } G_OBJECT_CLASS (app_indicator_parent_class)->finalize (object); @@ -938,9 +940,20 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa } break; - case PROP_CONNECTED: - g_value_set_boolean (value, priv->watcher_proxy != NULL ? TRUE : FALSE); - break; + case PROP_CONNECTED: { + gboolean connected = FALSE; + + if (priv->watcher_proxy != NULL) { + gchar * name = g_dbus_proxy_get_name_owner(priv->watcher_proxy); + if (name != NULL) { + connected = TRUE; + g_free(name); + } + } + + g_value_set_boolean (value, connected); + break; + } case PROP_X_LABEL: case PROP_LABEL: @@ -1043,50 +1056,109 @@ check_connect (AppIndicator *self) /* We're alreadying connecting or trying to connect. */ if (priv->watcher_proxy != NULL) return; + gchar * name = g_dbus_proxy_get_name_owner(priv->watcher_proxy); + if (name == NULL) { + return; + } + g_free(name); + /* Do we have enough information? */ if (priv->menu == NULL) return; if (priv->icon_name == NULL) return; if (priv->id == NULL) return; - gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id); + if (priv->path == NULL) { + priv->path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id); + } + if (priv->dbus_registration == 0) { + GError * error = NULL; + priv->dbus_registration = g_dbus_connection_register_object(priv->connection, + priv->path, + item_interface_info, + &item_interface_table, + self, + NULL, + &error); + if (error != NULL) { + g_warning("Unable to register object on path '%s': %s", priv->path, error->message); + g_error_free(error); + return; + } + } + + /* NOTE: It's really important the order here. We make sure to *publish* + the object on the bus and *then* get the proxy. The reason is that we + want to ensure all the filters are setup before talking to the watcher + and that's where the order is important. */ + + if (priv->watcher_proxy == NULL) { + /* Build Watcher Proxy */ + g_dbus_proxy_new(priv->connection, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, /* We don't use these, don't bother with them */ + watcher_interface_info, + NOTIFICATION_WATCHER_DBUS_ADDR, + NOTIFICATION_WATCHER_DBUS_OBJ, + NOTIFICATION_WATCHER_DBUS_IFACE, + NULL, /* cancellable */ + bus_watcher_ready, + self); + } else { + bus_watcher_ready(NULL, NULL, self); + } + + return; +} + +/* Callback for when the watcher proxy has been created, or not + but we got called none-the-less. */ +static void +bus_watcher_ready (GObject * obj, GAsyncResult * res, gpointer user_data) +{ GError * error = NULL; - priv->dbus_registration = g_dbus_connection_register_object(priv->connection, - path, - item_interface_info, - &item_interface_table, - self, - NULL, - &error); - if (error != NULL) { - g_warning("Unable to register object on path '%s': %s", path, error->message); - g_error_free(error); - g_free(path); - return; + + GDBusProxy * proxy = NULL; + if (res != NULL) { + proxy = g_dbus_proxy_new_finish(res, &error); } - priv->watcher_proxy = dbus_g_proxy_new_for_name_owner(priv->connection, - NOTIFICATION_WATCHER_DBUS_ADDR, - NOTIFICATION_WATCHER_DBUS_OBJ, - NOTIFICATION_WATCHER_DBUS_IFACE, - &error); if (error != NULL) { /* Unable to get proxy, but we're handling that now so it's not a warning anymore. */ g_error_free(error); - dbus_g_connection_unregister_g_object(priv->connection, - G_OBJECT(self)); - start_fallback_timer(self, FALSE); - g_free(path); + + if (IS_APP_INDICATOR(user_data)) { + start_fallback_timer(APP_INDICATOR(user_data), FALSE); + } return; } - g_signal_connect(G_OBJECT(priv->watcher_proxy), "destroy", G_CALLBACK(watcher_proxy_destroyed), self); - org_kde_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, path, register_service_cb, self); - g_free(path); + AppIndicator * app = APP_INDICATOR(user_data); - /* Emit the AppIndicator::connection-changed signal*/ - g_signal_emit (self, signals[CONNECTION_CHANGED], 0, TRUE); + if (res != NULL) { + app->priv->watcher_proxy = proxy; + + /* Setting up a signal to watch when the unique name + changes */ + g_signal_connect(G_OBJECT(app->priv->watcher_proxy), "destroy", G_CALLBACK(watcher_proxy_destroyed), user_data); + } + + /* Let's insure that someone is on the other side, else we're + still in a fallback scenario. */ + gchar * name = g_dbus_proxy_get_name_owner(app->priv->watcher_proxy); + if (name == NULL) { + start_fallback_timer(APP_INDICATOR(user_data), FALSE); + return; + } + + g_dbus_proxy_call(app->priv->watcher_proxy, + "RegisterStatusNotifierItem", + g_variant_new("(s)", app->priv->path), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, /* cancelable */ + register_service_cb, + user_data); return; } @@ -1129,6 +1201,9 @@ register_service_cb (DBusGProxy * proxy, GError * error, gpointer data) start_fallback_timer(APP_INDICATOR(data), TRUE); } + /* Emit the AppIndicator::connection-changed signal*/ + g_signal_emit (self, signals[CONNECTION_CHANGED], 0, TRUE); + if (priv->status_icon) { AppIndicatorClass * class = APP_INDICATOR_GET_CLASS(data); if (class->unfallback != NULL) { -- cgit v1.2.3 From 884367e5f739a56355d56a707ff0d741934190ec Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 15:57:14 -0600 Subject: Switch from using the DBus proxy to using the owner change signal on the watcher proxy. --- src/app-indicator.c | 167 ++++++++++++++-------------------------------------- 1 file changed, 44 insertions(+), 123 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 2a8eb2f..94cf624 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -94,7 +94,6 @@ struct _AppIndicatorPrivate { /* Fun stuff */ GDBusProxy *watcher_proxy; GDBusConnection *connection; - DBusGProxy * dbus_proxy; guint dbus_registration; gchar * path; @@ -184,7 +183,7 @@ static void app_indicator_get_property (GObject * object, guint prop_id, GValue /* Other stuff */ static void signal_label_change (AppIndicator * self); static void check_connect (AppIndicator * self); -static void register_service_cb (DBusGProxy * proxy, GError * error, gpointer data); +static void register_service_cb (GObject * obj, GAsyncResult * res, gpointer user_data); static void start_fallback_timer (AppIndicator * self, gboolean disable_timeout); static gboolean fallback_timer_expire (gpointer data); static GtkStatusIcon * fallback (AppIndicator * self); @@ -193,7 +192,7 @@ static void status_icon_changes (AppIndicator * self, gpointer data); static void status_icon_activate (GtkStatusIcon * icon, gpointer data); static void unfallback (AppIndicator * self, GtkStatusIcon * status_icon); static gchar * append_panel_icon_suffix (const gchar * icon_name); -static void watcher_proxy_destroyed (GObject * object, gpointer data); +static void watcher_owner_changed (GObject * obj, GParamSpec * pspec, gpointer user_data); static void client_menu_changed (GtkWidget *widget, GtkWidget *child, AppIndicator *indicator); static void submenu_changed (GtkWidget *widget, GtkWidget *child, gpointer data); static void theme_changed_cb (GtkIconTheme * theme, gpointer user_data); @@ -619,7 +618,6 @@ app_indicator_init (AppIndicator *self) priv->watcher_proxy = NULL; priv->connection = NULL; - priv->dbus_proxy = NULL; priv->dbus_registration = 0; priv->path = NULL; @@ -687,17 +685,12 @@ app_indicator_dispose (GObject *object) priv->menu = NULL; } - if (priv->menuservice != NULL) { - g_object_unref (priv->menuservice); - } - - if (priv->dbus_proxy != NULL) { - g_object_unref(G_OBJECT(priv->dbus_proxy)); - priv->dbus_proxy = NULL; + if (priv->menuservice != NULL) { + g_object_unref (priv->menuservice); } if (priv->watcher_proxy != NULL) { - g_signal_handlers_disconnect_by_func(G_OBJECT(priv->watcher_proxy), watcher_proxy_destroyed, self); + g_signal_handlers_disconnect_by_func(G_OBJECT(priv->watcher_proxy), watcher_owner_changed, self); g_object_unref(G_OBJECT(priv->watcher_proxy)); priv->watcher_proxy = NULL; @@ -1140,7 +1133,7 @@ bus_watcher_ready (GObject * obj, GAsyncResult * res, gpointer user_data) /* Setting up a signal to watch when the unique name changes */ - g_signal_connect(G_OBJECT(app->priv->watcher_proxy), "destroy", G_CALLBACK(watcher_proxy_destroyed), user_data); + g_signal_connect(G_OBJECT(app->priv->watcher_proxy), "notify::g-name-owner", G_CALLBACK(watcher_owner_changed), user_data); } /* Let's insure that someone is on the other side, else we're @@ -1163,51 +1156,67 @@ bus_watcher_ready (GObject * obj, GAsyncResult * res, gpointer user_data) return; } -/* A function that gets called when the watcher dies. Like - dies dies. Not our friend anymore. */ +/* Watching for when the name owner changes on the interface + to know whether we should be connected or not. */ static void -watcher_proxy_destroyed (GObject * object, gpointer data) +watcher_owner_changed (GObject * obj, GParamSpec * pspec, gpointer user_data) { - AppIndicator * self = APP_INDICATOR(data); + AppIndicator * self = APP_INDICATOR(user_data); g_return_if_fail(self != NULL); + g_return_if_fail(self->priv->watcher_proxy != NULL); - dbus_g_connection_unregister_g_object(self->priv->connection, - G_OBJECT(self)); - self->priv->watcher_proxy = NULL; + gchar * name = g_dbus_proxy_get_name_owner(self->priv->watcher_proxy); + + if (name == NULL) { + /* Emit the AppIndicator::connection-changed signal*/ + g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE); + + start_fallback_timer(self, FALSE); + } else { + if (self->priv->fallback_timer != 0) { + /* Stop the timer */ + g_source_remove(self->priv->fallback_timer); + self->priv->fallback_timer = 0; + } + + check_connect(self); + } - /* Emit the AppIndicator::connection-changed signal*/ - g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE); - - start_fallback_timer(self, FALSE); return; } /* Responce from the DBus command to register a service with a NotificationWatcher. */ static void -register_service_cb (DBusGProxy * proxy, GError * error, gpointer data) +register_service_cb (GObject * obj, GAsyncResult * res, gpointer user_data) { - g_return_if_fail(IS_APP_INDICATOR(data)); - AppIndicatorPrivate * priv = APP_INDICATOR(data)->priv; + GError * error = NULL; + GVariant * returns = g_dbus_proxy_call_finish(G_DBUS_PROXY(obj), res, &error); + + /* We don't care about any return values */ + if (returns != NULL) { + g_variant_unref(returns); + } if (error != NULL) { /* They didn't respond, ewww. Not sure what they could be doing */ g_warning("Unable to connect to the Notification Watcher: %s", error->message); - dbus_g_connection_unregister_g_object(priv->connection, - G_OBJECT(data)); - g_object_unref(G_OBJECT(priv->watcher_proxy)); - priv->watcher_proxy = NULL; - start_fallback_timer(APP_INDICATOR(data), TRUE); + start_fallback_timer(APP_INDICATOR(user_data), TRUE); + return; } + g_return_if_fail(IS_APP_INDICATOR(user_data)); + AppIndicator * app = APP_INDICATOR(user_data); + AppIndicatorPrivate * priv = app->priv; + /* Emit the AppIndicator::connection-changed signal*/ - g_signal_emit (self, signals[CONNECTION_CHANGED], 0, TRUE); + g_signal_emit (app, signals[CONNECTION_CHANGED], 0, TRUE); if (priv->status_icon) { - AppIndicatorClass * class = APP_INDICATOR_GET_CLASS(data); + AppIndicatorClass * class = APP_INDICATOR_GET_CLASS(app); if (class->unfallback != NULL) { - class->unfallback(APP_INDICATOR(data), priv->status_icon); + class->unfallback(app, priv->status_icon); priv->status_icon = NULL; } } @@ -1226,89 +1235,6 @@ category_from_enum (AppIndicatorCategory category) return value->value_nick; } -/* Watching the dbus owner change events to see if someone - we care about pops up! */ -static void -dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, gpointer data) -{ - if (new == NULL || new[0] == '\0') { - /* We only care about folks coming on the bus. Exit quickly otherwise. */ - return; - } - - if (g_strcmp0(name, NOTIFICATION_WATCHER_DBUS_ADDR)) { - /* We only care about this address, reject all others. */ - return; - } - - /* Woot, there's a new notification watcher in town. */ - - AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(data); - - if (priv->fallback_timer != 0) { - /* Stop a timer */ - g_source_remove(priv->fallback_timer); - - /* Stop listening to bus events */ - g_object_unref(G_OBJECT(priv->dbus_proxy)); - priv->dbus_proxy = NULL; - } - - /* Let's start from the very beginning */ - check_connect(APP_INDICATOR(data)); - - return; -} - -/* Checking to see if someone already has the name we're looking for */ -static void -check_owner_cb (DBusGProxy *proxy, gboolean exists, GError *error, gpointer userdata) -{ - if (error != NULL) { - g_warning("Unable to check for '" NOTIFICATION_WATCHER_DBUS_ADDR "' on DBus. No worries, but concerning."); - return; - } - - if (exists) { - g_debug("Woah, we actually has a race condition with dbus"); - dbus_owner_change(proxy, NOTIFICATION_WATCHER_DBUS_ADDR, NULL, "Non NULL", userdata); - } - - return; -} - -/* This is an idle function to create the proxy. This is mostly - because start_fallback_timer can get called in the distruction - of a proxy and thus the proxy manager gets confused when creating - a new proxy as part of destroying an old one. This function being - on idle means that we'll just do it outside of the same stack where - the previous proxy is being destroyed. */ -static gboolean -setup_name_owner_proxy (gpointer data) -{ - g_return_val_if_fail(IS_APP_INDICATOR(data), FALSE); - AppIndicatorPrivate * priv = APP_INDICATOR(data)->priv; - - if (priv->dbus_proxy == NULL) { - priv->dbus_proxy = dbus_g_proxy_new_for_name(priv->connection, - DBUS_SERVICE_DBUS, - DBUS_PATH_DBUS, - DBUS_INTERFACE_DBUS); - dbus_g_proxy_add_signal(priv->dbus_proxy, "NameOwnerChanged", - G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_connect_signal(priv->dbus_proxy, "NameOwnerChanged", - G_CALLBACK(dbus_owner_change), data, NULL); - - /* Check to see if anyone has the name we're looking for - just incase we missed it changing. */ - - org_freedesktop_DBus_name_has_owner_async(priv->dbus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, check_owner_cb, data); - } - - return FALSE; -} - /* A function that will start the fallback timer if it's not already started. It sets up the DBus watcher to see if there is a change. Also, provides an override mode for cases @@ -1330,11 +1256,6 @@ start_fallback_timer (AppIndicator * self, gboolean disable_timeout) return; } - if (priv->dbus_proxy == NULL) { - /* NOTE: Read the comment on setup_name_owner_proxy */ - g_idle_add(setup_name_owner_proxy, self); - } - if (disable_timeout) { fallback_timer_expire(self); } else { -- cgit v1.2.3 From a92f87080dea6c0d16bfb55bf75e155658bfa372 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 16:05:36 -0600 Subject: Adding in the get_prop function so that things start linking --- src/app-indicator.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 94cf624..0b31018 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -998,6 +998,16 @@ bus_creation (GObject * obj, GAsyncResult * res, gpointer user_data) return; } +/* DBus is asking for a property so we should figure out what it + wants and try and deliver. */ +static GVariant * +bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * property, GError ** error, gpointer user_data) +{ + + + return NULL; +} + /* Sends the label changed signal and resets the source ID */ static gboolean signal_label_change_idle (gpointer user_data) -- cgit v1.2.3 From 07aeca3802b2e19878b24637f1f73d971c7be101 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 16:38:29 -0600 Subject: Switching the names of the generated files to stop automake from thinking it needs to build the XML files. --- src/Makefile.am | 30 ++++++++++++++++-------------- src/app-indicator.c | 8 ++++---- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 673938b..5b6adc2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,10 +62,10 @@ libappindicator_la_SOURCES = \ dbus-shared.h \ generate-id.h \ generate-id.c \ - notification-item.xml.h \ - notification-item.xml.c \ - notification-watcher.xml.h \ - notification-watcher.xml.c + gen-notification-item.xml.h \ + gen-notification-item.xml.c \ + gen-notification-watcher.xml.h \ + gen-notification-watcher.xml.c libappindicator_la_LDFLAGS = \ -version-info 1:0:0 \ @@ -99,25 +99,27 @@ DBUS_SPECS = \ notification-item.xml \ notification-watcher.xml -%.xml.h: %.xml +gen-%.xml.h: %.xml @echo "Building $@ from $<" - @echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@ + @echo "extern const char * $(subst -,_,$(subst .,_,$(basename $<)));" > $@ -%.xml.c: %.xml +gen-%.xml.c: %.xml @echo "Building $@ from $<" - @echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@ + @echo "const char * $(subst -,_,$(subst .,_,$(basename $<))) = " > $@ @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ @echo ";" >> $@ BUILT_SOURCES += \ - notification-item.xml.c \ - notification-item.xml.h \ - notification-watcher.xml.c \ - notification-watcher.xml.h + gen-notification-item.xml.c \ + gen-notification-item.xml.h \ + gen-notification-watcher.xml.c \ + gen-notification-watcher.xml.h CLEANFILES += \ - $(DBUS_SPECS:.xml=.xml.h) \ - $(DBUS_SPECS:.xml=.xml.c) + gen-notification-item.xml.c \ + gen-notification-item.xml.h \ + gen-notification-watcher.xml.c \ + gen-notification-watcher.xml.h EXTRA_DIST += $(DBUS_SPECS) diff --git a/src/app-indicator.c b/src/app-indicator.c index 0b31018..0d469ac 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -48,8 +48,8 @@ License version 3 and version 2.1 along with this program. If not, see #include "app-indicator-enum-types.h" #include "application-service-marshal.h" -#include "notification-watcher.xml.h" -#include "notification-item.xml.h" +#include "gen-notification-watcher.xml.h" +#include "gen-notification-item.xml.h" #include "dbus-shared.h" #include "generate-id.h" @@ -561,7 +561,7 @@ app_indicator_class_init (AppIndicatorClass *klass) if (item_node_info == NULL) { GError * error = NULL; - item_node_info = g_dbus_node_info_new_for_xml(notification_item_xml, &error); + item_node_info = g_dbus_node_info_new_for_xml(notification_item, &error); if (error != NULL) { g_error("Unable to parse Notification Item DBus interface: %s", error->message); g_error_free(error); @@ -579,7 +579,7 @@ app_indicator_class_init (AppIndicatorClass *klass) if (watcher_node_info == NULL) { GError * error = NULL; - watcher_node_info = g_dbus_node_info_new_for_xml(notification_watcher_xml, &error); + watcher_node_info = g_dbus_node_info_new_for_xml(notification_watcher, &error); if (error != NULL) { g_error("Unable to parse Notification Item DBus interface: %s", error->message); g_error_free(error); -- cgit v1.2.3 From 1652577abbb869f4276c03f4e10b829c515cb674 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 17:06:10 -0600 Subject: Putting some dummy code in the bus get property function. --- src/app-indicator.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 0d469ac..a2bcaf2 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1003,8 +1003,29 @@ bus_creation (GObject * obj, GAsyncResult * res, gpointer user_data) static GVariant * bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * property, GError ** error, gpointer user_data) { + if (g_strcmp0(property, "Id") == 0) { + return g_variant_new("s", "bob"); + } else if (g_strcmp0(property, "Category") == 0) { + return g_variant_new("s", "bob"); + } else if (g_strcmp0(property, "Status") == 0) { + return g_variant_new("s", "bob"); + } else if (g_strcmp0(property, "IconName") == 0) { + return g_variant_new("s", "bob"); + } else if (g_strcmp0(property, "AttentionIconName") == 0) { + return g_variant_new("s", "bob"); + } else if (g_strcmp0(property, "IconThemePath") == 0) { + return g_variant_new("s", "bob"); + } else if (g_strcmp0(property, "Menu") == 0) { + return g_variant_new("o", "/bob"); + } else if (g_strcmp0(property, "XAyatanaLabel") == 0) { + return g_variant_new("s", "bob"); + } else if (g_strcmp0(property, "XAyatanaLabelGuide") == 0) { + return g_variant_new("s", "bob"); + } else if (g_strcmp0(property, "XAyatanaOrderingIndex") == 0) { + return g_variant_new("u", 42); + } - + *error = g_error_new(0, 0, "Unknown property: %s", property); return NULL; } -- cgit v1.2.3 From a666e4bf6fb63a54bc8fda8f12ba8c6cdbf19669 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 17:10:32 -0600 Subject: Dropping all the 'x' properties in the object --- src/app-indicator.c | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index a2bcaf2..a95c7c1 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -129,10 +129,7 @@ enum { PROP_CONNECTED, PROP_LABEL, PROP_LABEL_GUIDE, - PROP_X_LABEL, - PROP_X_LABEL_GUIDE, PROP_ORDERING_INDEX, - PROP_X_ORDERING_INDEX, PROP_DBUS_MENU_SERVER }; @@ -147,10 +144,7 @@ enum { #define PROP_CONNECTED_S "connected" #define PROP_LABEL_S "label" #define PROP_LABEL_GUIDE_S "label-guide" -#define PROP_X_LABEL_S ("x-ayatana-" PROP_LABEL_S) -#define PROP_X_LABEL_GUIDE_S ("x-ayatana-" PROP_LABEL_GUIDE_S) #define PROP_ORDERING_INDEX_S "ordering-index" -#define PROP_X_ORDERING_INDEX_S ("x-ayatana-" PROP_ORDERING_INDEX_S) #define PROP_DBUS_MENU_SERVER_S "dbus-menu-server" /* Private macro, shhhh! */ @@ -392,47 +386,7 @@ app_indicator_class_init (AppIndicatorClass *klass) "A way to override the default ordering of the applications by providing a very specific idea of where this entry should be placed.", 0, G_MAXUINT32, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - AppIndicator:x-ayatana-ordering-index: - - A wrapper for #AppIndicator:ordering-index so that it can match the - dbus interface currently. It will hopefully be retired, please don't - use it anywhere. - */ - g_object_class_install_property(object_class, - PROP_X_ORDERING_INDEX, - g_param_spec_uint (PROP_X_ORDERING_INDEX_S, - "A wrapper, please don't use.", - "A wrapper, please don't use.", - 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /** - AppIndicator:x-ayatana-label: - - Wrapper for #AppIndicator:label. Please use that in all of your - code. - */ - g_object_class_install_property(object_class, - PROP_X_LABEL, - g_param_spec_string (PROP_X_LABEL_S, - "A wrapper, please don't use.", - "A wrapper, please don't use.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - AppIndicator:x-ayatana-label-guide: - Wrapper for #AppIndicator:label-guide. Please use that in all of your - code. - */ - g_object_class_install_property(object_class, - PROP_X_LABEL_GUIDE, - g_param_spec_string (PROP_X_LABEL_GUIDE_S, - "A wrapper, please don't use.", - "A wrapper, please don't use.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** AppIndicator:dbus-menu-server: @@ -829,7 +783,6 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu check_connect (self); break; - case PROP_X_LABEL: case PROP_LABEL: { gchar * oldlabel = priv->label; priv->label = g_value_dup_string(value); @@ -848,7 +801,6 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu } break; } - case PROP_X_LABEL_GUIDE: case PROP_LABEL_GUIDE: { gchar * oldguide = priv->label_guide; priv->label_guide = g_value_dup_string(value); @@ -867,7 +819,6 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu } break; } - case PROP_X_ORDERING_INDEX: case PROP_ORDERING_INDEX: priv->ordering_index = g_value_get_uint(value); break; @@ -948,17 +899,14 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa break; } - case PROP_X_LABEL: case PROP_LABEL: g_value_set_string (value, priv->label); break; - case PROP_X_LABEL_GUIDE: case PROP_LABEL_GUIDE: g_value_set_string (value, priv->label_guide); break; - case PROP_X_ORDERING_INDEX: case PROP_ORDERING_INDEX: g_value_set_uint(value, priv->ordering_index); break; -- cgit v1.2.3 From 0d80d13d380533d5bb98f9820ff1e59c5ce80938 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 17:12:39 -0600 Subject: Killing the X signals as well --- src/app-indicator.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index a95c7c1..81f3754 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -107,7 +107,6 @@ enum { NEW_ATTENTION_ICON, NEW_STATUS, NEW_LABEL, - X_NEW_LABEL, CONNECTION_CHANGED, NEW_ICON_THEME_PATH, LAST_SIGNAL @@ -151,9 +150,6 @@ enum { #define APP_INDICATOR_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), APP_INDICATOR_TYPE, AppIndicatorPrivate)) -/* Signal wrapper */ -#define APP_INDICATOR_SIGNAL_X_NEW_LABEL ("x-ayatana-" APP_INDICATOR_SIGNAL_NEW_LABEL) - /* Default Path */ #define DEFAULT_ITEM_PATH "/org/ayatana/NotificationItem" @@ -464,22 +460,6 @@ app_indicator_class_init (AppIndicatorClass *klass) _application_service_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); - /** - AppIndicator::x-ayatana-new-label: - @arg0: The #AppIndicator object - @arg1: The string for the label - @arg1: The string for the guide - - Wrapper for #AppIndicator::new-label, please don't use this signal - use the other one. - */ - signals[X_NEW_LABEL] = g_signal_new (APP_INDICATOR_SIGNAL_X_NEW_LABEL, - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AppIndicatorClass, new_label), - NULL, NULL, - _application_service_marshal_VOID__STRING_STRING, - G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); /** AppIndicator::connection-changed: @@ -988,10 +968,6 @@ signal_label_change_idle (gpointer user_data) priv->label != NULL ? priv->label : "", priv->label_guide != NULL ? priv->label_guide : "", TRUE); - g_signal_emit(G_OBJECT(self), signals[X_NEW_LABEL], 0, - priv->label != NULL ? priv->label : "", - priv->label_guide != NULL ? priv->label_guide : "", - TRUE); priv->label_change_idle = 0; -- cgit v1.2.3 From 985854cc7dc80383d9ed365cde87a991a1304754 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 20:07:48 -0600 Subject: Returning real values for the dbus properties --- src/app-indicator.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 81f3754..3aaf444 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -931,26 +931,43 @@ bus_creation (GObject * obj, GAsyncResult * res, gpointer user_data) static GVariant * bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * property, GError ** error, gpointer user_data) { + g_return_val_if_fail(IS_APP_INDICATOR(user_data), NULL); + AppIndicator * app = APP_INDICATOR(user_data); + AppIndicatorPrivate *priv = app->priv; + if (g_strcmp0(property, "Id") == 0) { - return g_variant_new("s", "bob"); + return g_variant_new_string(app->priv->id); } else if (g_strcmp0(property, "Category") == 0) { - return g_variant_new("s", "bob"); + GEnumValue *enum_value; + enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY), priv->category); + return g_variant_new_string(enum_value->value_nick); } else if (g_strcmp0(property, "Status") == 0) { - return g_variant_new("s", "bob"); + GEnumValue *enum_value; + enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), priv->status); + return g_variant_new_string(enum_value->value_nick); } else if (g_strcmp0(property, "IconName") == 0) { - return g_variant_new("s", "bob"); + return g_variant_new_string(priv->icon_name); } else if (g_strcmp0(property, "AttentionIconName") == 0) { - return g_variant_new("s", "bob"); + return g_variant_new_string(priv->attention_icon_name); } else if (g_strcmp0(property, "IconThemePath") == 0) { - return g_variant_new("s", "bob"); + return g_variant_new_string(priv->icon_theme_path); } else if (g_strcmp0(property, "Menu") == 0) { - return g_variant_new("o", "/bob"); + if (priv->menuservice != NULL) { + GValue strval = { 0 }; + g_value_init(&strval, G_TYPE_STRING); + g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strval); + GVariant * var = g_variant_new("o", g_value_get_string(&strval)); + g_value_unset(&strval); + return var; + } else { + return g_variant_new("o", "/"); + } } else if (g_strcmp0(property, "XAyatanaLabel") == 0) { - return g_variant_new("s", "bob"); + return g_variant_new_string(priv->label); } else if (g_strcmp0(property, "XAyatanaLabelGuide") == 0) { - return g_variant_new("s", "bob"); + return g_variant_new_string(priv->label_guide); } else if (g_strcmp0(property, "XAyatanaOrderingIndex") == 0) { - return g_variant_new("u", 42); + return g_variant_new_uint32(priv->ordering_index); } *error = g_error_new(0, 0, "Unknown property: %s", property); -- cgit v1.2.3 From 4b46daa3c4b95c301dc4a26112efc9a23777711e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 20:48:55 -0600 Subject: Emitting the signals on DBus --- src/app-indicator.c | 183 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 144 insertions(+), 39 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 3aaf444..dc9fb47 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -981,10 +981,27 @@ signal_label_change_idle (gpointer user_data) AppIndicator * self = (AppIndicator *)user_data; AppIndicatorPrivate *priv = self->priv; + gchar * label = priv->label != NULL ? priv->label : ""; + gchar * guide = priv->label_guide != NULL ? priv->label_guide : ""; + g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0, - priv->label != NULL ? priv->label : "", - priv->label_guide != NULL ? priv->label_guide : "", - TRUE); + label, guide, TRUE); + if (priv->dbus_registration != 0 && priv->connection != NULL) { + GError * error = NULL; + + g_dbus_connection_emit_signal(priv->connection, + NULL, + priv->path, + NOTIFICATION_ITEM_DBUS_IFACE, + "XAyatanaNewLabel", + g_variant_new("(ss)", label, guide), + &error); + + if (error != NULL) { + g_warning("Unable to send signal for NewIcon: %s", error->message); + g_error_free(error); + } + } priv->label_change_idle = 0; @@ -1269,6 +1286,28 @@ static void theme_changed_cb (GtkIconTheme * theme, gpointer user_data) { g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE); + + AppIndicator * self = (AppIndicator *)user_data; + AppIndicatorPrivate *priv = self->priv; + + if (priv->dbus_registration != 0 && priv->connection != NULL) { + GError * error = NULL; + + g_dbus_connection_emit_signal(priv->connection, + NULL, + priv->path, + NOTIFICATION_ITEM_DBUS_IFACE, + "NewIcon", + NULL, + &error); + + if (error != NULL) { + g_warning("Unable to send signal for NewIcon: %s", error->message); + g_error_free(error); + } + } + + return; } /* Creates a StatusIcon that can be used when the application @@ -1472,15 +1511,33 @@ app_indicator_new_with_path (const gchar *id, void app_indicator_set_status (AppIndicator *self, AppIndicatorStatus status) { - g_return_if_fail (IS_APP_INDICATOR (self)); + g_return_if_fail (IS_APP_INDICATOR (self)); - if (self->priv->status != status) - { - GEnumValue *value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), status); + if (self->priv->status != status) { + GEnumValue *value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), status); - self->priv->status = status; - g_signal_emit (self, signals[NEW_STATUS], 0, value->value_nick); - } + self->priv->status = status; + g_signal_emit (self, signals[NEW_STATUS], 0, value->value_nick); + + if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { + GError * error = NULL; + + g_dbus_connection_emit_signal(self->priv->connection, + NULL, + self->priv->path, + NOTIFICATION_ITEM_DBUS_IFACE, + "NewStatus", + g_variant_new("(s)", value->value_nick), + &error); + + if (error != NULL) { + g_warning("Unable to send signal for NewStatus: %s", error->message); + g_error_free(error); + } + } + } + + return; } /** @@ -1493,20 +1550,36 @@ app_indicator_set_status (AppIndicator *self, AppIndicatorStatus status) void app_indicator_set_attention_icon (AppIndicator *self, const gchar *icon_name) { - g_return_if_fail (IS_APP_INDICATOR (self)); - g_return_if_fail (icon_name != NULL); + g_return_if_fail (IS_APP_INDICATOR (self)); + g_return_if_fail (icon_name != NULL); - if (g_strcmp0 (self->priv->attention_icon_name, icon_name) != 0) - { - if (self->priv->attention_icon_name) - g_free (self->priv->attention_icon_name); + if (g_strcmp0 (self->priv->attention_icon_name, icon_name) != 0) { + if (self->priv->attention_icon_name) + g_free (self->priv->attention_icon_name); - self->priv->attention_icon_name = g_strdup(icon_name); + self->priv->attention_icon_name = g_strdup(icon_name); - g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE); - } + g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE); - return; + if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { + GError * error = NULL; + + g_dbus_connection_emit_signal(self->priv->connection, + NULL, + self->priv->path, + NOTIFICATION_ITEM_DBUS_IFACE, + "NewAttentionIcon", + NULL, + &error); + + if (error != NULL) { + g_warning("Unable to send signal for NewAttentionIcon: %s", error->message); + g_error_free(error); + } + } + } + + return; } /** @@ -1522,20 +1595,36 @@ app_indicator_set_attention_icon (AppIndicator *self, const gchar *icon_name) void app_indicator_set_icon (AppIndicator *self, const gchar *icon_name) { - g_return_if_fail (IS_APP_INDICATOR (self)); - g_return_if_fail (icon_name != NULL); + g_return_if_fail (IS_APP_INDICATOR (self)); + g_return_if_fail (icon_name != NULL); - if (g_strcmp0 (self->priv->icon_name, icon_name) != 0) - { - if (self->priv->icon_name) - g_free (self->priv->icon_name); + if (g_strcmp0 (self->priv->icon_name, icon_name) != 0) { + if (self->priv->icon_name) + g_free (self->priv->icon_name); - self->priv->icon_name = g_strdup(icon_name); + self->priv->icon_name = g_strdup(icon_name); - g_signal_emit (self, signals[NEW_ICON], 0, TRUE); - } + g_signal_emit (self, signals[NEW_ICON], 0, TRUE); - return; + if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { + GError * error = NULL; + + g_dbus_connection_emit_signal(self->priv->connection, + NULL, + self->priv->path, + NOTIFICATION_ITEM_DBUS_IFACE, + "NewIcon", + NULL, + &error); + + if (error != NULL) { + g_warning("Unable to send signal for NewIcon: %s", error->message); + g_error_free(error); + } + } + } + + return; } /** @@ -1573,19 +1662,35 @@ app_indicator_set_label (AppIndicator *self, const gchar * label, const gchar * void app_indicator_set_icon_theme_path (AppIndicator *self, const gchar *icon_theme_path) { - g_return_if_fail (IS_APP_INDICATOR (self)); + g_return_if_fail (IS_APP_INDICATOR (self)); - if (g_strcmp0 (self->priv->icon_theme_path, icon_theme_path) != 0) - { - if (self->priv->icon_theme_path != NULL) - g_free(self->priv->icon_theme_path); + if (g_strcmp0 (self->priv->icon_theme_path, icon_theme_path) != 0) { + if (self->priv->icon_theme_path != NULL) + g_free(self->priv->icon_theme_path); - self->priv->icon_theme_path = g_strdup(icon_theme_path); + self->priv->icon_theme_path = g_strdup(icon_theme_path); - g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, g_strdup(self->priv->icon_theme_path)); - } + g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE); - return; + if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { + GError * error = NULL; + + g_dbus_connection_emit_signal(self->priv->connection, + NULL, + self->priv->path, + NOTIFICATION_ITEM_DBUS_IFACE, + "NewIconThemePath", + g_variant_new("(s)", self->priv->icon_theme_path), + &error); + + if (error != NULL) { + g_warning("Unable to send signal for NewIconThemePath: %s", error->message); + g_error_free(error); + } + } + } + + return; } static void -- cgit v1.2.3 From 05d072b4e78d6e4f5e4c9e85d01dc0d704c70d80 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 20:57:41 -0600 Subject: Changing what we're checking with the watcher, now that it's persistant more of the time we need to not block if it exists. --- src/app-indicator.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index dc9fb47..5260f58 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1035,14 +1035,16 @@ check_connect (AppIndicator *self) /* Do we have a connection? */ if (priv->connection == NULL) return; - /* We're alreadying connecting or trying to connect. */ - if (priv->watcher_proxy != NULL) return; - - gchar * name = g_dbus_proxy_get_name_owner(priv->watcher_proxy); - if (name == NULL) { - return; + /* If we already have a proxy, let's see if it has someone + implementing it. If not, we can't do much more than to + do nothing. */ + if (priv->watcher_proxy != NULL) { + gchar * name = g_dbus_proxy_get_name_owner(priv->watcher_proxy); + if (name == NULL) { + return; + } + g_free(name); } - g_free(name); /* Do we have enough information? */ if (priv->menu == NULL) return; -- cgit v1.2.3 From c7539b525cd880a8853e8ec9f2ed2b3812bdccc4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Dec 2010 22:19:35 -0600 Subject: Switching to the new dbusmenu API --- configure.ac | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 1d60bbe..48bd53a 100644 --- a/configure.ac +++ b/configure.ac @@ -39,9 +39,10 @@ AC_CONFIG_MACRO_DIR(m4) GTK_REQUIRED_VERSION=2.18 GTK3_REQUIRED_VERSION=2.91 +GLIB_REQUIRED_VERSION=2.26 GIO_REQUIRED_VERSION=2.26 INDICATOR_REQUIRED_VERSION=0.3.5 -DBUSMENUGTK_REQUIRED_VERSION=0.2.2 +DBUSMENUGTK_REQUIRED_VERSION=0.3.90 DBUS_GLIB_REQUIRED_VERSION=0.82 AC_ARG_WITH([gtk], @@ -50,19 +51,21 @@ AC_ARG_WITH([gtk], [], [with_gtk=2]) AS_IF([test "x$with_gtk" = x3], - [PKG_CHECK_MODULES(LIBRARAY, gtk+-3.0 >= $GTK3_REQUIRED_VERSION - gio-2.0 >= $GIO_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION - dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION) + [PKG_CHECK_MODULES(LIBRARY, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator3 >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(LIBRARY_CFLAGS) AC_SUBST(LIBRARY_LIBS) AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(LIBRARY_CFLAGS) AC_SUBST(LIBRARY_LIBS) ], @@ -217,4 +220,5 @@ Libappindicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR GTK+ Version: $with_gtk + Library CFlags: $LIBRARY_CFLAGS ]) -- cgit v1.2.3 From 02fba603a52ee6c65c5f583071788f8017f8f7de Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 09:34:56 -0600 Subject: Cleaning up configure.ac --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 48bd53a..7b192ca 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,7 @@ AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(LIBRARY_CFLAGS) AC_SUBST(LIBRARY_LIBS) @@ -220,5 +220,4 @@ Libappindicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR GTK+ Version: $with_gtk - Library CFlags: $LIBRARY_CFLAGS ]) -- cgit v1.2.3 From 9530e6993889a539081131ab1bd14635062569fa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 09:38:31 -0600 Subject: Dropping the 'MENU' property as we don't need it. --- src/app-indicator.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 5260f58..3ecf9c5 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -31,9 +31,6 @@ License version 3 and version 2.1 along with this program. If not, see #include "config.h" #endif -#include -#include - #include #include #ifdef HAVE_GTK3 @@ -124,7 +121,6 @@ enum { PROP_ICON_NAME, PROP_ATTENTION_ICON_NAME, PROP_ICON_THEME_PATH, - PROP_MENU, PROP_CONNECTED, PROP_LABEL, PROP_LABEL_GUIDE, @@ -139,7 +135,6 @@ enum { #define PROP_ICON_NAME_S "icon-name" #define PROP_ATTENTION_ICON_NAME_S "attention-icon-name" #define PROP_ICON_THEME_PATH_S "icon-theme-path" -#define PROP_MENU_S "menu" #define PROP_CONNECTED_S "connected" #define PROP_LABEL_S "label" #define PROP_LABEL_GUIDE_S "label-guide" @@ -302,19 +297,6 @@ app_indicator_class_init (AppIndicatorClass *klass) NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT)); - /** - AppIndicator:menu: - - A method for getting the menu path as a string for DBus. - */ - g_object_class_install_property(object_class, - PROP_MENU, - g_param_spec_boxed (PROP_MENU_S, - "The object path of the menu on DBus.", - "A method for getting the menu path as a string for DBus.", - DBUS_TYPE_G_OBJECT_PATH, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - /** AppIndicator:connected: @@ -852,16 +834,6 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa case PROP_ICON_THEME_PATH: g_value_set_string (value, priv->icon_theme_path); - break; - - case PROP_MENU: - if (priv->menuservice != NULL) { - GValue strval = { 0 }; - g_value_init(&strval, G_TYPE_STRING); - g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strval); - g_value_set_boxed(value, g_value_get_string(&strval)); - g_value_unset(&strval); - } break; case PROP_CONNECTED: { -- cgit v1.2.3 From 4a94c8c8c2756fb91164b35ecc767a90f1c61a25 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 10:03:10 -0600 Subject: Adding a build for dbus-glib for tests so that we can pass them unmodified. --- configure.ac | 4 ++++ tests/Makefile.am | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 7b192ca..30b2279 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,10 @@ AS_IF([test "x$with_gtk" = x3], ) AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) +PKG_CHECK_MODULES(TESTDEPS, dbus-glib-1) +AC_SUBST(TESTDEPS_CFLAGS) +AC_SUBST(TESTDEPS_LIBS) + ########################### # GObject Introspection ########################### diff --git a/tests/Makefile.am b/tests/Makefile.am index 15e477e..5040b77 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,13 +24,13 @@ test_libappindicator_SOURCES = \ test-libappindicator.c test_libappindicator_CFLAGS = \ - $(LIBRARY_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -DSRCDIR="\"$(srcdir)\"" \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_LDADD = \ - $(LIBRARY_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -42,12 +42,12 @@ test_libappindicator_dbus_client_SOURCES = \ test-libappindicator-dbus-client.c test_libappindicator_dbus_client_CFLAGS = \ - $(LIBRARY_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_dbus_client_LDADD = \ - $(LIBRARY_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -59,12 +59,12 @@ test_libappindicator_dbus_server_SOURCES = \ test-libappindicator-dbus-server.c test_libappindicator_dbus_server_CFLAGS = \ - $(LIBRARY_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_dbus_server_LDADD = \ - $(LIBRARY_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -76,12 +76,12 @@ test_libappindicator_status_client_SOURCES = \ test-libappindicator-status-client.c test_libappindicator_status_client_CFLAGS = \ - $(LIBRARY_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_status_client_LDADD = \ - $(LIBRARY_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -93,12 +93,12 @@ test_libappindicator_status_server_SOURCES = \ test-libappindicator-status-server.c test_libappindicator_status_server_CFLAGS = \ - $(LIBRARY_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_status_server_LDADD = \ - $(LIBRARY_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -109,24 +109,24 @@ test_libappindicator_fallback_watcher_SOURCES = \ test-libappindicator-fallback-watcher.c test_libappindicator_fallback_watcher_CFLAGS = \ - $(LIBRARY_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_fallback_watcher_LDADD = \ - $(LIBRARY_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la test_libappindicator_fallback_item_SOURCES = \ test-libappindicator-fallback-item.c test_libappindicator_fallback_item_CFLAGS = \ - $(LIBRARY_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_fallback_item_LDADD = \ - $(LIBRARY_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am @@ -185,11 +185,11 @@ test_simple_app_SOURCES = \ test-simple-app.c test_simple_app_CFLAGS = \ - $(LIBRARY_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_simple_app_LDADD = \ - $(LIBRARY_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la -- cgit v1.2.3 From b9d669083f761e75c4c62b23055ca5e103cd8a2c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 10:03:28 -0600 Subject: Making sure to ref the object when doing the async callback. --- src/app-indicator.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 3ecf9c5..99c7fed 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -543,6 +543,7 @@ app_indicator_init (AppIndicator *self) priv->shorties = NULL; /* Start getting the session bus */ + g_object_ref(self); /* ref for the bus creation callback */ g_bus_get(G_BUS_TYPE_SESSION, NULL, bus_creation, self); g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()), @@ -895,6 +896,9 @@ bus_creation (GObject * obj, GAsyncResult * res, gpointer user_data) /* If the connection was blocking the exporting of the object this function will export everything. */ check_connect(app); + + g_object_unref(G_OBJECT(app)); + return; } -- cgit v1.2.3 From 52375e6f27d268b13227b1f51b6a126e4df3a435 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 10:05:54 -0600 Subject: Adding a ref for creating the bus proxy. --- src/app-indicator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 99c7fed..744590b 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1052,6 +1052,7 @@ check_connect (AppIndicator *self) want to ensure all the filters are setup before talking to the watcher and that's where the order is important. */ + g_object_ref(G_OBJECT(self)); /* Unref in watcher_ready() */ if (priv->watcher_proxy == NULL) { /* Build Watcher Proxy */ g_dbus_proxy_new(priv->connection, @@ -1120,6 +1121,8 @@ bus_watcher_ready (GObject * obj, GAsyncResult * res, gpointer user_data) register_service_cb, user_data); + g_object_unref(G_OBJECT(user_data)); + return; } -- cgit v1.2.3 From 7fae05b11eea1644bf0a0a7e773c7753a9b620d8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 10:11:30 -0600 Subject: Making sure we have more ref's on our callbacks. --- src/app-indicator.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 744590b..2b45b85 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -887,6 +887,7 @@ bus_creation (GObject * obj, GAsyncResult * res, gpointer user_data) if (error != NULL) { g_warning("Unable to get the session bus: %s", error->message); g_error_free(error); + g_object_unref(G_OBJECT(user_data)); return; } @@ -1091,6 +1092,8 @@ bus_watcher_ready (GObject * obj, GAsyncResult * res, gpointer user_data) if (IS_APP_INDICATOR(user_data)) { start_fallback_timer(APP_INDICATOR(user_data), FALSE); } + + g_object_unref(G_OBJECT(user_data)); return; } @@ -1109,9 +1112,15 @@ bus_watcher_ready (GObject * obj, GAsyncResult * res, gpointer user_data) gchar * name = g_dbus_proxy_get_name_owner(app->priv->watcher_proxy); if (name == NULL) { start_fallback_timer(APP_INDICATOR(user_data), FALSE); + g_object_unref(G_OBJECT(user_data)); return; } + /* g_object_unref(G_OBJECT(user_data)); */ + /* Why is this commented out? Oh, wait, we don't want to + unref in this case because we need to ref again to do the + register callback. Let's not unref to ref again. */ + g_dbus_proxy_call(app->priv->watcher_proxy, "RegisterStatusNotifierItem", g_variant_new("(s)", app->priv->path), @@ -1121,8 +1130,6 @@ bus_watcher_ready (GObject * obj, GAsyncResult * res, gpointer user_data) register_service_cb, user_data); - g_object_unref(G_OBJECT(user_data)); - return; } @@ -1173,6 +1180,7 @@ register_service_cb (GObject * obj, GAsyncResult * res, gpointer user_data) be doing */ g_warning("Unable to connect to the Notification Watcher: %s", error->message); start_fallback_timer(APP_INDICATOR(user_data), TRUE); + g_object_unref(G_OBJECT(user_data)); return; } @@ -1191,6 +1199,7 @@ register_service_cb (GObject * obj, GAsyncResult * res, gpointer user_data) } } + g_object_unref(G_OBJECT(user_data)); return; } -- cgit v1.2.3 From 2144d7749d9d1cbe9170502370cf91f09f412fb6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 10:40:23 -0600 Subject: Drop the need and use of dbus-glib --- tests/test-libappindicator-dbus-server.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/test-libappindicator-dbus-server.c b/tests/test-libappindicator-dbus-server.c index 995d49b..744ac0e 100644 --- a/tests/test-libappindicator-dbus-server.c +++ b/tests/test-libappindicator-dbus-server.c @@ -21,8 +21,6 @@ with this program. If not, see . */ -#include -#include #include #include #include "test-defines.h" @@ -41,8 +39,6 @@ main (gint argc, gchar * argv[]) { gtk_init(&argc, &argv); - g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL)))); - AppIndicator * ci = app_indicator_new (TEST_ID, TEST_ICON_NAME, TEST_CATEGORY); app_indicator_set_status (ci, TEST_STATE); -- cgit v1.2.3 From a977f312789bec573e7256b50531f44bc8d45a85 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 10:54:16 -0600 Subject: Switching around so that this test passes even if it's not perfect. --- tests/test-libappindicator-dbus-client.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/test-libappindicator-dbus-client.c b/tests/test-libappindicator-dbus-client.c index 1500213..9a51792 100644 --- a/tests/test-libappindicator-dbus-client.c +++ b/tests/test-libappindicator-dbus-client.c @@ -206,8 +206,6 @@ main (gint argc, gchar * argv[]) { g_type_init(); - g_usleep(500000); - GError * error = NULL; DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); if (error != NULL) { @@ -230,8 +228,10 @@ main (gint argc, gchar * argv[]) dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL); + g_usleep(500000); + DBusGProxy * props = dbus_g_proxy_new_for_name_owner(session_bus, - ":1.0", + ":1.2", "/org/ayatana/NotificationItem/my_id", DBUS_INTERFACE_PROPERTIES, &error); @@ -244,35 +244,35 @@ main (gint argc, gchar * argv[]) "Get", prop_id_cb, NULL, NULL, - G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", + G_TYPE_STRING, NOTIFICATION_ITEM_DBUS_IFACE, G_TYPE_STRING, "Id", G_TYPE_INVALID); dbus_g_proxy_begin_call (props, "Get", prop_category_cb, NULL, NULL, - G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", + G_TYPE_STRING, NOTIFICATION_ITEM_DBUS_IFACE, G_TYPE_STRING, "Category", G_TYPE_INVALID); dbus_g_proxy_begin_call (props, "Get", prop_status_cb, NULL, NULL, - G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", + G_TYPE_STRING, NOTIFICATION_ITEM_DBUS_IFACE, G_TYPE_STRING, "Status", G_TYPE_INVALID); dbus_g_proxy_begin_call (props, "Get", prop_icon_name_cb, NULL, NULL, - G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", + G_TYPE_STRING, NOTIFICATION_ITEM_DBUS_IFACE, G_TYPE_STRING, "IconName", G_TYPE_INVALID); dbus_g_proxy_begin_call (props, "Get", prop_attention_icon_name_cb, NULL, NULL, - G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", + G_TYPE_STRING, NOTIFICATION_ITEM_DBUS_IFACE, G_TYPE_STRING, "AttentionIconName", G_TYPE_INVALID); -- cgit v1.2.3 From 41edd6b1dd171d887fe6bc860a1451358b630add Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 11:00:54 -0600 Subject: Adding in some '_' so that the symbols don't get exported in the library. --- src/Makefile.am | 4 ++-- src/app-indicator.c | 6 +++--- src/generate-id.c | 2 +- src/generate-id.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 5b6adc2..a5ea29b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,11 +101,11 @@ DBUS_SPECS = \ gen-%.xml.h: %.xml @echo "Building $@ from $<" - @echo "extern const char * $(subst -,_,$(subst .,_,$(basename $<)));" > $@ + @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@ gen-%.xml.c: %.xml @echo "Building $@ from $<" - @echo "const char * $(subst -,_,$(subst .,_,$(basename $<))) = " > $@ + @echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@ @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ @echo ";" >> $@ diff --git a/src/app-indicator.c b/src/app-indicator.c index 2b45b85..404d69d 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -477,7 +477,7 @@ app_indicator_class_init (AppIndicatorClass *klass) if (item_node_info == NULL) { GError * error = NULL; - item_node_info = g_dbus_node_info_new_for_xml(notification_item, &error); + item_node_info = g_dbus_node_info_new_for_xml(_notification_item, &error); if (error != NULL) { g_error("Unable to parse Notification Item DBus interface: %s", error->message); g_error_free(error); @@ -495,7 +495,7 @@ app_indicator_class_init (AppIndicatorClass *klass) if (watcher_node_info == NULL) { GError * error = NULL; - watcher_node_info = g_dbus_node_info_new_for_xml(notification_watcher, &error); + watcher_node_info = g_dbus_node_info_new_for_xml(_notification_watcher, &error); if (error != NULL) { g_error("Unable to parse Notification Item DBus interface: %s", error->message); g_error_free(error); @@ -2300,7 +2300,7 @@ app_indicator_get_ordering_index (AppIndicator *self) g_return_val_if_fail (IS_APP_INDICATOR (self), 0); if (self->priv->ordering_index == 0) { - return generate_id(self->priv->category, self->priv->id); + return _generate_id(self->priv->category, self->priv->id); } else { return self->priv->ordering_index; } diff --git a/src/generate-id.c b/src/generate-id.c index 14d762e..6389678 100644 --- a/src/generate-id.c +++ b/src/generate-id.c @@ -24,7 +24,7 @@ with this program. If not, see . #define MULTIPLIER 32 guint32 -generate_id (const AppIndicatorCategory catenum, const gchar * id) +_generate_id (const AppIndicatorCategory catenum, const gchar * id) { guchar category = 0; guchar first = 0; diff --git a/src/generate-id.h b/src/generate-id.h index 9d3167d..2c31921 100644 --- a/src/generate-id.h +++ b/src/generate-id.h @@ -25,6 +25,6 @@ with this program. If not, see . #include #include "app-indicator.h" -guint32 generate_id (const AppIndicatorCategory category, const gchar * id); +guint32 _generate_id (const AppIndicatorCategory category, const gchar * id); #endif /* __GENERATE_ID_H__ */ -- cgit v1.2.3 From 8c8512a7a3855f664f71c788e83954a9b5b524bb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 11:04:17 -0600 Subject: Changing the tarball we're ignoring --- .bzrignore | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.bzrignore b/.bzrignore index 7fa0f3f..112bd47 100644 --- a/.bzrignore +++ b/.bzrignore @@ -96,10 +96,10 @@ bindings/mono/AppIndicator.Test.dll bindings/mono/libappindicator-api.middle bindings/mono/examples/IndicatorExample.exe src/app-indicator-enum-types.gen.c -indicator-application-[0-9].[0-9].[0-9].tar.gz -indicator-application-[0-9].[0-9].[0-9].tar.gz.asc -indicator-application-[0-9].[0-9].[0-9][0-9].tar.gz -indicator-application-[0-9].[0-9].[0-9][0-9].tar.gz.asc +libappindicator-[0-9].[0-9].[0-9].tar.gz +libappindicator-[0-9].[0-9].[0-9].tar.gz.asc +libappindicator-[0-9].[0-9].[0-9][0-9].tar.gz +libappindicator-[0-9].[0-9].[0-9][0-9].tar.gz.asc m4/gtk-doc.m4 src/AppIndicator-0.1.gir src/AppIndicator-0.1.typelib -- cgit v1.2.3 From b35ed0dc2053fed40f0c6d7e97a97975951a076c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 11:04:50 -0600 Subject: Ignoring the generated XML include files. --- .bzrignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.bzrignore b/.bzrignore index 112bd47..e120c11 100644 --- a/.bzrignore +++ b/.bzrignore @@ -123,3 +123,9 @@ src/notification-item.xml.c src/notification-item.xml.h src/notification-watcher.xml.c src/notification-watcher.xml.h +src/gen-notification-item.xml.c +src/gen-notification-item.xml.h +src/gen-notification-watcher.xml.c +src/gen-notification-watcher.xml.h +src/libappindicator_la-gen-notification-item.xml.lo +src/libappindicator_la-gen-notification-watcher.xml.lo -- cgit v1.2.3 From 5b8d8f97aa46c2d56e7c4bbc244dafe378b60e8d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 14:50:01 -0600 Subject: Wrong directory for the GTK 3 header. Fixed. --- src/app-indicator.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 404d69d..babdaf5 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -33,11 +33,7 @@ License version 3 and version 2.1 along with this program. If not, see #include #include -#ifdef HAVE_GTK3 -#include -#else #include -#endif #include -- cgit v1.2.3 From f1ca6d3d9b2aeb3b20b206e4bb716fc91f1e1468 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 15:34:25 -0600 Subject: Autogen --- Makefile.in | 14 +- bindings/Makefile.in | 9 +- bindings/mono/Makefile.in | 9 +- bindings/mono/examples/Makefile.in | 9 +- bindings/python/Makefile.in | 9 +- configure | 455 ++++++++++++++++++++++--------------- debian/changelog | 3 +- docs/Makefile.in | 9 +- docs/reference/Makefile.in | 13 +- example/Makefile.in | 17 +- src/Makefile.in | 452 +++++++++--------------------------- tests/Makefile.in | 137 ++++------- 12 files changed, 474 insertions(+), 662 deletions(-) diff --git a/Makefile.in b/Makefile.in index 61a5dad..2e3a78c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -130,7 +130,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ CYGPATH_W = @CYGPATH_W@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -157,10 +156,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ HTML_DIR = @HTML_DIR@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -177,6 +172,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBRARY_CFLAGS = @LIBRARY_CFLAGS@ +LIBRARY_LIBS = @LIBRARY_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_PREFIX = @LIB_PREFIX@ @@ -222,6 +219,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ +TESTDEPS_LIBS = @TESTDEPS_LIBS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ @@ -280,8 +279,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = data \ - src \ +SUBDIRS = \ + src \ bindings \ example \ tests \ @@ -294,7 +293,6 @@ EXTRA_DIST = \ xmldocs.make \ autogen.sh \ COPYING.LGPL.2.1 \ - COPYING.LGPL.3 \ ChangeLog DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-localinstall --enable-introspection diff --git a/bindings/Makefile.in b/bindings/Makefile.in index 07fa353..422b99b 100644 --- a/bindings/Makefile.in +++ b/bindings/Makefile.in @@ -114,7 +114,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ CYGPATH_W = @CYGPATH_W@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -141,10 +140,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ HTML_DIR = @HTML_DIR@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -161,6 +156,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBRARY_CFLAGS = @LIBRARY_CFLAGS@ +LIBRARY_LIBS = @LIBRARY_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_PREFIX = @LIB_PREFIX@ @@ -206,6 +203,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ +TESTDEPS_LIBS = @TESTDEPS_LIBS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ diff --git a/bindings/mono/Makefile.in b/bindings/mono/Makefile.in index a13f039..ee11223 100644 --- a/bindings/mono/Makefile.in +++ b/bindings/mono/Makefile.in @@ -142,7 +142,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ CYGPATH_W = @CYGPATH_W@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -169,10 +168,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ HTML_DIR = @HTML_DIR@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -189,6 +184,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBRARY_CFLAGS = @LIBRARY_CFLAGS@ +LIBRARY_LIBS = @LIBRARY_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_PREFIX = @LIB_PREFIX@ @@ -234,6 +231,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ +TESTDEPS_LIBS = @TESTDEPS_LIBS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ diff --git a/bindings/mono/examples/Makefile.in b/bindings/mono/examples/Makefile.in index 89a5024..a150667 100644 --- a/bindings/mono/examples/Makefile.in +++ b/bindings/mono/examples/Makefile.in @@ -75,7 +75,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ CYGPATH_W = @CYGPATH_W@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -102,10 +101,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ HTML_DIR = @HTML_DIR@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -122,6 +117,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBRARY_CFLAGS = @LIBRARY_CFLAGS@ +LIBRARY_LIBS = @LIBRARY_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_PREFIX = @LIB_PREFIX@ @@ -167,6 +164,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ +TESTDEPS_LIBS = @TESTDEPS_LIBS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ diff --git a/bindings/python/Makefile.in b/bindings/python/Makefile.in index 0ea6178..419334b 100644 --- a/bindings/python/Makefile.in +++ b/bindings/python/Makefile.in @@ -139,7 +139,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ CYGPATH_W = @CYGPATH_W@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -166,10 +165,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ HTML_DIR = @HTML_DIR@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -186,6 +181,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBRARY_CFLAGS = @LIBRARY_CFLAGS@ +LIBRARY_LIBS = @LIBRARY_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_PREFIX = @LIB_PREFIX@ @@ -231,6 +228,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ +TESTDEPS_LIBS = @TESTDEPS_LIBS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ diff --git a/configure b/configure index 8827a4d..02dbf98 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for indicator-application 0.2.90. +# Generated by GNU Autoconf 2.67 for libappindicator 0.2.90. # # Report bugs to . # @@ -701,10 +701,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='indicator-application' -PACKAGE_TARNAME='indicator-application' +PACKAGE_NAME='libappindicator' +PACKAGE_TARNAME='libappindicator' PACKAGE_VERSION='0.2.90' -PACKAGE_STRING='indicator-application 0.2.90' +PACKAGE_STRING='libappindicator 0.2.90' PACKAGE_BUGREPORT='ted@canonical.com' PACKAGE_URL='' @@ -762,9 +762,6 @@ PYTHON_EXEC_PREFIX PYTHON_PREFIX PYTHON_VERSION PYTHON -DBUSSERVICEDIR -INDICATORICONSDIR -INDICATORDIR NUNIT_LIBS NUNIT_CFLAGS GAPI_FIXUP @@ -784,6 +781,8 @@ AL MONO_DEPENDENCY_LIBS MONO_DEPENDENCY_CFLAGS VALA_API_GEN +INTROSPECTION_TEN_FALSE +INTROSPECTION_TEN_TRUE HAVE_INTROSPECTION_FALSE HAVE_INTROSPECTION_TRUE INTROSPECTION_MAKEFILE @@ -794,10 +793,12 @@ INTROSPECTION_GIRDIR INTROSPECTION_GENERATE INTROSPECTION_COMPILER INTROSPECTION_SCANNER +TESTDEPS_LIBS +TESTDEPS_CFLAGS USE_GTK3_FALSE USE_GTK3_TRUE -INDICATOR_LIBS -INDICATOR_CFLAGS +LIBRARY_LIBS +LIBRARY_CFLAGS GTK_DOC_USE_REBASE_FALSE GTK_DOC_USE_REBASE_TRUE GTK_DOC_USE_LIBTOOL_FALSE @@ -959,8 +960,10 @@ CPP PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR -INDICATOR_CFLAGS -INDICATOR_LIBS +LIBRARY_CFLAGS +LIBRARY_LIBS +TESTDEPS_CFLAGS +TESTDEPS_LIBS MONO_DEPENDENCY_CFLAGS MONO_DEPENDENCY_LIBS GTK_SHARP_CFLAGS @@ -1513,7 +1516,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures indicator-application 0.2.90 to adapt to many kinds of systems. +\`configure' configures libappindicator 0.2.90 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1561,8 +1564,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root - [DATAROOTDIR/doc/indicator-application] + --docdir=DIR documentation root [DATAROOTDIR/doc/libappindicator] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1584,7 +1586,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of indicator-application 0.2.90:";; + short | recursive ) echo "Configuration of libappindicator 0.2.90:";; esac cat <<\_ACEOF @@ -1634,10 +1636,14 @@ Some influential environment variables: directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path - INDICATOR_CFLAGS - C compiler flags for INDICATOR, overriding pkg-config - INDICATOR_LIBS - linker flags for INDICATOR, overriding pkg-config + LIBRARY_CFLAGS + C compiler flags for LIBRARY, overriding pkg-config + LIBRARY_LIBS + linker flags for LIBRARY, overriding pkg-config + TESTDEPS_CFLAGS + C compiler flags for TESTDEPS, overriding pkg-config + TESTDEPS_LIBS + linker flags for TESTDEPS, overriding pkg-config MONO_DEPENDENCY_CFLAGS C compiler flags for MONO_DEPENDENCY, overriding pkg-config MONO_DEPENDENCY_LIBS @@ -1722,7 +1728,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -indicator-application configure 0.2.90 +libappindicator configure 0.2.90 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2002,7 +2008,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by indicator-application $as_me 0.2.90, which was +It was created by libappindicator $as_me 0.2.90, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2822,7 +2828,7 @@ fi # Define the identity of the package. - PACKAGE=indicator-application + PACKAGE=libappindicator VERSION=0.2.90 @@ -5647,13 +5653,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5650: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5656: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5653: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5659: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5656: output\"" >&5) + (eval echo "\"\$as_me:5662: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6858,7 +6864,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6861 "configure"' > conftest.$ac_ext + echo '#line 6867 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8137,11 +8143,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8140: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8146: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8144: \$? = $ac_status" >&5 + echo "$as_me:8150: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8476,11 +8482,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8479: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8485: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8483: \$? = $ac_status" >&5 + echo "$as_me:8489: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8581,11 +8587,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8584: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8590: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8588: \$? = $ac_status" >&5 + echo "$as_me:8594: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8636,11 +8642,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8639: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8645: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8643: \$? = $ac_status" >&5 + echo "$as_me:8649: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11020,7 +11026,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11023 "configure" +#line 11029 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11116,7 +11122,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11119 "configure" +#line 11125 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11801,9 +11807,10 @@ fi GTK_REQUIRED_VERSION=2.18 GTK3_REQUIRED_VERSION=2.91 +GLIB_REQUIRED_VERSION=2.26 +GIO_REQUIRED_VERSION=2.26 INDICATOR_REQUIRED_VERSION=0.3.5 -DBUSMENUGTK_REQUIRED_VERSION=0.2.2 -JSON_GLIB_REQUIRED_VERSION=0.7.6 +DBUSMENUGTK_REQUIRED_VERSION=0.3.90 DBUS_GLIB_REQUIRED_VERSION=0.82 @@ -11817,59 +11824,59 @@ fi if test "x$with_gtk" = x3; then : pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATOR" >&5 -$as_echo_n "checking for INDICATOR... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBRARY" >&5 +$as_echo_n "checking for LIBRARY... " >&6; } -if test -n "$INDICATOR_CFLAGS"; then - pkg_cv_INDICATOR_CFLAGS="$INDICATOR_CFLAGS" +if test -n "$LIBRARY_CFLAGS"; then + pkg_cv_LIBRARY_CFLAGS="$LIBRARY_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION - indicator3 >= \$INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 + glib-2.0 >= \$GLIB_REQUIRED_VERSION + gio-2.0 >= \$GIO_REQUIRED_VERSION + indicator3 >= \$INDICATOR_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator3 >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_LIBRARY_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator3 >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$INDICATOR_LIBS"; then - pkg_cv_INDICATOR_LIBS="$INDICATOR_LIBS" +if test -n "$LIBRARY_LIBS"; then + pkg_cv_LIBRARY_LIBS="$LIBRARY_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION - indicator3 >= \$INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 + glib-2.0 >= \$GLIB_REQUIRED_VERSION + gio-2.0 >= \$GIO_REQUIRED_VERSION + indicator3 >= \$INDICATOR_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator3 >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_INDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_LIBRARY_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator3 >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi @@ -11889,34 +11896,34 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` + LIBRARY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator3 >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` else - INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` + LIBRARY_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator3 >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$INDICATOR_PKG_ERRORS" >&5 + echo "$LIBRARY_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met: + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator3 >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met: -$INDICATOR_PKG_ERRORS +$LIBRARY_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables INDICATOR_CFLAGS -and INDICATOR_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables LIBRARY_CFLAGS +and LIBRARY_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -11927,15 +11934,15 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables INDICATOR_CFLAGS -and INDICATOR_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables LIBRARY_CFLAGS +and LIBRARY_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5 ; } else - INDICATOR_CFLAGS=$pkg_cv_INDICATOR_CFLAGS - INDICATOR_LIBS=$pkg_cv_INDICATOR_LIBS + LIBRARY_CFLAGS=$pkg_cv_LIBRARY_CFLAGS + LIBRARY_LIBS=$pkg_cv_LIBRARY_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -11949,59 +11956,59 @@ $as_echo "#define HAVE_GTK3 1" >>confdefs.h elif test "x$with_gtk" = x2; then : pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATOR" >&5 -$as_echo_n "checking for INDICATOR... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBRARY" >&5 +$as_echo_n "checking for LIBRARY... " >&6; } -if test -n "$INDICATOR_CFLAGS"; then - pkg_cv_INDICATOR_CFLAGS="$INDICATOR_CFLAGS" +if test -n "$LIBRARY_CFLAGS"; then + pkg_cv_LIBRARY_CFLAGS="$LIBRARY_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION - indicator >= \$INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 + glib-2.0 >= \$GLIB_REQUIRED_VERSION + gio-2.0 >= \$GIO_REQUIRED_VERSION + indicator >= \$INDICATOR_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_LIBRARY_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$INDICATOR_LIBS"; then - pkg_cv_INDICATOR_LIBS="$INDICATOR_LIBS" +if test -n "$LIBRARY_LIBS"; then + pkg_cv_LIBRARY_LIBS="$LIBRARY_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION - indicator >= \$INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= \$JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 + glib-2.0 >= \$GLIB_REQUIRED_VERSION + gio-2.0 >= \$GIO_REQUIRED_VERSION + indicator >= \$INDICATOR_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_INDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_LIBRARY_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi @@ -12021,34 +12028,34 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` + LIBRARY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` else - INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` + LIBRARY_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$INDICATOR_PKG_ERRORS" >&5 + echo "$LIBRARY_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) were not met: + glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met: -$INDICATOR_PKG_ERRORS +$LIBRARY_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables INDICATOR_CFLAGS -and INDICATOR_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables LIBRARY_CFLAGS +and LIBRARY_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -12059,15 +12066,15 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables INDICATOR_CFLAGS -and INDICATOR_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables LIBRARY_CFLAGS +and LIBRARY_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5 ; } else - INDICATOR_CFLAGS=$pkg_cv_INDICATOR_CFLAGS - INDICATOR_LIBS=$pkg_cv_INDICATOR_LIBS + LIBRARY_CFLAGS=$pkg_cv_LIBRARY_CFLAGS + LIBRARY_LIBS=$pkg_cv_LIBRARY_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -12091,6 +12098,98 @@ else fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TESTDEPS" >&5 +$as_echo_n "checking for TESTDEPS... " >&6; } + +if test -n "$TESTDEPS_CFLAGS"; then + pkg_cv_TESTDEPS_CFLAGS="$TESTDEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_TESTDEPS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$TESTDEPS_LIBS"; then + pkg_cv_TESTDEPS_LIBS="$TESTDEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_TESTDEPS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + TESTDEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1" 2>&1` + else + TESTDEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$TESTDEPS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (dbus-glib-1) were not met: + +$TESTDEPS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables TESTDEPS_CFLAGS +and TESTDEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables TESTDEPS_CFLAGS +and TESTDEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5 ; } +else + TESTDEPS_CFLAGS=$pkg_cv_TESTDEPS_CFLAGS + TESTDEPS_LIBS=$pkg_cv_TESTDEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + + ########################### # GObject Introspection ########################### @@ -12132,7 +12231,7 @@ fi test $ac_status = 0; }; then found_introspection=yes else - as_fn_error $? "You need to have gobject-introspection >= 0.6.7 installed to build indicator-application" "$LINENO" 5 + as_fn_error $? "You need to have gobject-introspection >= 0.6.7 installed to build libappindicator" "$LINENO" 5 fi ;; #( auto) : @@ -12189,6 +12288,26 @@ fi +if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.10") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + introspection_ten=yes +else + introspection_ten=no +fi + + if test "x$introspection_ten" = "xyes"; then + INTROSPECTION_TEN_TRUE= + INTROSPECTION_TEN_FALSE='#' +else + INTROSPECTION_TEN_TRUE='#' + INTROSPECTION_TEN_FALSE= +fi + + ########################### # Vala API Generation ########################### @@ -12917,31 +13036,6 @@ else fi -########################### -# Indicator Info -########################### - -if test "x$with_localinstall" = "xyes"; then - INDICATORDIR="${libdir}/indicators/2/" - INDICATORICONSDIR="${datadir}/libindicate/icons/" -else - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` -fi - - - -########################### -# DBus Service Info -########################### - -if test "x$with_localinstall" = "xyes"; then - DBUSSERVICEDIR="${datadir}/dbus-1/services/" -else - DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` -fi - - ########################### # Python ########################### @@ -13304,7 +13398,7 @@ $as_echo "$PYGTK_CODEGEN" >&6; } # Files ########################### -ac_config_files="$ac_config_files Makefile src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile bindings/mono/Makefile bindings/mono/appindicator-sharp.dll.config bindings/mono/appindicator-sharp-0.1.pc bindings/mono/examples/Makefile bindings/mono/examples/indicator-example bindings/python/Makefile data/Makefile tests/Makefile example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml" +ac_config_files="$ac_config_files Makefile src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile bindings/mono/Makefile bindings/mono/appindicator-sharp.dll.config bindings/mono/appindicator-sharp-0.1.pc bindings/mono/examples/Makefile bindings/mono/examples/indicator-example bindings/python/Makefile tests/Makefile example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -13456,6 +13550,10 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}" as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${INTROSPECTION_TEN_TRUE}" && test -z "${INTROSPECTION_TEN_FALSE}"; then + as_fn_error $? "conditional \"INTROSPECTION_TEN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 @@ -13864,7 +13962,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by indicator-application $as_me 0.2.90, which was +This file was extended by libappindicator $as_me 0.2.90, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13930,7 +14028,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -indicator-application config.status 0.2.90 +libappindicator config.status 0.2.90 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" @@ -14328,7 +14426,6 @@ do "bindings/mono/examples/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/mono/examples/Makefile" ;; "bindings/mono/examples/indicator-example") CONFIG_FILES="$CONFIG_FILES bindings/mono/examples/indicator-example" ;; "bindings/python/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/python/Makefile" ;; - "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "example/Makefile") CONFIG_FILES="$CONFIG_FILES example/Makefile" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; @@ -15702,17 +15799,15 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: -Application Indicator Configuration: +Libappindicator Configuration: Prefix: $prefix - Indicator Dir: $INDICATORDIR GTK+ Version: $with_gtk " >&5 $as_echo "$as_me: -Application Indicator Configuration: +Libappindicator Configuration: Prefix: $prefix - Indicator Dir: $INDICATORDIR GTK+ Version: $with_gtk " >&6;} diff --git a/debian/changelog b/debian/changelog index b5ec00c..8a795e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ indicator-application (0.2.90-0ubuntu4~ppa1) UNRELEASED; urgency=low * Upstream Merge * Removing service, lib only * Switching from dbus-glib to GDBus + * Autogen - -- Ted Gould Wed, 08 Dec 2010 15:29:45 -0600 + -- Ted Gould Wed, 08 Dec 2010 15:34:18 -0600 indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low diff --git a/docs/Makefile.in b/docs/Makefile.in index 100cd5e..e669fa8 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -114,7 +114,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ CYGPATH_W = @CYGPATH_W@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -141,10 +140,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ HTML_DIR = @HTML_DIR@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -161,6 +156,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBRARY_CFLAGS = @LIBRARY_CFLAGS@ +LIBRARY_LIBS = @LIBRARY_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_PREFIX = @LIB_PREFIX@ @@ -206,6 +203,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ +TESTDEPS_LIBS = @TESTDEPS_LIBS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in index 4b558a4..47dc8e5 100644 --- a/docs/reference/Makefile.in +++ b/docs/reference/Makefile.in @@ -84,7 +84,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ CYGPATH_W = @CYGPATH_W@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -111,10 +110,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ HTML_DIR = @HTML_DIR@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -131,6 +126,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBRARY_CFLAGS = @LIBRARY_CFLAGS@ +LIBRARY_LIBS = @LIBRARY_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_PREFIX = @LIB_PREFIX@ @@ -176,6 +173,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ +TESTDEPS_LIBS = @TESTDEPS_LIBS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ @@ -325,8 +324,8 @@ expand_content_files = # signals and properties. # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(INDICATOR_CFLAGS) -GTKDOC_LIBS = $(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la $(INDICATOR_LIBS) +GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS) +GTKDOC_LIBS = $(top_builddir)/src/libappindicator.la $(LIBRARY_LIBS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) diff --git a/example/Makefile.in b/example/Makefile.in index 4496bac..0337245 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -108,7 +108,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ CYGPATH_W = @CYGPATH_W@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -135,10 +134,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ HTML_DIR = @HTML_DIR@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -155,6 +150,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBRARY_CFLAGS = @LIBRARY_CFLAGS@ +LIBRARY_LIBS = @LIBRARY_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_PREFIX = @LIB_PREFIX@ @@ -200,6 +197,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ +TESTDEPS_LIBS = @TESTDEPS_LIBS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ @@ -265,14 +264,18 @@ simple_client_SOURCES = \ simple-client.c simple_client_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ + -DLOCAL_ICON="\"$(abs_srcdir)/simple-client-test-icon.png\"" \ -Wall -Werror \ -I$(top_srcdir)/src simple_client_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la +EXTRA_DIST = \ + simple-client-test-icon.png + all: all-am .SUFFIXES: diff --git a/src/Makefile.in b/src/Makefile.in index 3e55704..75da889 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -50,7 +50,6 @@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -76,7 +75,6 @@ DIST_COMMON = $(libappindicator3include_HEADERS) \ $(srcdir)/appindicator3-0.1.pc.in \ $(top_srcdir)/Makefile.am.enum \ $(top_srcdir)/Makefile.am.marshal -libexec_PROGRAMS = indicator-application-service$(EXEEXT) @HAVE_INTROSPECTION_TRUE@am__append_1 = AppIndicator$(VER)-0.1.gir @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) \ @HAVE_INTROSPECTION_TRUE@ $(vapi_DATA) @@ -114,13 +112,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(applicationlibdir)" \ - "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)" \ - "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(vapidir)" \ +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" \ + "$(DESTDIR)$(vapidir)" \ "$(DESTDIR)$(libappindicator3includedir)" \ "$(DESTDIR)$(libappindicatorincludedir)" -LTLIBRARIES = $(applicationlib_LTLIBRARIES) $(lib_LTLIBRARIES) +LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libappindicator_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am__objects_1 = @@ -128,7 +125,9 @@ am_libappindicator_la_OBJECTS = $(am__objects_1) \ libappindicator_la-app-indicator-enum-types.lo \ libappindicator_la-app-indicator.lo \ libappindicator_la-application-service-marshal.lo \ - libappindicator_la-generate-id.lo + libappindicator_la-generate-id.lo \ + libappindicator_la-gen-notification-item.xml.lo \ + libappindicator_la-gen-notification-watcher.xml.lo libappindicator_la_OBJECTS = $(am_libappindicator_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -144,7 +143,9 @@ am__objects_2 = $(am__objects_1) \ libappindicator3_la-app-indicator-enum-types.lo \ libappindicator3_la-app-indicator.lo \ libappindicator3_la-application-service-marshal.lo \ - libappindicator3_la-generate-id.lo + libappindicator3_la-generate-id.lo \ + libappindicator3_la-gen-notification-item.xml.lo \ + libappindicator3_la-gen-notification-watcher.xml.lo am_libappindicator3_la_OBJECTS = $(am__objects_2) libappindicator3_la_OBJECTS = $(am_libappindicator3_la_OBJECTS) libappindicator3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -152,31 +153,6 @@ libappindicator3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(libappindicator3_la_CFLAGS) $(CFLAGS) \ $(libappindicator3_la_LDFLAGS) $(LDFLAGS) -o $@ @USE_GTK3_TRUE@am_libappindicator3_la_rpath = -rpath $(libdir) -libapplication_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libapplication_la_OBJECTS = \ - libapplication_la-application-service-marshal.lo \ - libapplication_la-indicator-application.lo -libapplication_la_OBJECTS = $(am_libapplication_la_OBJECTS) -libapplication_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libapplication_la_CFLAGS) $(CFLAGS) \ - $(libapplication_la_LDFLAGS) $(LDFLAGS) -o $@ -PROGRAMS = $(libexec_PROGRAMS) -am_indicator_application_service_OBJECTS = \ - indicator_application_service-application-service.$(OBJEXT) \ - indicator_application_service-application-service-appstore.$(OBJEXT) \ - indicator_application_service-application-service-marshal.$(OBJEXT) \ - indicator_application_service-application-service-watcher.$(OBJEXT) \ - indicator_application_service-app-indicator-enum-types.$(OBJEXT) \ - indicator_application_service-generate-id.$(OBJEXT) -indicator_application_service_OBJECTS = \ - $(am_indicator_application_service_OBJECTS) -indicator_application_service_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - libappindicator$(VER).la -indicator_application_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(indicator_application_service_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -203,12 +179,9 @@ am__v_CCLD_0 = @echo " CCLD " $@; AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libappindicator_la_SOURCES) $(libappindicator3_la_SOURCES) \ - $(libapplication_la_SOURCES) \ - $(indicator_application_service_SOURCES) +SOURCES = $(libappindicator_la_SOURCES) $(libappindicator3_la_SOURCES) DIST_SOURCES = $(libappindicator_la_SOURCES) \ - $(libappindicator3_la_SOURCES) $(libapplication_la_SOURCES) \ - $(indicator_application_service_SOURCES) + $(libappindicator3_la_SOURCES) DATA = $(gir_DATA) $(pkgconfig_DATA) $(typelib_DATA) $(vapi_DATA) HEADERS = $(libappindicator3include_HEADERS) \ $(libappindicatorinclude_HEADERS) @@ -233,7 +206,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ CYGPATH_W = @CYGPATH_W@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -260,10 +232,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ HTML_DIR = @HTML_DIR@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -280,6 +248,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBRARY_CFLAGS = @LIBRARY_CFLAGS@ +LIBRARY_LIBS = @LIBRARY_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_PREFIX = @LIB_PREFIX@ @@ -325,6 +295,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ +TESTDEPS_LIBS = @TESTDEPS_LIBS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ @@ -391,17 +363,21 @@ top_srcdir = @top_srcdir@ @USE_GTK3_TRUE@GTKGIR = Gtk-3.0 @USE_GTK3_FALSE@GTKVAPI = gtk+-2.0 @USE_GTK3_TRUE@GTKVAPI = gtk+-3.0 -CLEANFILES = stamp-enum-types stamp-marshal $(BUILT_SOURCES) \ +CLEANFILES = stamp-enum-types stamp-marshal \ + gen-notification-item.xml.c gen-notification-item.xml.h \ + gen-notification-watcher.xml.c gen-notification-watcher.xml.h \ $(am__append_2) DISTCLEANFILES = $(glib_enum_h) $(glib_enum_c) $(marshal_h) \ $(marshal_c) app-indicator-enum-types.c + +################################## +# Marshallers +################################## BUILT_SOURCES = $(glib_enum_h) $(glib_enum_c) $(marshal_h) \ - $(marshal_c) application-service-server.h \ - application-service-marshal.h application-service-marshal.c \ - dbus-properties-client.h notification-item-client.h \ - notification-watcher-server.h notification-watcher-client.h \ - notification-item-server.h $(DBUS_SPECS:.xml=-client.h) \ - $(DBUS_SPECS:.xml=-server.h) + $(marshal_c) application-service-marshal.h \ + application-service-marshal.c gen-notification-item.xml.c \ + gen-notification-item.xml.h gen-notification-watcher.xml.c \ + gen-notification-watcher.xml.h EXTRA_DIST = appindicator-0.1.pc.in appindicator3-0.1.pc.in \ AppIndicator-0.1.metadata $(enum_tmpl_h) $(enum_tmpl_c) \ $(glib_marshal_list) $(DBUS_SPECS) @@ -409,49 +385,6 @@ enum_tmpl_h = $(glib_enum_h:.h=.h.in) enum_tmpl_c = $(glib_enum_c:.c=.c.in) marshal_h = $(glib_marshal_list:.list=.h) marshal_c = $(glib_marshal_list:.list=.c) - -################################## -# Indicator -################################## -applicationlibdir = $(INDICATORDIR) -applicationlib_LTLIBRARIES = libapplication.la -libapplication_la_SOURCES = \ - application-service-marshal.c \ - dbus-shared.h \ - indicator-application.c - -libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \ - -Wall \ - -Wl,-Bsymbolic-functions \ - -Wl,-z,defs \ - -Wl,--as-needed \ - -Werror \ - -DG_LOG_DOMAIN=\"Indicator-Application\" - -libapplication_la_LIBADD = $(INDICATOR_LIBS) -libapplication_la_LDFLAGS = -module -avoid-version -indicator_application_service_SOURCES = \ - application-service.c \ - application-service-appstore.h \ - application-service-appstore.c \ - application-service-marshal.c \ - application-service-watcher.h \ - application-service-watcher.c \ - app-indicator-enum-types.c \ - dbus-shared.h \ - generate-id.h \ - generate-id.c - -indicator_application_service_CFLAGS = \ - $(INDICATOR_CFLAGS) \ - -DDATADIR="\"$(pkgdatadir)\"" \ - -Wall -Werror \ - -DG_LOG_DOMAIN=\"indicator-application-service\" - -indicator_application_service_LDADD = \ - $(INDICATOR_LIBS) \ - libappindicator$(VER).la - glib_marshal_list = application-service-marshal.list glib_marshal_prefix = _application_service_marshal @@ -476,8 +409,13 @@ libappindicator_la_SOURCES = \ app-indicator-enum-types.c \ app-indicator.c \ application-service-marshal.c \ + dbus-shared.h \ generate-id.h \ - generate-id.c + generate-id.c \ + gen-notification-item.xml.h \ + gen-notification-item.xml.c \ + gen-notification-watcher.xml.h \ + gen-notification-watcher.xml.c libappindicator_la_LDFLAGS = \ -version-info 1:0:0 \ @@ -485,12 +423,12 @@ libappindicator_la_LDFLAGS = \ -export-symbols-regex "^[^_d].*" libappindicator_la_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -DG_LOG_DOMAIN=\"libappindicator\" libappindicator_la_LIBADD = \ - $(INDICATOR_LIBS) + $(LIBRARY_LIBS) # We duplicate these here because Automake won't let us use $(VER) on the left hand side. @@ -508,18 +446,19 @@ libappindicator3_la_LIBADD = $(libappindicator_la_LIBADD) # DBus Specs ################################## DBUS_SPECS = \ - dbus-properties.xml \ - application-service.xml \ - notification-approver.xml \ notification-item.xml \ notification-watcher.xml INTROSPECTION_GIRS = $(am__append_1) -INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=$(srcdir) \ - $(addprefix --c-include=src/, $(introspection_sources)) \ - --symbol-prefix=app \ - --identifier-prefix=App +@INTROSPECTION_TEN_FALSE@INTROSPECTION_SCANNER_ARGS = \ +@INTROSPECTION_TEN_FALSE@ --add-include-path=$(srcdir) \ +@INTROSPECTION_TEN_FALSE@ $(addprefix --c-include=src/, $(introspection_sources)) + +@INTROSPECTION_TEN_TRUE@INTROSPECTION_SCANNER_ARGS = \ +@INTROSPECTION_TEN_TRUE@ --add-include-path=$(srcdir) \ +@INTROSPECTION_TEN_TRUE@ $(addprefix --c-include=src/, $(introspection_sources)) \ +@INTROSPECTION_TEN_TRUE@ --symbol-prefix=app \ +@INTROSPECTION_TEN_TRUE@ --identifier-prefix=App INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) @HAVE_INTROSPECTION_TRUE@introspection_sources = \ @@ -529,7 +468,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) @HAVE_INTROSPECTION_TRUE@ GObject-2.0 \ @HAVE_INTROSPECTION_TRUE@ $(GTKGIR) -@HAVE_INTROSPECTION_TRUE@AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir) -I$(top_builddir)/src +@HAVE_INTROSPECTION_TRUE@AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src @HAVE_INTROSPECTION_TRUE@AppIndicator_0_1_gir_LIBS = libappindicator$(VER).la @HAVE_INTROSPECTION_TRUE@AppIndicator_0_1_gir_FILES = $(introspection_sources) @HAVE_INTROSPECTION_TRUE@AppIndicator3_0_1_gir_INCLUDES = $(AppIndicator_0_1_gir_INCLUDES) @@ -585,37 +524,6 @@ appindicator-0.1.pc: $(top_builddir)/config.status $(srcdir)/appindicator-0.1.pc cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ appindicator3-0.1.pc: $(top_builddir)/config.status $(srcdir)/appindicator3-0.1.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -install-applicationlibLTLIBRARIES: $(applicationlib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(applicationlibdir)" || $(MKDIR_P) "$(DESTDIR)$(applicationlibdir)" - @list='$(applicationlib_LTLIBRARIES)'; test -n "$(applicationlibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(applicationlibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(applicationlibdir)"; \ - } - -uninstall-applicationlibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(applicationlib_LTLIBRARIES)'; test -n "$(applicationlibdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(applicationlibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(applicationlibdir)/$$f"; \ - done - -clean-applicationlibLTLIBRARIES: - -test -z "$(applicationlib_LTLIBRARIES)" || rm -f $(applicationlib_LTLIBRARIES) - @list='$(applicationlib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @@ -651,54 +559,6 @@ libappindicator.la: $(libappindicator_la_OBJECTS) $(libappindicator_la_DEPENDENC $(AM_V_CCLD)$(libappindicator_la_LINK) $(am_libappindicator_la_rpath) $(libappindicator_la_OBJECTS) $(libappindicator_la_LIBADD) $(LIBS) libappindicator3.la: $(libappindicator3_la_OBJECTS) $(libappindicator3_la_DEPENDENCIES) $(AM_V_CCLD)$(libappindicator3_la_LINK) $(am_libappindicator3_la_rpath) $(libappindicator3_la_OBJECTS) $(libappindicator3_la_LIBADD) $(LIBS) -libapplication.la: $(libapplication_la_OBJECTS) $(libapplication_la_DEPENDENCIES) - $(AM_V_CCLD)$(libapplication_la_LINK) -rpath $(applicationlibdir) $(libapplication_la_OBJECTS) $(libapplication_la_LIBADD) $(LIBS) -install-libexecPROGRAMS: $(libexec_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" - @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-libexecPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files - -clean-libexecPROGRAMS: - @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -indicator-application-service$(EXEEXT): $(indicator_application_service_OBJECTS) $(indicator_application_service_DEPENDENCIES) - @rm -f indicator-application-service$(EXEEXT) - $(AM_V_CCLD)$(indicator_application_service_LINK) $(indicator_application_service_OBJECTS) $(indicator_application_service_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -706,22 +566,18 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-app-indicator-enum-types.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service-appstore.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service-marshal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service-watcher.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-generate-id.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator3_la-app-indicator-enum-types.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator3_la-app-indicator.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator3_la-application-service-marshal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator3_la-gen-notification-item.xml.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator3_la-gen-notification-watcher.xml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator3_la-generate-id.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-app-indicator-enum-types.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-app-indicator.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-application-service-marshal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-gen-notification-item.xml.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-gen-notification-watcher.xml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-generate-id.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapplication_la-application-service-marshal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapplication_la-indicator-application.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -779,6 +635,22 @@ libappindicator_la-generate-id.lo: generate-id.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator_la_CFLAGS) $(CFLAGS) -c -o libappindicator_la-generate-id.lo `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c +libappindicator_la-gen-notification-item.xml.lo: gen-notification-item.xml.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator_la_CFLAGS) $(CFLAGS) -MT libappindicator_la-gen-notification-item.xml.lo -MD -MP -MF $(DEPDIR)/libappindicator_la-gen-notification-item.xml.Tpo -c -o libappindicator_la-gen-notification-item.xml.lo `test -f 'gen-notification-item.xml.c' || echo '$(srcdir)/'`gen-notification-item.xml.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libappindicator_la-gen-notification-item.xml.Tpo $(DEPDIR)/libappindicator_la-gen-notification-item.xml.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-notification-item.xml.c' object='libappindicator_la-gen-notification-item.xml.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator_la_CFLAGS) $(CFLAGS) -c -o libappindicator_la-gen-notification-item.xml.lo `test -f 'gen-notification-item.xml.c' || echo '$(srcdir)/'`gen-notification-item.xml.c + +libappindicator_la-gen-notification-watcher.xml.lo: gen-notification-watcher.xml.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator_la_CFLAGS) $(CFLAGS) -MT libappindicator_la-gen-notification-watcher.xml.lo -MD -MP -MF $(DEPDIR)/libappindicator_la-gen-notification-watcher.xml.Tpo -c -o libappindicator_la-gen-notification-watcher.xml.lo `test -f 'gen-notification-watcher.xml.c' || echo '$(srcdir)/'`gen-notification-watcher.xml.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libappindicator_la-gen-notification-watcher.xml.Tpo $(DEPDIR)/libappindicator_la-gen-notification-watcher.xml.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-notification-watcher.xml.c' object='libappindicator_la-gen-notification-watcher.xml.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator_la_CFLAGS) $(CFLAGS) -c -o libappindicator_la-gen-notification-watcher.xml.lo `test -f 'gen-notification-watcher.xml.c' || echo '$(srcdir)/'`gen-notification-watcher.xml.c + libappindicator3_la-app-indicator-enum-types.lo: app-indicator-enum-types.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator3_la_CFLAGS) $(CFLAGS) -MT libappindicator3_la-app-indicator-enum-types.lo -MD -MP -MF $(DEPDIR)/libappindicator3_la-app-indicator-enum-types.Tpo -c -o libappindicator3_la-app-indicator-enum-types.lo `test -f 'app-indicator-enum-types.c' || echo '$(srcdir)/'`app-indicator-enum-types.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libappindicator3_la-app-indicator-enum-types.Tpo $(DEPDIR)/libappindicator3_la-app-indicator-enum-types.Plo @@ -811,117 +683,21 @@ libappindicator3_la-generate-id.lo: generate-id.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator3_la_CFLAGS) $(CFLAGS) -c -o libappindicator3_la-generate-id.lo `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c -libapplication_la-application-service-marshal.lo: application-service-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplication_la_CFLAGS) $(CFLAGS) -MT libapplication_la-application-service-marshal.lo -MD -MP -MF $(DEPDIR)/libapplication_la-application-service-marshal.Tpo -c -o libapplication_la-application-service-marshal.lo `test -f 'application-service-marshal.c' || echo '$(srcdir)/'`application-service-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libapplication_la-application-service-marshal.Tpo $(DEPDIR)/libapplication_la-application-service-marshal.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='application-service-marshal.c' object='libapplication_la-application-service-marshal.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplication_la_CFLAGS) $(CFLAGS) -c -o libapplication_la-application-service-marshal.lo `test -f 'application-service-marshal.c' || echo '$(srcdir)/'`application-service-marshal.c - -libapplication_la-indicator-application.lo: indicator-application.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplication_la_CFLAGS) $(CFLAGS) -MT libapplication_la-indicator-application.lo -MD -MP -MF $(DEPDIR)/libapplication_la-indicator-application.Tpo -c -o libapplication_la-indicator-application.lo `test -f 'indicator-application.c' || echo '$(srcdir)/'`indicator-application.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libapplication_la-indicator-application.Tpo $(DEPDIR)/libapplication_la-indicator-application.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-application.c' object='libapplication_la-indicator-application.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplication_la_CFLAGS) $(CFLAGS) -c -o libapplication_la-indicator-application.lo `test -f 'indicator-application.c' || echo '$(srcdir)/'`indicator-application.c - -indicator_application_service-application-service.o: application-service.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service.o -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service.Tpo -c -o indicator_application_service-application-service.o `test -f 'application-service.c' || echo '$(srcdir)/'`application-service.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service.Tpo $(DEPDIR)/indicator_application_service-application-service.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='application-service.c' object='indicator_application_service-application-service.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service.o `test -f 'application-service.c' || echo '$(srcdir)/'`application-service.c - -indicator_application_service-application-service.obj: application-service.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service.obj -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service.Tpo -c -o indicator_application_service-application-service.obj `if test -f 'application-service.c'; then $(CYGPATH_W) 'application-service.c'; else $(CYGPATH_W) '$(srcdir)/application-service.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service.Tpo $(DEPDIR)/indicator_application_service-application-service.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='application-service.c' object='indicator_application_service-application-service.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service.obj `if test -f 'application-service.c'; then $(CYGPATH_W) 'application-service.c'; else $(CYGPATH_W) '$(srcdir)/application-service.c'; fi` - -indicator_application_service-application-service-appstore.o: application-service-appstore.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-appstore.o -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-appstore.Tpo -c -o indicator_application_service-application-service-appstore.o `test -f 'application-service-appstore.c' || echo '$(srcdir)/'`application-service-appstore.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-appstore.Tpo $(DEPDIR)/indicator_application_service-application-service-appstore.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='application-service-appstore.c' object='indicator_application_service-application-service-appstore.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-appstore.o `test -f 'application-service-appstore.c' || echo '$(srcdir)/'`application-service-appstore.c - -indicator_application_service-application-service-appstore.obj: application-service-appstore.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-appstore.obj -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-appstore.Tpo -c -o indicator_application_service-application-service-appstore.obj `if test -f 'application-service-appstore.c'; then $(CYGPATH_W) 'application-service-appstore.c'; else $(CYGPATH_W) '$(srcdir)/application-service-appstore.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-appstore.Tpo $(DEPDIR)/indicator_application_service-application-service-appstore.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='application-service-appstore.c' object='indicator_application_service-application-service-appstore.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-appstore.obj `if test -f 'application-service-appstore.c'; then $(CYGPATH_W) 'application-service-appstore.c'; else $(CYGPATH_W) '$(srcdir)/application-service-appstore.c'; fi` - -indicator_application_service-application-service-marshal.o: application-service-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-marshal.o -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-marshal.Tpo -c -o indicator_application_service-application-service-marshal.o `test -f 'application-service-marshal.c' || echo '$(srcdir)/'`application-service-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-marshal.Tpo $(DEPDIR)/indicator_application_service-application-service-marshal.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='application-service-marshal.c' object='indicator_application_service-application-service-marshal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-marshal.o `test -f 'application-service-marshal.c' || echo '$(srcdir)/'`application-service-marshal.c - -indicator_application_service-application-service-marshal.obj: application-service-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-marshal.obj -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-marshal.Tpo -c -o indicator_application_service-application-service-marshal.obj `if test -f 'application-service-marshal.c'; then $(CYGPATH_W) 'application-service-marshal.c'; else $(CYGPATH_W) '$(srcdir)/application-service-marshal.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-marshal.Tpo $(DEPDIR)/indicator_application_service-application-service-marshal.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='application-service-marshal.c' object='indicator_application_service-application-service-marshal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-marshal.obj `if test -f 'application-service-marshal.c'; then $(CYGPATH_W) 'application-service-marshal.c'; else $(CYGPATH_W) '$(srcdir)/application-service-marshal.c'; fi` - -indicator_application_service-application-service-watcher.o: application-service-watcher.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-watcher.o -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-watcher.Tpo -c -o indicator_application_service-application-service-watcher.o `test -f 'application-service-watcher.c' || echo '$(srcdir)/'`application-service-watcher.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-watcher.Tpo $(DEPDIR)/indicator_application_service-application-service-watcher.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='application-service-watcher.c' object='indicator_application_service-application-service-watcher.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-watcher.o `test -f 'application-service-watcher.c' || echo '$(srcdir)/'`application-service-watcher.c - -indicator_application_service-application-service-watcher.obj: application-service-watcher.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-watcher.obj -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-watcher.Tpo -c -o indicator_application_service-application-service-watcher.obj `if test -f 'application-service-watcher.c'; then $(CYGPATH_W) 'application-service-watcher.c'; else $(CYGPATH_W) '$(srcdir)/application-service-watcher.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-watcher.Tpo $(DEPDIR)/indicator_application_service-application-service-watcher.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='application-service-watcher.c' object='indicator_application_service-application-service-watcher.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-watcher.obj `if test -f 'application-service-watcher.c'; then $(CYGPATH_W) 'application-service-watcher.c'; else $(CYGPATH_W) '$(srcdir)/application-service-watcher.c'; fi` - -indicator_application_service-app-indicator-enum-types.o: app-indicator-enum-types.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-app-indicator-enum-types.o -MD -MP -MF $(DEPDIR)/indicator_application_service-app-indicator-enum-types.Tpo -c -o indicator_application_service-app-indicator-enum-types.o `test -f 'app-indicator-enum-types.c' || echo '$(srcdir)/'`app-indicator-enum-types.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-app-indicator-enum-types.Tpo $(DEPDIR)/indicator_application_service-app-indicator-enum-types.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='app-indicator-enum-types.c' object='indicator_application_service-app-indicator-enum-types.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-app-indicator-enum-types.o `test -f 'app-indicator-enum-types.c' || echo '$(srcdir)/'`app-indicator-enum-types.c - -indicator_application_service-app-indicator-enum-types.obj: app-indicator-enum-types.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-app-indicator-enum-types.obj -MD -MP -MF $(DEPDIR)/indicator_application_service-app-indicator-enum-types.Tpo -c -o indicator_application_service-app-indicator-enum-types.obj `if test -f 'app-indicator-enum-types.c'; then $(CYGPATH_W) 'app-indicator-enum-types.c'; else $(CYGPATH_W) '$(srcdir)/app-indicator-enum-types.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-app-indicator-enum-types.Tpo $(DEPDIR)/indicator_application_service-app-indicator-enum-types.Po +libappindicator3_la-gen-notification-item.xml.lo: gen-notification-item.xml.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator3_la_CFLAGS) $(CFLAGS) -MT libappindicator3_la-gen-notification-item.xml.lo -MD -MP -MF $(DEPDIR)/libappindicator3_la-gen-notification-item.xml.Tpo -c -o libappindicator3_la-gen-notification-item.xml.lo `test -f 'gen-notification-item.xml.c' || echo '$(srcdir)/'`gen-notification-item.xml.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libappindicator3_la-gen-notification-item.xml.Tpo $(DEPDIR)/libappindicator3_la-gen-notification-item.xml.Plo @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='app-indicator-enum-types.c' object='indicator_application_service-app-indicator-enum-types.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-notification-item.xml.c' object='libappindicator3_la-gen-notification-item.xml.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-app-indicator-enum-types.obj `if test -f 'app-indicator-enum-types.c'; then $(CYGPATH_W) 'app-indicator-enum-types.c'; else $(CYGPATH_W) '$(srcdir)/app-indicator-enum-types.c'; fi` +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator3_la_CFLAGS) $(CFLAGS) -c -o libappindicator3_la-gen-notification-item.xml.lo `test -f 'gen-notification-item.xml.c' || echo '$(srcdir)/'`gen-notification-item.xml.c -indicator_application_service-generate-id.o: generate-id.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-generate-id.o -MD -MP -MF $(DEPDIR)/indicator_application_service-generate-id.Tpo -c -o indicator_application_service-generate-id.o `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-generate-id.Tpo $(DEPDIR)/indicator_application_service-generate-id.Po +libappindicator3_la-gen-notification-watcher.xml.lo: gen-notification-watcher.xml.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator3_la_CFLAGS) $(CFLAGS) -MT libappindicator3_la-gen-notification-watcher.xml.lo -MD -MP -MF $(DEPDIR)/libappindicator3_la-gen-notification-watcher.xml.Tpo -c -o libappindicator3_la-gen-notification-watcher.xml.lo `test -f 'gen-notification-watcher.xml.c' || echo '$(srcdir)/'`gen-notification-watcher.xml.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libappindicator3_la-gen-notification-watcher.xml.Tpo $(DEPDIR)/libappindicator3_la-gen-notification-watcher.xml.Plo @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='generate-id.c' object='indicator_application_service-generate-id.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-notification-watcher.xml.c' object='libappindicator3_la-gen-notification-watcher.xml.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-generate-id.o `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c - -indicator_application_service-generate-id.obj: generate-id.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-generate-id.obj -MD -MP -MF $(DEPDIR)/indicator_application_service-generate-id.Tpo -c -o indicator_application_service-generate-id.obj `if test -f 'generate-id.c'; then $(CYGPATH_W) 'generate-id.c'; else $(CYGPATH_W) '$(srcdir)/generate-id.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-generate-id.Tpo $(DEPDIR)/indicator_application_service-generate-id.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='generate-id.c' object='indicator_application_service-generate-id.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-generate-id.obj `if test -f 'generate-id.c'; then $(CYGPATH_W) 'generate-id.c'; else $(CYGPATH_W) '$(srcdir)/generate-id.c'; fi` +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator3_la_CFLAGS) $(CFLAGS) -c -o libappindicator3_la-gen-notification-watcher.xml.lo `test -f 'gen-notification-watcher.xml.c' || echo '$(srcdir)/'`gen-notification-watcher.xml.c mostlyclean-libtool: -rm -f *.lo @@ -1134,9 +910,9 @@ distdir: $(DISTFILES) check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(applicationlibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(libappindicator3includedir)" "$(DESTDIR)$(libappindicatorincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(libappindicator3includedir)" "$(DESTDIR)$(libappindicatorincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1170,8 +946,7 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-applicationlibLTLIBRARIES clean-generic \ - clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \ +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am @@ -1192,7 +967,7 @@ info: info-am info-am: -install-data-am: install-applicationlibLTLIBRARIES install-girDATA \ +install-data-am: install-girDATA \ install-libappindicator3includeHEADERS \ install-libappindicatorincludeHEADERS install-pkgconfigDATA \ install-typelibDATA install-vapiDATA @@ -1201,7 +976,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-libLTLIBRARIES install-libexecPROGRAMS +install-exec-am: install-libLTLIBRARIES install-html: install-html-am @@ -1241,39 +1016,34 @@ ps: ps-am ps-am: -uninstall-am: uninstall-applicationlibLTLIBRARIES uninstall-girDATA \ - uninstall-libLTLIBRARIES \ +uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ uninstall-libappindicator3includeHEADERS \ uninstall-libappindicatorincludeHEADERS \ - uninstall-libexecPROGRAMS uninstall-pkgconfigDATA \ - uninstall-typelibDATA uninstall-vapiDATA + uninstall-pkgconfigDATA uninstall-typelibDATA \ + uninstall-vapiDATA .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ - clean-applicationlibLTLIBRARIES clean-generic \ - clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ - install-applicationlibLTLIBRARIES install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-girDATA install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES \ - install-libappindicator3includeHEADERS \ - install-libappindicatorincludeHEADERS install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-pkgconfigDATA \ - install-ps install-ps-am install-strip install-typelibDATA \ - install-vapiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-applicationlibLTLIBRARIES uninstall-girDATA \ +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-girDATA \ + install-html install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-libappindicator3includeHEADERS \ + install-libappindicatorincludeHEADERS install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip install-typelibDATA install-vapiDATA \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-girDATA \ uninstall-libLTLIBRARIES \ uninstall-libappindicator3includeHEADERS \ uninstall-libappindicatorincludeHEADERS \ - uninstall-libexecPROGRAMS uninstall-pkgconfigDATA \ - uninstall-typelibDATA uninstall-vapiDATA + uninstall-pkgconfigDATA uninstall-typelibDATA \ + uninstall-vapiDATA stamp-enum-types: $(glib_enum_headers) @@ -1317,19 +1087,15 @@ $(marshal_c): $(marshal_h) && cp xgen-mc $(marshal_c) \ && rm -f xgen-mc -%-client.h: %.xml - dbus-binding-tool \ - --prefix=_$(notdir $(subst -,_,$(<:.xml=)))_client \ - --mode=glib-client \ - --output=$@ \ - $< - -%-server.h: %.xml - dbus-binding-tool \ - --prefix=_$(notdir $(subst -,_,$(<:.xml=)))_server \ - --mode=glib-server \ - --output=$@ \ - $< +gen-%.xml.h: %.xml + @echo "Building $@ from $<" + @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@ + +gen-%.xml.c: %.xml + @echo "Building $@ from $<" + @echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@ + @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ + @echo ";" >> $@ ######################### # GObject Introsepction diff --git a/tests/Makefile.in b/tests/Makefile.in index 8594e87..9d48c30 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -33,7 +33,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -check_PROGRAMS = test-approver$(EXEEXT) test-libappindicator$(EXEEXT) \ +check_PROGRAMS = test-libappindicator$(EXEEXT) \ test-libappindicator-dbus-client$(EXEEXT) \ test-libappindicator-dbus-server$(EXEEXT) \ test-libappindicator-status-client$(EXEEXT) \ @@ -55,22 +55,15 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am_test_approver_OBJECTS = test_approver-test-approver.$(OBJEXT) -test_approver_OBJECTS = $(am_test_approver_OBJECTS) -am__DEPENDENCIES_1 = -test_approver_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/src/libappindicator.la -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent -test_approver_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_approver_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_test_libappindicator_OBJECTS = \ test_libappindicator-test-libappindicator.$(OBJEXT) test_libappindicator_OBJECTS = $(am_test_libappindicator_OBJECTS) +am__DEPENDENCIES_1 = test_libappindicator_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/src/libappindicator.la + $(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent test_libappindicator_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(test_libappindicator_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -79,7 +72,7 @@ am_test_libappindicator_dbus_client_OBJECTS = test_libappindicator_dbus_client-t test_libappindicator_dbus_client_OBJECTS = \ $(am_test_libappindicator_dbus_client_OBJECTS) test_libappindicator_dbus_client_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/src/libappindicator.la + $(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la test_libappindicator_dbus_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(test_libappindicator_dbus_client_CFLAGS) $(CFLAGS) \ @@ -88,7 +81,7 @@ am_test_libappindicator_dbus_server_OBJECTS = test_libappindicator_dbus_server-t test_libappindicator_dbus_server_OBJECTS = \ $(am_test_libappindicator_dbus_server_OBJECTS) test_libappindicator_dbus_server_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/src/libappindicator.la + $(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la test_libappindicator_dbus_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(test_libappindicator_dbus_server_CFLAGS) $(CFLAGS) \ @@ -97,7 +90,8 @@ am_test_libappindicator_fallback_item_OBJECTS = test_libappindicator_fallback_it test_libappindicator_fallback_item_OBJECTS = \ $(am_test_libappindicator_fallback_item_OBJECTS) test_libappindicator_fallback_item_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/libappindicator.la test_libappindicator_fallback_item_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(test_libappindicator_fallback_item_CFLAGS) $(CFLAGS) \ @@ -106,7 +100,8 @@ am_test_libappindicator_fallback_watcher_OBJECTS = test_libappindicator_fallback test_libappindicator_fallback_watcher_OBJECTS = \ $(am_test_libappindicator_fallback_watcher_OBJECTS) test_libappindicator_fallback_watcher_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/libappindicator.la test_libappindicator_fallback_watcher_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(test_libappindicator_fallback_watcher_CFLAGS) \ @@ -115,7 +110,8 @@ am_test_libappindicator_status_client_OBJECTS = test_libappindicator_status_clie test_libappindicator_status_client_OBJECTS = \ $(am_test_libappindicator_status_client_OBJECTS) test_libappindicator_status_client_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/libappindicator.la test_libappindicator_status_client_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(test_libappindicator_status_client_CFLAGS) $(CFLAGS) \ @@ -124,7 +120,8 @@ am_test_libappindicator_status_server_OBJECTS = test_libappindicator_status_serv test_libappindicator_status_server_OBJECTS = \ $(am_test_libappindicator_status_server_OBJECTS) test_libappindicator_status_server_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/libappindicator.la test_libappindicator_status_server_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(test_libappindicator_status_server_CFLAGS) $(CFLAGS) \ @@ -133,7 +130,7 @@ am_test_simple_app_OBJECTS = \ test_simple_app-test-simple-app.$(OBJEXT) test_simple_app_OBJECTS = $(am_test_simple_app_OBJECTS) test_simple_app_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/src/libappindicator.la + $(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la test_simple_app_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(test_simple_app_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ @@ -164,7 +161,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(test_approver_SOURCES) $(test_libappindicator_SOURCES) \ +SOURCES = $(test_libappindicator_SOURCES) \ $(test_libappindicator_dbus_client_SOURCES) \ $(test_libappindicator_dbus_server_SOURCES) \ $(test_libappindicator_fallback_item_SOURCES) \ @@ -172,8 +169,7 @@ SOURCES = $(test_approver_SOURCES) $(test_libappindicator_SOURCES) \ $(test_libappindicator_status_client_SOURCES) \ $(test_libappindicator_status_server_SOURCES) \ $(test_simple_app_SOURCES) -DIST_SOURCES = $(test_approver_SOURCES) \ - $(test_libappindicator_SOURCES) \ +DIST_SOURCES = $(test_libappindicator_SOURCES) \ $(test_libappindicator_dbus_client_SOURCES) \ $(test_libappindicator_dbus_server_SOURCES) \ $(test_libappindicator_fallback_item_SOURCES) \ @@ -204,7 +200,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ CYGPATH_W = @CYGPATH_W@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -231,10 +226,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@ HTML_DIR = @HTML_DIR@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -251,6 +242,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBRARY_CFLAGS = @LIBRARY_CFLAGS@ +LIBRARY_LIBS = @LIBRARY_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_PREFIX = @LIB_PREFIX@ @@ -296,6 +289,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@ +TESTDEPS_LIBS = @TESTDEPS_LIBS@ VALA_API_GEN = @VALA_API_GEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ @@ -354,12 +349,14 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -TESTS = test-approver-tester test-libappindicator-fallback \ - libappindicator-tests test-libappindicator-dbus \ - test-libappindicator-status +TESTS = test-libappindicator-fallback libappindicator-tests \ + test-libappindicator-dbus test-libappindicator-status DISTCLEANFILES = $(TESTS) $(XML_REPORT) $(HTML_REPORT) \ libappindicator-tests-gtester -EXTRA_DIST = run-xvfb.sh +EXTRA_DIST = \ + run-xvfb.sh \ + test-libappindicator.desktop + ######################################### ######################################### @@ -367,12 +364,13 @@ test_libappindicator_SOURCES = \ test-libappindicator.c test_libappindicator_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ + -DSRCDIR="\"$(srcdir)\"" \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_LDADD = \ - $(INDICATOR_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la @@ -383,12 +381,12 @@ test_libappindicator_dbus_client_SOURCES = \ test-libappindicator-dbus-client.c test_libappindicator_dbus_client_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_dbus_client_LDADD = \ - $(INDICATOR_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la @@ -399,12 +397,12 @@ test_libappindicator_dbus_server_SOURCES = \ test-libappindicator-dbus-server.c test_libappindicator_dbus_server_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_dbus_server_LDADD = \ - $(INDICATOR_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la @@ -415,12 +413,12 @@ test_libappindicator_status_client_SOURCES = \ test-libappindicator-status-client.c test_libappindicator_status_client_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_status_client_LDADD = \ - $(INDICATOR_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la @@ -431,28 +429,12 @@ test_libappindicator_status_server_SOURCES = \ test-libappindicator-status-server.c test_libappindicator_status_server_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_status_server_LDADD = \ - $(INDICATOR_LIBS) \ - $(top_builddir)/src/libappindicator.la - - -######################################### -######################################### -test_approver_SOURCES = \ - test-approver.c - -test_approver_CFLAGS = \ - $(INDICATOR_CFLAGS) \ - -Wall -Werror \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src - -test_approver_LDADD = \ - $(INDICATOR_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la @@ -462,24 +444,24 @@ test_libappindicator_fallback_watcher_SOURCES = \ test-libappindicator-fallback-watcher.c test_libappindicator_fallback_watcher_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_fallback_watcher_LDADD = \ - $(INDICATOR_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la test_libappindicator_fallback_item_SOURCES = \ test-libappindicator-fallback-item.c test_libappindicator_fallback_item_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_fallback_item_LDADD = \ - $(INDICATOR_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la @@ -495,12 +477,12 @@ test_simple_app_SOURCES = \ test-simple-app.c test_simple_app_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_simple_app_LDADD = \ - $(INDICATOR_LIBS) \ + $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la all: all-am @@ -546,9 +528,6 @@ clean-checkPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -test-approver$(EXEEXT): $(test_approver_OBJECTS) $(test_approver_DEPENDENCIES) - @rm -f test-approver$(EXEEXT) - $(AM_V_CCLD)$(test_approver_LINK) $(test_approver_OBJECTS) $(test_approver_LDADD) $(LIBS) test-libappindicator$(EXEEXT): $(test_libappindicator_OBJECTS) $(test_libappindicator_DEPENDENCIES) @rm -f test-libappindicator$(EXEEXT) $(AM_V_CCLD)$(test_libappindicator_LINK) $(test_libappindicator_OBJECTS) $(test_libappindicator_LDADD) $(LIBS) @@ -580,7 +559,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_approver-test-approver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator-test-libappindicator.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator_dbus_client-test-libappindicator-dbus-client.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator_dbus_server-test-libappindicator-dbus-server.Po@am__quote@ @@ -614,22 +592,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -test_approver-test-approver.o: test-approver.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -MT test_approver-test-approver.o -MD -MP -MF $(DEPDIR)/test_approver-test-approver.Tpo -c -o test_approver-test-approver.o `test -f 'test-approver.c' || echo '$(srcdir)/'`test-approver.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_approver-test-approver.Tpo $(DEPDIR)/test_approver-test-approver.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-approver.c' object='test_approver-test-approver.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -c -o test_approver-test-approver.o `test -f 'test-approver.c' || echo '$(srcdir)/'`test-approver.c - -test_approver-test-approver.obj: test-approver.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -MT test_approver-test-approver.obj -MD -MP -MF $(DEPDIR)/test_approver-test-approver.Tpo -c -o test_approver-test-approver.obj `if test -f 'test-approver.c'; then $(CYGPATH_W) 'test-approver.c'; else $(CYGPATH_W) '$(srcdir)/test-approver.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_approver-test-approver.Tpo $(DEPDIR)/test_approver-test-approver.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-approver.c' object='test_approver-test-approver.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -c -o test_approver-test-approver.obj `if test -f 'test-approver.c'; then $(CYGPATH_W) 'test-approver.c'; else $(CYGPATH_W) '$(srcdir)/test-approver.c'; fi` - test_libappindicator-test-libappindicator.o: test-libappindicator.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_CFLAGS) $(CFLAGS) -MT test_libappindicator-test-libappindicator.o -MD -MP -MF $(DEPDIR)/test_libappindicator-test-libappindicator.Tpo -c -o test_libappindicator-test-libappindicator.o `test -f 'test-libappindicator.c' || echo '$(srcdir)/'`test-libappindicator.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator-test-libappindicator.Tpo $(DEPDIR)/test_libappindicator-test-libappindicator.Po @@ -1058,13 +1020,6 @@ uninstall-am: tags uninstall uninstall-am -test-approver-tester: test-approver Makefile.am - @echo "#!/bin/bash" > $@ - @echo export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=1000 >> $@ - @echo . $(srcdir)/run-xvfb.sh >> $@ - @echo $(DBUS_RUNNER) --task $(builddir)/test-approver --task-name Approver --task $(top_builddir)/src/indicator-application-service --task-name Service --ignore-return >> $@ - @chmod +x $@ - test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am @echo "#!/bin/bash" > $@ @echo . $(srcdir)/run-xvfb.sh >> $@ -- cgit v1.2.3 From 2a0070acc1c3e9f57ecf9615540fac18901bb880 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 15:35:51 -0600 Subject: debian/control: Removing the indicator-application bin package. --- debian/changelog | 3 ++- debian/control | 7 ------- debian/indicator-application.install | 4 ---- 3 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 debian/indicator-application.install diff --git a/debian/changelog b/debian/changelog index 8a795e1..0bc774a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ indicator-application (0.2.90-0ubuntu4~ppa1) UNRELEASED; urgency=low * Removing service, lib only * Switching from dbus-glib to GDBus * Autogen + * debian/control: Removing the indicator-application bin package. - -- Ted Gould Wed, 08 Dec 2010 15:34:18 -0600 + -- Ted Gould Wed, 08 Dec 2010 15:35:32 -0600 indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 44e5ea1..f0eec91 100644 --- a/debian/control +++ b/debian/control @@ -47,13 +47,6 @@ Description: Python bindings for libappindicator This package provides Python bindings so that you can use libappindicator from a Python program. -Package: indicator-application -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Application Indicators - A library and indicator to take menus from applications and place them in - the panel. - Package: libappindicator1 Section: libs Architecture: any diff --git a/debian/indicator-application.install b/debian/indicator-application.install deleted file mode 100644 index c525a81..0000000 --- a/debian/indicator-application.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/lib/indicators/* -debian/tmp/usr/lib/indicator-application/indicator-application-service -debian/tmp/usr/share/dbus-1/services/indicator-application.service -debian/tmp/usr/share/indicator-application/ordering-override.keyfile -- cgit v1.2.3 From a4e9c0e19e59827b49ed592a304f161ba608f154 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 15:58:26 -0600 Subject: Adding the dbus test as an expected failure as it's pretty fragile right now. Needs to be refactored when we switch to GDBus --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5040b77..5e176b5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -168,6 +168,7 @@ test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator @chmod +x test-libappindicator-dbus TESTS += test-libappindicator-dbus +XFAIL_TESTS = test-libappindicator-dbus test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am @echo "#!/bin/bash" > test-libappindicator-status -- cgit v1.2.3 From 6698a1a3c73d1a4131d40eafbbbc38b6e946dbda Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 15:58:39 -0600 Subject: 0.2.91 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3d906fe..1623531 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libappindicator, 0.2.90, ted@canonical.com) +AC_INIT(libappindicator, 0.2.91, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libappindicator, 0.2.90) +AM_INIT_AUTOMAKE(libappindicator, 0.2.91) AM_MAINTAINER_MODE -- cgit v1.2.3 From 86419fbda78c03528f96fcb17602276b2d2cfc3f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 16:01:51 -0600 Subject: Converting over to libappindicator with a dummy commit for merge upstream --- debian/changelog | 602 +------------------------------------------------------ debian/control | 2 +- 2 files changed, 4 insertions(+), 600 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0bc774a..c651525 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,601 +1,5 @@ -indicator-application (0.2.90-0ubuntu4~ppa1) UNRELEASED; urgency=low +libappindicator (0.2.90-0ubuntu1) natty; urgency=low - * Upstream Merge - * Removing service, lib only - * Switching from dbus-glib to GDBus - * Autogen - * debian/control: Removing the indicator-application bin package. + * Dummy commit - -- Ted Gould Wed, 08 Dec 2010 15:35:32 -0600 - -indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low - - * debian/control - - build depend on dbusmenu >= 0.3.90 - - -- Ken VanDine Wed, 08 Dec 2010 13:32:07 -0500 - -indicator-application (0.2.90-0ubuntu2) natty; urgency=low - - * debian/rules - - Convert to dh_python2 - * debian/control - - Dropped build depends for python-central - - -- Ken VanDine Wed, 08 Dec 2010 12:03:47 -0500 - -indicator-application (0.2.90-0ubuntu1) natty; urgency=low - - [ Ted Gould ] - * New upstream release. - * A race fix on the dbus name (LP: #526499) - * Fixing the Watcher Interface - * Fixes to build with GTK 2/3 - * Fixes to build with valac-0.12 - - [ Ken VanDine ] - * debian/control - - Changed the valac build depends to valac-0.12 - * debian/python-appindicator.install - - Make sure python2.6 and python2.7 files get included - * debian/rules - - Fix builds for multiple python versions - - -- Ken VanDine Wed, 08 Dec 2010 00:42:58 -0500 - -indicator-application (0.2.9-0ubuntu1) maverick; urgency=low - - [ Ted Gould ] - * New upstream release. - * Fix Mono binding versioning and build (LP: #636132) - * Fix submenus with Glade applications (LP: #608219) - * Add new functions to Mono and Python bindings - * debian/libappindicator0.1-cil.installcligac: Add the 0.1 - policy file. - - [ Didier Roche ] - * debian/control: - - build with latest libindicator-dev for ABI breakage (LP: #637692) - - -- Didier Roche Wed, 22 Sep 2010 20:01:04 +0200 - -indicator-application (0.2.8-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Update the icon if the item is visible (LP: #639643) - - -- Ted Gould Wed, 15 Sep 2010 15:05:15 -0500 - -indicator-application (0.2.7-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Handle double registration of indicators (LP: #621838) - - -- Ted Gould Thu, 09 Sep 2010 13:00:37 -0500 - -indicator-application (0.2.6-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Fixing the position of new indicators (LP: #623205) - * Position the ibus and keyboard layout indicators correctly. - - -- Ted Gould Thu, 26 Aug 2010 14:56:27 -0500 - -indicator-application (0.2.5-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Making it so the approver actually approves indicators - * Fixing a small memory leak - * Allowing approvers to change thier mind - - -- Ted Gould Thu, 19 Aug 2010 14:00:03 -0500 - -indicator-application (0.2.4-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Add in ordering IDs - * Adding label support into the library - * Adding label support into the indicator - * Breaking the ABI in order to get more space in the class - structure. - * Allow the icon theme path to be changed dynamically (LP: #607831) - * debian/control: Moving libappindicator0 to libappindicator1 - * debian/rules: Moving libappindicator0 to libappindicator1 - - -- Ted Gould Thu, 12 Aug 2010 13:57:17 -0500 - -indicator-application (0.2.3-0ubuntu2) maverick; urgency=low - - * Rebuild with the new gobject introspection - - -- Sebastien Bacher Wed, 11 Aug 2010 11:07:51 +0200 - -indicator-application (0.2.3-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Fixing test for slower machines - * Adding an Approver API to remove things from the AppIndicators. - - -- Ted Gould Thu, 15 Jul 2010 10:22:33 -0500 - -indicator-application (0.2.2-0ubuntu1) maverick; urgency=low - - * debian/control, debian/rules: - - use dh_girepository and gir:Depends to get the gir depends, - clean the build-depends on gir-repository-dev not required - - [ Ted Gould ] - * New upstream release. - ∘ Work with updated container signal names (lp: #558841) - - -- Sebastien Bacher Thu, 08 Jul 2010 18:12:00 +0200 - -indicator-application (0.2.1-0ubuntu1) maverick; urgency=low - - [ Ted Gould ] - * New upstream release. - * Fix icon updating (LP: #594199) - * Change Mono bindings to only parse particular files (LP: #592706) - * Make a policy for migrating the mono bindings - * Test fixes to make them more reliable - * debian/control: Fixing version numbers - * debian/control: Making the 0.1-cil replace and provide the 0.0-cil - * debian/libappindicator0.1-cil.installcligac: Add the policy.dll - file to the install. - - [Ken VanDine] - * renamed cil binary to libappindicator0.1 to match the assembly - version (LP: #592706) - - -- Didier Roche Tue, 22 Jun 2010 09:31:43 +0200 - -indicator-application (0.2.0-0ubuntu2) maverick; urgency=low - - * Renamed the gir binary to gir1.0-appindicator-0.1 to match the typelib - - -- Sebastien Bacher Tue, 08 Jun 2010 11:01:04 +0200 - -indicator-application (0.2.0-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Unref the child that was created - * Build GIR and VAPI files (LP: #510610) - * Fixes to documentation and enum construction - * Fix distcheck - * Merging patch to add assembly information to Mono - binding (LP: #547195) - * debian/control: Add GObject Introspection and Vala build - dependencies. - * Added debian/gir1.0-libappindicator-0.1.install and modified - debian/control and debian/libappindicator-dev.install to handle - the VAPI and GI files. - * debian/libappindicator0.0-cil.install: Fixing directory of cli files - - -- Ted Gould Thu, 03 Jun 2010 14:49:48 -0500 - -indicator-application (0.0.19-0ubuntu5) lucid-proposed; urgency=low - - * debian/patches/child-leakage.patch - - Fixes a memory leak (LP: #569273) - - -- Ken VanDine Thu, 20 May 2010 07:35:33 -0400 - -indicator-application (0.0.19-0ubuntu4) lucid; urgency=low - - * bindings/mono/appindicator-sharp-0.1.pc.in: - + Fix pcfile to point to library install location (LP: #564506) - * debian/control, - debian/libappindicator0-cil.install, - debian/libappindicator0-cil.installcligac, - debian/libappindicator-cil-dev.install, - debian/libappindicator0.0-cil.install, - debian/libappindicator0.0-cil.installcligac, - debian/libappindicator0.1-cil-dev.install: - + Rename packages to comply with Debian CLI policy - * debian/libappindicator0.0-cil.install, - debian/libappindicator0.0-cil.installcligac: - + Fix library install location to comply with Debian CLI policy - * debian/control, - debian/rules: - + Pass CSC variable to use mono-csc default compiler from mono-devel - 2.4.3, rather than the default 2.0-only compiler - * debian/rules: - + Fix processing of rules to track dependency information on Mono - binding, by running rules in correct order - - -- Jo Shields Fri, 16 Apr 2010 10:42:48 +0100 - -indicator-application (0.0.19-0ubuntu3) lucid; urgency=low - - * Merging patch to add assembly information to Mono binding (LP: #547195) - - -- Ted Gould Wed, 14 Apr 2010 11:48:49 -0500 - -indicator-application (0.0.19-0ubuntu2) lucid; urgency=low - - * debian/control: - + Set libappindicator0-cil and libappindicator-cil-dev to Arch: all - + Make libappindicator0-cil depend on libappindicator0 >= ${source:Version} - instead - * debian/rules: - + Fix ordering of dh_*cli* (LP: #560095) - * debian/libappindicator0-cil.install, - debian/libappindicator0-cil.installcligac: - + Fix CLI policy breakage: - - Wrong installation paths for GAC'd CLI libraries - - Direct installation of GAC'd libraries - - -- Chow Loong Jin Wed, 14 Apr 2010 18:44:22 +0800 - -indicator-application (0.0.19-0ubuntu1) lucid; urgency=low - - * New upstream release. - * Setup the icons to use the -panel variants even when falling - back to status icons. (LP: #547072) - * Change python bindings to use _with_path so that they can set - the icon path. (LP: #527061) - * Don't set the fallback timer if we're already in a fallback - mode to avoid unfalling back excessively. (LP: #529052) - * Fix distcheck of documentation - - -- Ted Gould Thu, 01 Apr 2010 15:56:02 -0500 - -indicator-application (0.0.18-0ubuntu1) lucid; urgency=low - - * Upstream Release 0.0.18 - * Change when there are updates to Check and Radio buttons via - their actions. (LP: #542221) - * Fixing icon updating with themes and naming fallbacks with - the status icon fallback. (LP: #532858) - - -- Ted Gould Thu, 25 Mar 2010 12:14:23 -0500 - -indicator-application (0.0.17-0ubuntu1) lucid; urgency=low - - * Upstream Release 0.0.17 - * Support GTK's show menu items property (LP: #528527) - * Fix status and category nicks in Python bindings (LP: #539858) - * Switch domains to org.kde instead of org.freedesktop as spec - was never officially approved by that body. - - -- Ted Gould Thu, 18 Mar 2010 13:11:00 -0500 - -indicator-application (0.0.16-0ubuntu2) lucid; urgency=low - - * Backported upstream change to respect gtk "always-show-image" (lp: #528527) - - -- Sebastien Bacher Mon, 15 Mar 2010 16:39:09 +0100 - -indicator-application (0.0.16-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.16 - * Use libindicator icon loading helper - * Workaround for label changes on GtkActions - * Testing fix for using xvfb - * debian/control: Increasing the libindicator-dev dependency to - 0.3.5 to match upstream. - - -- Ted Gould Thu, 11 Mar 2010 16:22:06 -0600 - -indicator-application (0.0.15-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.15 - * Icon size fix to 22 px - * Status icon correctly removed in fallback - * Fixed test suite to run better on slow machines. - - -- Ted Gould Thu, 04 Mar 2010 11:42:40 -0600 - -indicator-application (0.0.14-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.14 - ∘ Fix mono bindings to include proper metadata (LP: #526620) - ∘ Send connection changed signal when the proxy is created - and destroyed (LP: #527082) - ∘ Hide the fallback status icon before unrefing it. (LP: #526041) - ∘ Increase dbus-glib version check to 0.82 - ∘ Handle menu layout changes and visibility changes better. - ∘ Improve testing stability - ∘ Read menu sensitivity on startup. - ∘ Handle null strings when evaluating whether we have an - attention icon. - ∘ Remove dbus objects when we fallback - ∘ Disconnect client_menu_changed signal handlers on cleanup. - ∘ Handle cases where the menu gets unset on updates. - ∘ Fix custom labels on stock items. - ∘ Adds support for submenus - - -- Ted Gould Thu, 25 Feb 2010 15:22:28 -0600 - -indicator-application (0.0.13-0ubuntu8) lucid; urgency=low - - * Upstream Merge - * Checking for dbus-glib version 0.82 - * debian/control: Checking for dbus-glib >= 0.82 - - -- Ted Gould Tue, 23 Feb 2010 10:30:27 -0600 - -indicator-application (0.0.13-0ubuntu7) lucid; urgency=low - - * Backported upstream change to fix menu item sensitivity update, - thanks to Jan Arne Petersen (lp: #522151) - - -- Sebastien Bacher Mon, 22 Feb 2010 17:49:23 +0100 - -indicator-application (0.0.13-0ubuntu6) lucid; urgency=low - - * Cherrypick fix to check for a null string as the attention icon - * Cherrypick fix to remove the registration of dbus objects (LP: #497870) - - lets us drop debian/patches/unregister.patch - - -- Ken VanDine Fri, 19 Feb 2010 18:52:40 +0100 - -indicator-application (0.0.13-0ubuntu5) lucid; urgency=low - - * debian/patches/unregister.patch - - Fix to remove the registration of dbus objects (LP: #497870) - - -- Ken VanDine Fri, 19 Feb 2010 17:55:11 +0100 - -indicator-application (0.0.13-0ubuntu4) lucid; urgency=low - - * Backport Cody Russell's change to fix rhythmbox crashing on closing - (lp: #522942) - - -- Sebastien Bacher Wed, 17 Feb 2010 23:13:10 +0100 - -indicator-application (0.0.13-0ubuntu3) lucid; urgency=low - - * Backport trunk change to fix stock items labels (lp: #520048) - * Backport trunk change to fix menus update issues (lp: #521181) - * debian/control: updated standards-version - - -- Sebastien Bacher Tue, 16 Feb 2010 16:22:31 +0100 - -indicator-application (0.0.13-0ubuntu2) lucid; urgency=low - - * Backported lp:~bratsche/indicator-application/submenus to make the submenus - working in the application indicators (lp: #519625) - - -- Sebastien Bacher Fri, 12 Feb 2010 17:12:58 +0100 - -indicator-application (0.0.13-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.13 - * Changing the menu property to be a proper DBus object path - * Make object paths unique by including application IDs in them - - -- Ted Gould Thu, 11 Feb 2010 10:41:53 -0600 - -indicator-application (0.0.12-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.12 - * Handling the service restarting better by removing the icons - after a small delay to ensure they don't return. - * Fixing a crash where a proxy was created while the previous - one was being destroyed. - * Fixing copying of the attention icon - * Adding status changing to the example application - * Adding a test for status changing getting sent over DBus. - - -- Ted Gould Mon, 08 Feb 2010 10:01:42 -0600 - -indicator-application (0.0.11-0ubuntu1) lucid; urgency=low - - * debian/control: - - updated libunit-cil build-depends - - [ Ted Gould ] - * Upstream release 0.0.11 - * Interoperability Fixes - * Adding in XVFB support for tests - * Adding support for icons with the '-panel' suffix - * debian/control: Increasing dbusmenu* deps to 0.2.2 - - -- Sebastien Bacher Thu, 04 Feb 2010 17:35:19 -0800 - -indicator-application (0.0.10-0ubuntu2) lucid; urgency=low - - * debian/control - - bumped build depends version for libindicator-dev to 0.3.1 - - -- Ken VanDine Thu, 21 Jan 2010 16:38:18 -0500 - -indicator-application (0.0.10-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.10 - * Adding in a file to position the indicators - * Ref counting theme directories as they get added and removed - * Use the right callback function for fallback (LP: #507975) - * Support getting the app list from a running service. - * debian/control: Adding dependency for json-glib to build. - - -- Ted Gould Thu, 21 Jan 2010 14:21:00 -0600 - -indicator-application (0.0.9-0ubuntu3) lucid; urgency=low - - * debian/control: - - updated the build-depends for the gtk binding changes. - - -- Sebastien Bacher Tue, 19 Jan 2010 22:57:02 +0100 - -indicator-application (0.0.9-0ubuntu2) lucid; urgency=low - - * Backport an upstream change to a fallback situation crasher - (lp: #507975) - - -- Sebastien Bacher Tue, 19 Jan 2010 20:52:41 +0100 - -indicator-application (0.0.9-0ubuntu1) lucid; urgency=low - - * Upstream Release 0.0.9 - * Add fallback support for situations where the NotificationWatcher - isn't available. - - -- Ted Gould Thu, 14 Jan 2010 10:39:43 -0600 - -indicator-application (0.0.8-0ubuntu1) lucid; urgency=low - - * Upstream Release 0.0.8 - - Mono bindings fixes (LP: #505923) - - -- Ken VanDine Tue, 12 Jan 2010 01:35:44 -0500 - -indicator-application (0.0.7-0ubuntu1) lucid; urgency=low - - * Upstream Release 0.0.7 - * Making the Notification Watcher register for it's own DBus - name to keep the service one unique. - * Adding support for icons changing through the service and - in the indicator. - * Fixing the generated headers for DBus Properties calls - * Fixing libappindicator set_icon to set the right icon. - * Adding in icon path support. - * Switching DBus interface to org.freedesktop - * Adding check/radio support to menu parsing - * Adding ChangeLog to dist - * Adding check item support to menu parsing - - [Ken VanDine] - * debian/control - - bump build depends version of libdbusmenu to 0.2.0 - - -- Ted Gould Fri, 08 Jan 2010 16:05:39 -0600 - -indicator-application (0.0.6-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.6 - * Include Python binding - * Include Mono binding - * Minor bug fixes - * Fixing when menus are set twice. (LP: #497812) - * Keeping a constant signature for the library instead of - building it each time. - * debian/control, debian/python-appindicator.install: Building - a binary package for the python bindings. - * debian/control: Adding python building build deps - * debian/control, debian/libappindicator0-cil.install: Building - a binary package for the Mono bindings. - * debian/control: Adding Mono building build deps - - [Ken VanDine] - * Added mono bindings - - debian/libappindicator0-cil.install - - debian/libappindicator0-cil-dev.install - - debian/control - * debian/rules - - don't use gnome.mk, specify all the targets to build python - bindings for each supported python version - - -- Ted Gould Thu, 17 Dec 2009 14:45:50 -0600 - -indicator-application (0.0.4-0ubuntu2) lucid; urgency=low - - * debian/control - - make libappindicator0 recommend indicator-application - - -- Ken VanDine Tue, 15 Dec 2009 10:40:07 -0500 - -indicator-application (0.0.4-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.4 - * debian/rules: - - removed the disable-scrollkeeper configure arg - - don't include .la and .a files - * debian/patches/clean_up_docs.patch - - removed, merged upstream - * debian/control: - - removed Build-Depend for scrollkeeper - - libappindicator-dev needs to depend on libdbusmenu-glib-dev - - bump standards version to 3.8.3 - - libappindicator-doc doesn't need to depend on libappindicator0 - - -- Ken VanDine Fri, 11 Dec 2009 09:18:58 -0500 - -indicator-application (0.0.3-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.3 - * Adding in documentation - * Adding a pkg-config .pc file for libappindicator - * More GtkMenu support in libappindicator - * debian/libappindicator-dev.install: Adding pkgconfig files. - * debian/control: Adding a build dep on gtk-doc-tools - * debian/control: Increasing libdbusmenu requirements to 0.1.8 - - [Ken VanDine] - * debian/control - - set Vcs-Bzr to ~ubuntu-desktop - - set libappindicator-doc arch all - - make libappindicator-dev depend on libappindicator0 - * debian/libappindicator-doc.install - - install the developer docs - * debian/rules - - enable-gtk-doc - - added simple-patchsys.mk - * debian/patches/clean_up_docs.patch - - Remove template values and set a proper title - * debian/copyright - - Include the proper licenses (LGPL-2.1 and LGPL-3) - - -- Ted Gould Thu, 10 Dec 2009 13:34:40 -0600 - -indicator-application (0.0.2-0ubuntu1~ppa1) karmic; urgency=low - - * Upstream release 0.0.2 - * Updates API to use GTK instead of dbusmenu to make it - easier for upstream developers to use. - - -- Ted Gould Fri, 04 Dec 2009 14:50:45 -0600 - -indicator-application (0.0.2-0~ppa3) karmic; urgency=low - - * debian/watch: - - Updated url to point to the LP project - * debian/control - - Updated Vcs-Bzr, project urls and description - - -- Ken VanDine Thu, 10 Dec 2009 09:00:06 -0500 - -indicator-application (0.0.1-0ubuntu3~ppa4) karmic; urgency=low - - * Adding in copyright headers and licenses - - -- Ted Gould Wed, 02 Dec 2009 12:17:00 -0600 - -indicator-application (0.0.1-0ubuntu3~ppa3) karmic; urgency=low - - * Massive name change. - * debian/* changing packaging to not be "custom" anymore and now - everything is "application" - - -- Ted Gould Wed, 02 Dec 2009 12:06:25 -0600 - -indicator-application (0.0.1-0ubuntu3~ppa2) karmic; urgency=low - - * Implementing the service and having the indicator and app - library start using it. - - -- Ted Gould Wed, 02 Dec 2009 11:58:08 -0600 - -indicator-application (0.0.1-0ubuntu3~ppa1) karmic; urgency=low - - * Flesh out the library to have stuff working. - * Updating test suite to run under dbus-test-runner. - - -- Ted Gould Tue, 01 Dec 2009 09:17:24 -0600 - -indicator-application (0.0.1-0ubuntu2) karmic; urgency=low - - * debian/control: Splitting out libappindicator - * Adding debian/libappindicator0.install, - debian/libappindicator-dev.install, - debian/indicator-application.install - to make all the different packages. - - -- Ted Gould Mon, 02 Nov 2009 21:41:20 -0600 - -indicator-application (0.0.1-0ubuntu1) karmic; urgency=low - - * Development packaging edition. - - -- Robert Collins Thu, 29 Oct 2009 15:44:14 +1100 + -- Ted Gould Wed, 08 Dec 2010 16:00:59 -0600 diff --git a/debian/control b/debian/control index f0eec91..c48cbc1 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: indicator-application +Source: libappindicator Section: gnome Priority: optional XS-Python-Version: all -- cgit v1.2.3 From 3fc08a0eb8b8d0f61d578a76797dead17d9227e2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 8 Dec 2010 17:24:01 -0500 Subject: fixed some targets for multipass builds --- debian/rules | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index cfb2f4b..324b6ff 100755 --- a/debian/rules +++ b/debian/rules @@ -63,28 +63,24 @@ configure-stamp: $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) touch $@ -configure/indicator-application:: configure-stamp +configure/libappindicator:: configure-stamp build-stamp: $(MAKE) -C $(DEB_BUILDDIR) touch $@ -build/indicator-application:: build-stamp +build/libappindicator:: build-stamp install-stamp: $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp touch $@ -install/indicator-application:: install-stamp +install/libappindicator:: install-stamp binary-predeb/libappindicator1:: install-stamp dh_fixperms dh_strip -binary-post-install/indicator-application:: - find debian/indicator-application/usr/lib -name \*.la -exec rm {} \; - find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; - common-binary-predeb-arch:: list-missing dh_fixperms dh_strip -- cgit v1.2.3 From d4236cd10ace941a85060e2f4be9902becde40b2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 8 Dec 2010 17:51:34 -0500 Subject: move python-appindicator to the end --- debian/control | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/control b/debian/control index c48cbc1..f87b2aa 100644 --- a/debian/control +++ b/debian/control @@ -33,20 +33,6 @@ Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu -Package: python-appindicator -Section: python -Architecture: any -XB-Python-Version: ${python:Versions} -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${python:Depends}, - libappindicator1 (= ${binary:Version}), - python-gobject -Provides: ${python:Provides} -Description: Python bindings for libappindicator - This package provides Python bindings so that you can use libappindicator from - a Python program. - Package: libappindicator1 Section: libs Architecture: any @@ -125,3 +111,17 @@ Description: Typelib files for libappindicator1. . This package can be used by other packages using the GIRepository format to generate dynamic bindings. + +Package: python-appindicator +Section: python +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + libappindicator1 (= ${binary:Version}), + python-gobject +Provides: ${python:Provides} +Description: Python bindings for libappindicator + This package provides Python bindings so that you can use libappindicator from + a Python program. -- cgit v1.2.3 From 29871df079babc88c93255f101edb19d266efd30 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 10 Dec 2010 16:38:00 -0500 Subject: * debian/rules - Changes to build targets to get it building multipass for python 2.6 and 2.7 --- debian/changelog | 10 ++++++++-- debian/control | 32 ++++++++++++++++---------------- debian/rules | 6 +++--- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa2f1a3..8e2a2e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ -libappindicator (0.2.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +libappindicator (0.2.90+r175-0ubuntu1) UNRELEASED; urgency=low + [ Ted Gould ] * Intial release. - -- Ted Gould Wed, 08 Dec 2010 16:28:55 -0600 + [ Ken VanDine ] + * debian/rules + - Changes to build targets to get it building multipass for + python 2.6 and 2.7 + + -- Ken VanDine Fri, 10 Dec 2010 16:37:17 -0500 diff --git a/debian/control b/debian/control index f87b2aa..bea497c 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 5.0), libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.14), - libdbusmenu-gtk-dev (>= 0.3.90), - libdbusmenu-glib-dev (>= 0.3.90), + libdbusmenu-gtk-dev (>= 0.3.90+r175), + libdbusmenu-glib-dev (>= 0.3.90+r175), cli-common-dev (>= 0.5.7), mono-devel (>= 2.4.3), gtk-sharp2-gapi, @@ -33,6 +33,20 @@ Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu +Package: python-appindicator +Section: python +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + libappindicator1 (= ${binary:Version}), + python-gobject +Provides: ${python:Provides} +Description: Python bindings for libappindicator + This package provides Python bindings so that you can use libappindicator from + a Python program. + Package: libappindicator1 Section: libs Architecture: any @@ -111,17 +125,3 @@ Description: Typelib files for libappindicator1. . This package can be used by other packages using the GIRepository format to generate dynamic bindings. - -Package: python-appindicator -Section: python -Architecture: any -XB-Python-Version: ${python:Versions} -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${python:Depends}, - libappindicator1 (= ${binary:Version}), - python-gobject -Provides: ${python:Provides} -Description: Python bindings for libappindicator - This package provides Python bindings so that you can use libappindicator from - a Python program. diff --git a/debian/rules b/debian/rules index 324b6ff..4c624b6 100755 --- a/debian/rules +++ b/debian/rules @@ -63,19 +63,19 @@ configure-stamp: $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) touch $@ -configure/libappindicator:: configure-stamp +configure/libappindicator1:: configure-stamp build-stamp: $(MAKE) -C $(DEB_BUILDDIR) touch $@ -build/libappindicator:: build-stamp +build/libappindicator1:: build-stamp install-stamp: $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp touch $@ -install/libappindicator:: install-stamp +install/libappindicator1:: install-stamp binary-predeb/libappindicator1:: install-stamp dh_fixperms -- cgit v1.2.3 From 2437d4ba20b168534165456ed0ed989a9f5f2695 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 10 Dec 2010 18:04:32 -0500 Subject: releasing version 0.2.90+r175-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8e2a2e5..c650fe0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libappindicator (0.2.90+r175-0ubuntu1) UNRELEASED; urgency=low +libappindicator (0.2.90+r175-0ubuntu1) natty; urgency=low [ Ted Gould ] * Intial release. -- cgit v1.2.3