diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | libindicate/listener.c | 2 | ||||
| -rw-r--r-- | libindicate/server.c | 12 |
5 files changed, 13 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 3f8b19e..b86656d 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,8 @@ AC_CONFIG_MACRO_DIR([m4]) # Libindicate versioning ########################### -LIBINDICATE_CURRENT=0 -LIBINDICATE_REVISION=1 +LIBINDICATE_CURRENT=1 +LIBINDICATE_REVISION=0 LIBINDICATE_AGE=0 AC_SUBST(LIBINDICATE_CURRENT) diff --git a/debian/changelog b/debian/changelog index 598e711..685e9a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ indicator-applet (0.1.4-0ubuntu2~ppa2) UNRELEASED; urgency=low * Merging in dev stuff. This'll break things. * Header fixes * Fixes for dev stuff. + * debian/control: Switching libindicate0 to libindicate1 to express + the fact that the binary compatibility is broken. -- Ted Gould <ted@ubuntu.com> Fri, 03 Apr 2009 15:09:33 -0500 diff --git a/debian/control b/debian/control index 7fb1784..d269a2d 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Description: GNOME panel indicator applet Currently this includes support for messaging applications in the indicator-messages package. -Package: libindicate0 +Package: libindicate1 Section: libs Conflicts: libindicate Replaces: libindicate @@ -46,7 +46,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicate0 (= ${binary:Version}), + libindicate1 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) Description: GNOME panel indicator applet - shared library diff --git a/libindicate/listener.c b/libindicate/listener.c index e4fe68f..381a5f9 100644 --- a/libindicate/listener.c +++ b/libindicate/listener.c @@ -992,7 +992,7 @@ static void interest_cb (DBusGProxy *proxy, GError *error, gpointer userdata) { if (error != NULL) { - g_warning("Unable to configure interest on server %s because: %s", ((IndicateListenerServer *)userdata)->name, error->message); + g_warning("Unable to configure interest."); } return; diff --git a/libindicate/server.c b/libindicate/server.c index 520d47c..ed81d54 100644 --- a/libindicate/server.c +++ b/libindicate/server.c @@ -435,13 +435,13 @@ indicate_server_hide (IndicateServer * server) static void dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, IndicateServer * server) { - g_debug("DBus Owner change (%s, %s, %s)", name, prev, new); + /* g_debug("DBus Owner change (%s, %s, %s)", name, prev, new); */ if (prev == NULL || prev[0] == '\0') { /* We only care about people leaving the bus */ return; } - g_debug("\tBeing removed, interesting"); + /* g_debug("\tBeing removed, interesting"); */ IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server); IndicateServerInterestedFolk searchitem; @@ -449,7 +449,7 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c GList * entry = g_list_find_custom(priv->interestedfolks, &searchitem, indicate_server_interested_folks_equal); if (entry == NULL) { - g_debug("\tWe don't have it, not interesting"); + /* g_debug("\tWe don't have it, not interesting"); */ return; } @@ -464,16 +464,16 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c GList * listi = NULL; for (listi = priv->interestedfolks ; listi != NULL ; listi = listi->next) { IndicateServerInterestedFolk * folkpointer = (IndicateServerInterestedFolk *)listi->data; - g_debug("\tRebuild list from folk: %s", folkpointer->sender); + /* g_debug("\tRebuild list from folk: %s", folkpointer->sender); */ indicate_server_interested_folks_copy(folkpointer, priv->interests); } for (i = INDICATE_INTEREST_NONE; i < INDICATE_INTEREST_LAST; i++) { - g_debug("\tComparing interests. Interest: %d Folk: %d Everyone: %d", i, folk->interests[i], priv->interests[i]); + /* g_debug("\tComparing interests. Interest: %d Folk: %d Everyone: %d", i, folk->interests[i], priv->interests[i]); */ if (folk->interests[i] && !priv->interests[i]) { /* We can only remove interest here. Think about it for a moment and I think you'll be cool with it. */ - g_debug("\tOh, and it was interested in %d. Not anymore.", i); + /* g_debug("\tOh, and it was interested in %d. Not anymore.", i); */ g_signal_emit(G_OBJECT(server), signals[INTEREST_REMOVED], 0, i, TRUE); } } |