diff options
45 files changed, 3558 insertions, 725 deletions
@@ -1 +1,12 @@ -Ted Gould <ted@canonical.com> +# Generated by Makefile. Do not edit. + + Andrea Cimitan + cody + David Barth + James Westby + Kees Cook + Ken VanDine + Luke Yelavich + Michael Terry + Sebstien Bacher + Ted Gould @@ -0,0 +1,2367 @@ +# Generated by Makefile. Do not edit. + +2011-02-17 Ted Gould <ted@gould.cx> + + 0.3.92 + +2011-02-17 Ted Gould <ted@gould.cx> + + Support for accessiable descriptions of the indicator + +2011-02-17 Ted Gould <ted@gould.cx> + + Removing an unneeded strdup + +2011-02-17 Ted Gould <ted@gould.cx> + + Updating libindicator required version + +2011-02-17 Ted Gould <ted@gould.cx> + + Updating the description when we signal that it's changed + +2011-02-17 Luke Yelavich <luke.yelavich@canonical.com> + + Store entry data in a variable so it can be freed after signaling an + accessible description change, preventing a memory leak. + +2011-02-17 Luke Yelavich <luke.yelavich@canonical.com> + + No need to use g_strdup, the variable is a const + +2011-02-14 Luke Yelavich <luke.yelavich@canonical.com> + + Add accessible description support + +2011-01-27 Ted Gould <ted@gould.cx> + + 0.3.91 + +2011-01-27 Ted Gould <ted@gould.cx> + + Upgrading to new type handler prototype + +2011-01-26 Ted Gould <ted@gould.cx> + + Grabbing Ken's branch too! + +2011-01-14 Ken VanDine <ken.vandine@canonical.com> + + rename the service to match the indicator + +2011-01-18 Ted Gould <ted@gould.cx> + + Adding a log domain and fixing service file. + +2011-01-17 Ted Gould <ted@gould.cx> + + Ignoring the generated XML + +2011-01-17 Ted Gould <ted@gould.cx> + + Adding in log domains + +2011-01-17 Ted Gould <ted@gould.cx> + + Fixing service file + +2011-01-14 Ted Gould <ted@gould.cx> + + 0.3.90 + +2011-01-14 Ted Gould <ted@gould.cx> + + ayatana.org to canonical.com + +2011-01-14 Ted Gould <ted@gould.cx> + + ayatana.org to canonical.com + +2011-01-14 Ted Gould <ted@gould.cx> + + Switching dbusmenu and indicator messages + +2011-01-14 Ted Gould <ted@gould.cx> + + Prototype changes + +2011-01-14 Ted Gould <ted@gould.cx> + + Emitting signals for the connections + +2011-01-14 Ted Gould <ted@gould.cx> + + Saving the connection + +2011-01-14 Ted Gould <ted@gould.cx> + + Swiching to our method function.. woot! + +2011-01-14 Ted Gould <ted@gould.cx> + + Setting up the vtable and making it connect in + +2011-01-14 Ted Gould <ted@gould.cx> + + Get the connection in the cool new style + +2011-01-14 Ted Gould <ted@gould.cx> + + Switching how we get our interface info + +2011-01-14 Ted Gould <ted@gould.cx> + + Switch to new dbusmenu signal prototype + +2011-01-14 Ted Gould <ted@gould.cx> + + Type to session + +2011-01-14 Ted Gould <ted@gould.cx> + + Switching the function callbacks + +2011-01-14 Ted Gould <ted@gould.cx> + + Changing the signal callbacks + +2011-01-14 Ted Gould <ted@gould.cx> + + Changing the creation of the proxy + +2011-01-14 Ted Gould <ted@gould.cx> + + Changing to get the interface from the included XML file + +2011-01-14 Ted Gould <ted@gould.cx> + + Switching over from using dbus-binding-tool to sed + +2011-01-14 Ted Gould <ted@gould.cx> + + Switching the pkgconfig files that are used. + +2010-10-08 Ted Gould <ted@gould.cx> + + Fix deprecations and ensure they're part of distcheck + +2010-10-06 Michael Terry <mike@mterry.name> + + avoid deprecated API + +2010-09-21 Ted Gould <ted@gould.cx> + + Building ChangeLog and AUTHORS from makefile + +2010-09-09 Ted Gould <ted@gould.cx> + + 0.3.11 + +2010-09-03 Ted Gould <ted@gould.cx> + + Pass the dbusmenu menuitem to the expose callback. + +2010-09-03 Ted Gould <ted@gould.cx> + + Making sure to put the dbusmenu item in the callback + +2010-08-26 Ted Gould <ted@gould.cx> + + 0.3.10 + +2010-08-26 Ted Gould <ted@gould.cx> + + Shifting the locations of the triangles and the icons. + +2010-08-26 David Barth <david.barth@canonical.com> + + adjusted position of the left icons and triangle overlay + +2010-08-24 Ted Gould <ted@gould.cx> + + Removing some extra code that's not needed and ensuring the icon is always shown. + +2010-08-24 Ted Gould <ted@gould.cx> + + Only show the avatar if it is sent + +2010-08-24 Ted Gould <ted@gould.cx> + + Removing the blank menu items + +2010-08-24 Ted Gould <ted@gould.cx> + + Set the image menu icon + +2010-08-12 Ted Gould <ted@gould.cx> + + 0.3.9 + +2010-08-12 Ted Gould <ted@gould.cx> + + Removing the parenthesis + +2010-07-29 David Barth <david.barth@canonical.com> + + 0.3.8 + +2010-07-29 David Barth <david.barth@canonical.com> + + running apps triangle indicator overlay from Cimi + +2010-07-29 Andrea Cimitan <andrea.cimitan@gmail.com> + + merged dbarth's branch + +2010-07-29 David Barth <david.barth@canonical.com> + + better aspect ratio for the triangle + +2010-07-29 David Barth <david.barth@canonical.com> + + adjust the triangle size + +2010-07-29 David Barth <david.barth@canonical.com> + + remove the old running app. icon + +2010-07-29 David Barth <david.barth@canonical.com> + + fix typos to build and clean up comments + +2010-07-29 Andrea Cimitan <andrea.cimitan@gmail.com> + + remove the previous icon + +2010-07-29 Andrea Cimitan <andrea.cimitan@gmail.com> + + trailing whitespace + +2010-07-29 Andrea Cimitan <andrea.cimitan@gmail.com> + + Draw a triangle on the left + +2010-07-29 David Barth <david.barth@canonical.com> + + message counters are now rendered with a nice rounded background + +2010-07-29 Andrea Cimitan <andrea.cimitan@gmail.com> + + check if widget is really a widget before getting its style (from dbarth) + +2010-07-29 Andrea Cimitan <andrea.cimitan@gmail.com> + + Ops, readded the label :P + +2010-07-29 Andrea Cimitan <andrea.cimitan@gmail.com> + + Added rounded rectangles on the right + +2010-07-22 Andrea Cimitan <andrea.cimitan@gmail.com> + + Fixed position of sub menu indicators (the one with the counter on the right) + +2010-07-22 Andrea Cimitan <cimi@gemini> + + Added triangles on the left and new label design on the right. + We still need to align not-active services but I don't have any clue on how to do this + +2010-05-21 Ted Gould <ted@gould.cx> + + Dummy commit + +2010-05-21 Ted Gould <ted@gould.cx> + + 0.3.7 + +2010-04-28 Ted Gould <ted@gould.cx> + + Patch from Kees to ensure the hashtable keeps its memory + +2010-04-28 Kees Cook <kees@outflux.net> + + Allocate memory for hash table items (LP: #533021) + +2010-04-17 Ted Gould <ted@gould.cx> + + Check for whether a desktop file is eclipsed when loaded. + +2010-04-16 Ted Gould <ted@gould.cx> + + When adding a desktop file look through teh applications we have to check for eclipsing + +2010-04-17 Ted Gould <ted@gould.cx> + + Ensure that we cleanup proxy items as shortcuts. + +2010-04-16 Ted Gould <ted@gould.cx> + + Forgot to pass the object here. + +2010-04-16 Ted Gould <ted@gould.cx> + + Handling the remove and add in separate functions. + +2010-04-16 Ted Gould <ted@gould.cx> + + Changing the changed signal to be added/removed so that we can make things even more fun. + +2010-04-15 Ted Gould <ted@gould.cx> + + Minor refactoring to make the logic clearer + +2010-04-15 Ted Gould <ted@gould.cx> + + Some debug messages when removing shortcuts + +2010-04-15 Ted Gould <ted@gould.cx> + + It's possible the newroot could be NULL, and that's okay. + +2010-04-15 Ted Gould <ted@gould.cx> + + Negative debugging + +2010-04-15 Ted Gould <ted@gould.cx> + + Some debugging messages + +2010-04-15 Ted Gould <ted@gould.cx> + + Deleteing shortcuts on update if they need to be + +2010-04-15 Ted Gould <ted@gould.cx> + + Killing hte launcher shortcuts on exit as well. + +2010-04-15 Ted Gould <ted@gould.cx> + + Removing the shortcuts when removing the application entry. + +2010-04-01 Ted Gould <ted@gould.cx> + + 0.3.6 + +2010-03-31 Ted Gould <ted@gould.cx> + + Fixes to the placement of notifications and their visibility. Lots of lovely cleanups. + +2010-03-31 Ted Gould <ted@gould.cx> + + We only want to increment the position if we didn't find an entry + +2010-03-31 Ted Gould <ted@gould.cx> + + Dropping a useless warning + +2010-03-31 Ted Gould <ted@gould.cx> + + Actually, more correctly, that should be a weak ref. + +2010-03-31 Ted Gould <ted@gould.cx> + + Fixing a mixed up signal name. Small memory leak. + +2010-03-30 Ted Gould <ted@gould.cx> + + Making application items default to invisible, and only become visible if they get a valid desktop file. + +2010-03-30 Ted Gould <ted@gould.cx> + + Ensuring that the visibility property is set on the application entries. + +2010-03-30 Ted Gould <ted@gould.cx> + + Make the visibility of indictor items and separators follow the visibility of the application item. + +2010-03-30 Ted Gould <ted@gould.cx> + + Build the separator after checking to see which entry to use. That way we've always got one. + +2010-03-30 Ted Gould <ted@gould.cx> + + Making the messaging menu use the service architecture. + +2010-03-30 Ted Gould <ted@gould.cx> + + Making it so that we don't build two icon_proxies ever. + +2010-03-30 Ted Gould <ted@gould.cx> + + Putting in a timeout to clear the icon if there were messages waiting when we lost the service. + +2010-03-29 Ted Gould <ted@gould.cx> + + Making the service into an indicator service. + +2010-03-29 Ted Gould <ted@gould.cx> + + Switching over to using an indicator service manager instead of setting up the proxies by hand. + +2010-03-29 Ted Gould <ted@gould.cx> + + Comments and formatting. + +2010-03-25 Ted Gould <ted@gould.cx> + + 0.3.5 + +2010-03-25 Ted Gould <ted@gould.cx> + + Tracking which applications we've seen before. + +2010-03-25 Ted Gould <ted@gould.cx> + + Fail if we have init called more than once. Merge comment. + +2010-03-24 Ted Gould <ted@gould.cx> + + Give us a minute before we write it out. + +2010-03-24 Ted Gould <ted@gould.cx> + + When we're being reshown eval the label + +2010-03-24 Ted Gould <ted@gould.cx> + + Ah, classic failure + +2010-03-24 Ted Gould <ted@gould.cx> + + Make this easier to test + +2010-03-24 Ted Gould <ted@gould.cx> + + Building us a file. + +2010-03-24 Ted Gould <ted@gould.cx> + + More comments + +2010-03-24 Ted Gould <ted@gould.cx> + + Copyright headers. + +2010-03-24 Ted Gould <ted@gould.cx> + + Some comments + +2010-03-24 Ted Gould <ted@gould.cx> + + Have a background process for writing out the seen DB + +2010-03-24 Ted Gould <ted@gould.cx> + + Code to read in the keyfile + +2010-03-24 Ted Gould <ted@gould.cx> + + Building a file name and checking if it exists. + +2010-03-24 Ted Gould <ted@gould.cx> + + Only build shortcuts if we've been seen before. + +2010-03-24 Ted Gould <ted@gould.cx> + + Checking to see if we've seen the application before choosing whether we have the name or the setup string. + +2010-03-24 Ted Gould <ted@gould.cx> + + Adding the new server to the seen database. + +2010-03-24 Ted Gould <ted@gould.cx> + + Building the seen db on init + +2010-03-24 Ted Gould <ted@gould.cx> + + Changing to be more of a singleton type of thing. Really that makes more sense. + +2010-03-24 Ted Gould <ted@gould.cx> + + Making a basic interface for the seen database. + +2010-03-25 Ted Gould <ted@gould.cx> + + Adding in support for shifting over command items + +2010-03-25 Ted Gould <ted@gould.cx> + + Increasing the dbusmenu required version to 0.2.8 + +2010-03-24 Ted Gould <ted@gould.cx> + + Making sure command items are using blanks + +2010-03-24 Ted Gould <ted@gould.cx> + + Set the blank icon on proxy objects + +2010-03-25 Ted Gould <ted@gould.cx> + + Grab changes in app icons. + +2010-03-24 Ted Gould <ted@gould.cx> + + Allow for applications icons to change incase we haven't gotten the property yet. + +2010-03-24 Ted Gould <ted@gould.cx> + + Making a small indicator on apps that are running. + +2010-03-23 Ted Gould <ted@gould.cx> + + Removing app-gtk-menu-item as it really wasn't needed. + +2010-03-23 Ted Gould <ted@gould.cx> + + Looking for the right property + +2010-03-23 Ted Gould <ted@gould.cx> + + Changing to use the new app type + +2010-03-23 Ted Gould <ted@gould.cx> + + Adds in an application menu item. + +2010-03-23 Ted Gould <ted@gould.cx> + + Replacing the count with the icon + +2010-03-23 Ted Gould <ted@gould.cx> + + updating to trunk + +2010-03-04 Ted Gould <ted@gould.cx> + + Building a new base object for our menuitem + +2010-03-18 Ted Gould <ted@gould.cx> + + 0.3.4 + +2010-03-18 Ted Gould <ted@gould.cx> + + Make the avatar spacing same as the other icons in the menu + +2010-03-17 Ted Gould <ted@gould.cx> + + Setting the minimum allocation for the image to be the menu icon size even if there isn't any pixmap. + +2010-03-17 Ted Gould <ted@gould.cx> + + Putting padding between the items to make them pretty like. + +2010-03-18 Ted Gould <ted@gould.cx> + + Use the standard libindicator icon handling + +2010-03-17 Ted Gould <ted@gould.cx> + + Switch to using the image helper and drop design team size + +2010-03-17 Ted Gould <ted@gould.cx> + + Bumping libindicator version to 0.3.5 + +2010-03-17 Ted Gould <ted@gould.cx> + + Fix to use translated string. + +2010-03-17 Ted Gould <ted@gould.cx> + + Grab translation for default name. + +2010-03-12 Ted Gould <ted@gould.cx> + + Handling bools by getting a value for indicators requesting attention. + +2010-03-12 Ted Gould <ted@gould.cx> + + Switching the attention callback to using a value so it can correctly handle booleans. + +2010-03-12 Ted Gould <ted@gould.cx> + + String changes to match everyone else. + +2010-03-12 Ted Gould <ted@gould.cx> + + Changing from microblogging to broadcast + +2010-03-04 Ted Gould <ted@gould.cx> + + 0.3.3 + +2010-03-04 Ted Gould <ted@gould.cx> + + Putting in default icons for the default apps that are panel themed + +2010-03-04 Ted Gould <ted@gould.cx> + + Using the default icon in the application indicator as well. + +2010-03-04 Ted Gould <ted@gould.cx> + + Making it so that if the app is default, it uses a generic icon. + +2010-03-04 Ted Gould <ted@gould.cx> + + Adding in an icon lookup to the default apps db + +2010-03-04 Ted Gould <ted@gould.cx> + + Adding in a base set of icons from the gnome theme. + +2010-03-04 Ted Gould <ted@gould.cx> + + Setting up default application names in the menu. + +2010-03-04 Ted Gould <ted@gould.cx> + + Checking the default name on application items + +2010-03-04 Ted Gould <ted@gould.cx> + + Checking to see if we have a default name. + +2010-03-04 Ted Gould <ted@gould.cx> + + Keeping our desktop file paths safe. + +2010-03-04 Ted Gould <ted@gould.cx> + + Copyright headers. + +2010-03-04 Ted Gould <ted@gould.cx> + + Making the default applications strings translatable. + +2010-03-04 Ted Gould <ted@gould.cx> + + Adding in the setup function. + +2010-03-04 Ted Gould <ted@gould.cx> + + Refactoring into a helper + +2010-03-04 Ted Gould <ted@gould.cx> + + Adding empathy and gwibber to the mix. + +2010-03-04 Ted Gould <ted@gould.cx> + + Actually searching through the list + +2010-03-04 Ted Gould <ted@gould.cx> + + Adding a small little function to find default applications. + +2010-02-18 Ted Gould <ted@gould.cx> + + 0.3.2 + +2010-02-18 Ted Gould <ted@gould.cx> + + Adding in an icon to show the application as running + +2010-02-17 Ted Gould <ted@gould.cx> + + Adding in an application-running icon + +2010-02-18 Ted Gould <ted@gould.cx> + + Changing the applications to have icons. + +2010-02-17 Ted Gould <ted@gould.cx> + + Put the icons into the active items. + +2010-02-17 Ted Gould <ted@gould.cx> + + Removing the launcher custom menu type + +2010-02-17 Ted Gould <ted@gould.cx> + + Switch to having a launcher be a standard item with an icon. + +2010-02-18 Ted Gould <ted@gould.cx> + + Getting dynamic items from libindicate and dbusmenu + +2010-02-18 Ted Gould <ted@gould.cx> + + Upping dbusmenu dep to 0.2.5 + +2010-02-18 Ted Gould <ted@gould.cx> + + Adding protection from data fields by checking to ensure they're AppMenuItems + +2010-02-18 Ted Gould <ted@gould.cx> + + Setting the listener to NULL after unrefing it. + +2010-02-17 Ted Gould <ted@gould.cx> + + Do a resort after adding new items. + +2010-02-17 Ted Gould <ted@gould.cx> + + Did I ever talk to you about why I hate while loops? I have to stop using them. They just lead to bugs. + +2010-02-17 Ted Gould <ted@gould.cx> + + Eh, forgot to flesh out the lists + +2010-02-17 Ted Gould <ted@gould.cx> + + If we already have children, make sure to process them right away. + +2010-02-17 Ted Gould <ted@gould.cx> + + Adding some debug messages + +2010-02-17 Ted Gould <ted@gould.cx> + + Moving the shortcuts along with the app item + +2010-02-17 Ted Gould <ted@gould.cx> + + Getting the shortcuts in, and handling changes of them. + +2010-02-17 Ted Gould <ted@gould.cx> + + Realized that we can't proxy the root as the items can't then have two parents, and they need to exist with a parent in the menu that we're building. So we have to leave the proxy items unparented until they get picked up in the service themselves. + +2010-02-17 Ted Gould <ted@gould.cx> + + Adding a list to put the shortcuts in + +2010-02-17 Ted Gould <ted@gould.cx> + + Oops, wrong signal name for this function. + +2010-02-17 Ted Gould <ted@gould.cx> + + Emitting the new signal all over the place. + +2010-02-17 Ted Gould <ted@gould.cx> + + Adding in a shortcuts changed signal + +2010-02-17 Ted Gould <ted@gould.cx> + + Handling root item changes. Mostly. + +2010-02-17 Ted Gould <ted@gould.cx> + + Init and cleanup the client and root private properties. + +2010-02-17 Ted Gould <ted@gould.cx> + + Fleshing out menu_cb, lots of avenues for expantion in other directions now. + +2010-02-17 Ted Gould <ted@gould.cx> + + Adding API for getting items + +2010-02-17 Ted Gould <ted@gould.cx> + + Grabbing the static commands branch so we can build on it. + +2010-02-18 Ted Gould <ted@gould.cx> + + Adding in the ability to take static commands from a desktop file + +2010-02-18 Ted Gould <ted@gould.cx> + + Bumping libindicator to 0.3.3 + +2010-02-18 Ted Gould <ted@gould.cx> + + Use the string allocate by g_key_file instead of creating a new one + +2010-02-17 Ted Gould <ted@gould.cx> + + Explicitly setting the visible property so we call pull it later. + +2010-02-17 Ted Gould <ted@gould.cx> + + Switching over to using _bool for the visible property + +2010-02-17 Ted Gould <ted@gould.cx> + + Adding the shortcuts into the menuhandling code. + +2010-02-17 Ted Gould <ted@gould.cx> + + Fleshing out the get_items function + +2010-02-17 Ted Gould <ted@gould.cx> + + Applying the eclipsed value to the shortcuts that are associted with this launcher. + +2010-02-17 Ted Gould <ted@gould.cx> + + Making visible use boolean properties. + +2010-02-17 Ted Gould <ted@gould.cx> + + Responding to clicking on the shortcuts + +2010-02-17 Ted Gould <ted@gould.cx> + + Build us some shortcut menuitems + +2010-02-17 Ted Gould <ted@gould.cx> + + Adding in shortcuts and ids private variables. Full lifecycle. + +2010-02-17 Ted Gould <ted@gould.cx> + + Adding a function to get the items that are in the desktop file. + +2010-02-15 Ted Gould <ted@gould.cx> + + If we see a keyfile, use the keyfile processing. + +2010-02-15 Ted Gould <ted@gould.cx> + + Spliting out the launchers into the keyfiles + +2010-02-15 Ted Gould <ted@gould.cx> + + Abstracting out the keyfile handling stuff. + +2010-02-15 Ted Gould <ted@gould.cx> + + Adding in the ability to use keyfiles for the black list + +2010-02-09 Ted Gould <ted@gould.cx> + + Property disconnect the count changed signal. + +2010-02-09 Ted Gould <ted@gould.cx> + + Some comments. + +2010-02-09 Ted Gould <ted@gould.cx> + + Disconnecting the signal handler attached to the listener when we go away. + +2010-02-09 Ted Gould <ted@gould.cx> + + Removing the in brackets creation of a variable that also existed in the function, thus creating a NULL pointer. + +2010-02-08 Ted Gould <ted@gould.cx> + + Kids, ignore pot + +2010-02-08 Ted Gould <ted@gould.cx> + + Creating a local variable that was masking the one in the function. + +2010-02-08 Ted Gould <ted@gould.cx> + + Fixing debug message + +2010-02-08 Ted Gould <ted@gould.cx> + + I shouldn't have to have a ref there as it's got a ref count of one. + +2010-02-04 Ted Gould <ted@gould.cx> + + 0.3.1 + +2010-02-04 Ted Gould <ted@gould.cx> + + Update to new dbusmenu 0.2.2 + +2010-02-04 Ted Gould <ted@gould.cx> + + Fixing one more timestamp + +2010-02-04 Ted Gould <ted@gould.cx> + + Changing callback prototype and activate signals + +2010-02-04 Ted Gould <ted@gould.cx> + + Upping to dbusmenu-gtk 0.2.2 + +2010-01-08 Ted Gould <ted@gould.cx> + + 0.3.0 + +2009-12-22 Ted Gould <ted@gould.cx> + + Updating to dbusmenu v0.2.0 + +2009-12-18 Ted Gould <ted@gould.cx> + + Switching type to use the #define + +2009-12-18 Ted Gould <ted@gould.cx> + + Switching the property callback to be GValue + +2009-12-18 Ted Gould <ted@gould.cx> + + Requiring the 0.2.x series of dbusmenu + +2009-11-05 Ted Gould <ted@canonical.com> + + Apparently order matters. + +2009-11-05 Ted Gould <ted@canonical.com> + + Disabling static builds because we don't need them, and they seem to cause errors on amd64. + +2009-11-05 Ted Gould <ted@canonical.com> + + Moving to the libindicator 0.3.0 API + +2009-11-04 Ted Gould <ted@canonical.com> + + Switching to the new indicator interface. + +2009-11-04 Ted Gould <ted@canonical.com> + + Requiring the new libindicator + +2009-10-26 Ted Gould <ted@canonical.com> + + Adding translator comments for the hours and minutes strings. + +2009-10-26 Ted Gould <ted@canonical.com> + + Adding a translators comments for minutes and hours strings. + +2009-10-08 Ted Gould <ted@canonical.com> + + 0.2.6 + +2009-10-05 Ted Gould <ted@canonical.com> + + Making sure that the menu is calculated after it is determined after the black list is checked. + +2009-10-04 Ted Gould <ted@canonical.com> + + Resort the menu after the blacklist has been checked case we've black listed the last item in the menu. + +2009-10-01 Ted Gould <ted@canonical.com> + + Stupid ordering, just asking for a memory leak. + +2009-10-01 Ted Gould <ted@canonical.com> + + 0.2.5 + +2009-09-30 Ted Gould <ted@canonical.com> + + Adding in a check to see if the time was set, if not, don't display it in the menu item. + +2009-09-29 Ted Gould <ted@canonical.com> + + Making sure we don't update the text for the time if it's zero. + +2009-09-29 Ted Gould <ted@canonical.com> + + Adding in a creation seconds and returning that if seconds isn't set. + +2009-09-30 Ted Gould <ted@canonical.com> + + Checking for icon status when adding launchers to ensure that we get the correct status. + +2009-09-29 Ted Gould <ted@canonical.com> + + Checking to see if the menu should get un-hidden when we're installing new launchers. + +2009-09-25 Ted Gould <ted@canonical.com> + + Getting the path for icons from pkgconfig and putting them in the right location. + +2009-09-24 Ted Gould <ted@canonical.com> + + Using the new icon directory define. + +2009-09-24 Ted Gould <ted@canonical.com> + + Adding in a variable for the icon directory. + +2009-09-24 Ted Gould <ted@canonical.com> + + Making a 0.2.4 + +2009-09-24 Ted Gould <ted@canonical.com> + + Merging in the minimum width branch to fix descriptions getting truncated when they're a reasonable length. + +2009-09-23 Ted Gould <ted@canonical.com> + + Adding in a resort after editing the blacklist + +2009-09-23 Ted Gould <ted@canonical.com> + + Too big + +2009-09-23 Ted Gould <ted@canonical.com> + + Putting in teh size request a minimum width + +2009-09-24 Ted Gould <ted@canonical.com> + + Merging in the icon scaling branch + +2009-09-23 Ted Gould <ted@canonical.com> + + Forgot to scale on icon changing. + +2009-09-23 Ted Gould <ted@canonical.com> + + Putting in a little code to scale icons. + +2009-09-23 Ted Gould <ted@canonical.com> + + Version to kick LP + +2009-09-23 Ted Gould <ted@canonical.com> + + Merging in branch to add a path for indicators in /usr/share and make it so that invalid desktop files don't create visible menu items. + +2009-09-23 Ted Gould <ted@canonical.com> + + If we're not given a valid desktop file we should eclipse ourselves, and if we're eclipsed, we should hide the separator as well. + +2009-09-23 Ted Gould <ted@canonical.com> + + Looking at the old system apps directory as well. + +2009-09-23 Ted Gould <ted@canonical.com> + + Changing directory names + +2009-09-17 Ted Gould <ted@canonical.com> + + Making a purdy 0.2.3 + +2009-09-16 Ted Gould <ted@canonical.com> + + Merging in i18n branch to add i18n. + +2009-09-15 Ted Gould <ted@canonical.com> + + Forgot intltool + +2009-09-15 Ted Gould <ted@canonical.com> + + Adding in header for gettext + +2009-09-15 Ted Gould <ted@canonical.com> + + Adding in some encoding to make things fun. + +2009-09-15 Ted Gould <ted@canonical.com> + + Oops, teach me to cut and paste :) + +2009-09-15 Ted Gould <ted@canonical.com> + + Making it so the po directory is connected in. + +2009-09-15 Ted Gould <ted@canonical.com> + + Adding configure stuff in to set up gettext + +2009-09-15 Ted Gould <ted@canonical.com> + + Adding a po directory with a list of files. + +2009-09-15 Ted Gould <ted@canonical.com> + + Setting up the gettext stuff. + +2009-09-15 Sebstien Bacher <seb128@ubuntu.com> + + Patch from Seb to init localization + +2009-09-10 Ted Gould <ted@canonical.com> + + Going 0.2.2 + +2009-09-10 Ted Gould <ted@canonical.com> + + Adding in the separators + +2009-09-09 Ted Gould <ted@canonical.com> + + When removing an application item we need to get rid of its separator as well. + +2009-09-09 Ted Gould <ted@canonical.com> + + Merging in the time init stuff into this branch so that it gets into this code review. + +2009-09-09 Ted Gould <ted@canonical.com> + + Setting the default seconds to be the current time. + +2009-09-09 Ted Gould <ted@canonical.com> + + Switch to checking the separator by keeping track of the last one incase there are a bunch of launchers that are eclipsed at the end of the list. We'll have too many cases, it's easier just to see who we unhide. + +2009-09-09 Ted Gould <ted@canonical.com> + + Check eclipse to see if we should make indicators visible or not. + +2009-09-09 Ted Gould <ted@canonical.com> + + Hiding the last item on the list depending on who is last. + +2009-09-09 Ted Gould <ted@canonical.com> + + When eclipsing a launcher we're hiding it's separator as well. + +2009-09-09 Ted Gould <ted@canonical.com> + + Putting the separators into the resorting of the menu. + +2009-09-09 Ted Gould <ted@canonical.com> + + Handling separators on launchers. + +2009-09-09 Ted Gould <ted@canonical.com> + + Initializing local imList_t objects. + +2009-09-09 Ted Gould <ted@canonical.com> + + Forgot to initialize a separator. Also initializing the locally defined server objects to make it easier to find bugs with not setting stuff. + +2009-09-09 Ted Gould <ted@canonical.com> + + Making the server separator and putting it in. + +2009-09-09 Ted Gould <ted@canonical.com> + + Updated to current trunk. + +2009-09-04 Ted Gould <ted@canonical.com> + + Updating to latest trunk + +2009-08-26 Ted Gould <ted@canonical.com> + + Merging in the menu update branch. + +2009-09-09 Ted Gould <ted@canonical.com> + + Adding indicator-messages.service to the clean files for distcheck. + +2009-09-09 Ted Gould <ted@canonical.com> + + Making 0.2.1 + +2009-09-09 Ted Gould <ted@canonical.com> + + Putting the dbus service (correctly) in the libexec directory instead of the bin directory. + +2009-09-09 Ted Gould <ted@canonical.com> + + Adding in the local install flag to make that distcheck passes. + +2009-09-09 Ted Gould <ted@canonical.com> + + Update to the v2 API and getting the majority of 423013. + +2009-09-08 Ted Gould <ted@canonical.com> + + Bother. + +2009-09-08 Ted Gould <ted@canonical.com> + + Checking the wrong variable, let's not get caught by those legacy guys ;) + +2009-09-08 Ted Gould <ted@canonical.com> + + Adding in support for properties changing on the indicator menu item on the visualization side of things. + +2009-09-05 Ted Gould <ted@canonical.com> + + No atoi, no stdlib.h, that's how it is. + +2009-09-05 Ted Gould <ted@canonical.com> + + Fixing as I fixed the libindicate API, we shouldn't have to do an atoi here. + +2009-09-05 Ted Gould <ted@canonical.com> + + Setting up the listener signal to make it so that we know when the count changes. Using the property call back and just calling that function. + +2009-09-04 Ted Gould <ted@canonical.com> + + Replacing type with count + +2009-09-04 Ted Gould <ted@canonical.com> + + Removing the count on the label boolean as we're detecting that differently now. + +2009-09-04 Ted Gould <ted@canonical.com> + + We don't need to be tracking the added and removed signals for indicators anymore. + +2009-09-04 Ted Gould <ted@canonical.com> + + Fleshing out indicator changing the attention parameter. + +2009-09-04 Ted Gould <ted@canonical.com> + + Connecting into the attention signal. + +2009-09-04 Ted Gould <ted@canonical.com> + + Processing the attention when an indicator leaves the building. + +2009-09-04 Ted Gould <ted@canonical.com> + + Comments. + +2009-09-04 Ted Gould <ted@canonical.com> + + Fleshing out checking server attention by looking at all the indicators. + +2009-09-04 Ted Gould <ted@canonical.com> + + Initializing count + +2009-09-04 Ted Gould <ted@canonical.com> + + Oops, a little silly before. We really need to check the indicators as well, we can't just clear the attention for the count value. + +2009-09-04 Ted Gould <ted@canonical.com> + + Reworking how we handle the server count changing and how that makes us check for attention now. + +2009-09-04 Ted Gould <ted@canonical.com> + + Adding an attention parameter to the server and initing it. + +2009-09-04 Ted Gould <ted@canonical.com> + + If the item was shown, and we're in an overload case, we need to find someone else to show when we're dying. + +2009-09-04 Ted Gould <ted@canonical.com> + + Adding in a small function to access the show variable. + +2009-09-04 Ted Gould <ted@canonical.com> + + Hiding the items that go over our bounds. That's how it is. Hard, hard, limits. + +2009-09-04 Ted Gould <ted@canonical.com> + + Defining the max number of indicators and telling the server about it. + +2009-09-04 Ted Gould <ted@canonical.com> + + Setting the property on the dbusmenu menuitem as well + +2009-09-04 Ted Gould <ted@canonical.com> + + Adding in a show state. + +2009-09-04 Ted Gould <ted@canonical.com> + + Fleshing out the attention_cb to make it record the value and signal on changes. + +2009-09-04 Ted Gould <ted@canonical.com> + + Adding an attention variable and a function to access it. + +2009-09-04 Ted Gould <ted@canonical.com> + + Adding in a signal for when the attention changes. + +2009-09-04 Ted Gould <ted@canonical.com> + + Fleshing out the count item + +2009-09-04 Ted Gould <ted@canonical.com> + + Ask for all the properties up front. + +2009-09-04 Ted Gould <ted@canonical.com> + + We're tracking count instead of whether we should show the time as a boolean. + +2009-09-04 Ted Gould <ted@canonical.com> + + Making the sender support the name attribute and clean up the code a bit. + +2009-09-04 Ted Gould <ted@canonical.com> + + oops forgot to remove type from the modified one, oops. + +2009-09-04 Ted Gould <ted@canonical.com> + + Well, you know, Oholoh says that I don't comment enough. Better put some more in. + +2009-09-04 Ted Gould <ted@canonical.com> + + Changing the properties to be the indicate v2 ones. Mostly this involves adding extra properties at this point. + +2009-09-04 Ted Gould <ted@canonical.com> + + Removing the indicate-gtk headers. + +2009-09-04 Ted Gould <ted@canonical.com> + + Dropping dep on indicate-gtk, we don't need it now that we're just passing the image data on. + +2009-09-04 Ted Gould <ted@canonical.com> + + Converting this over to an indicator menuitem. + +2009-09-04 Ted Gould <ted@canonical.com> + + Fleshing out the indicator item. It's purdy. + +2009-09-04 Ted Gould <ted@canonical.com> + + Making sure these don't conflict with ones already in usage. + +2009-09-04 Ted Gould <ted@canonical.com> + + Adding properties for the new menuitems we need to build for showing applications and indicators. + +2009-09-04 Ted Gould <ted@canonical.com> + + Removing the type from the indicator_removed function. + +2009-09-04 Ted Gould <ted@canonical.com> + + We have to drop show_time as a parameter as the caller doesn't really know if that's the case or not anymore. + +2009-09-04 Ted Gould <ted@canonical.com> + + Reshuffle. Now the creation of an indicator makes for a im-menu-item without looking at type and subtype at all. We'll have a bunch more now. + +2009-09-04 Ted Gould <ted@canonical.com> + + libindicate dependency was already 0.2.0, but marking this as the case in the version history. + +2009-09-04 Ted Gould <ted@canonical.com> + + Merging in the dbusmenu011 branch. I think I got other trunk updates as well. + +2009-09-04 Ted Gould <ted@canonical.com> + + Bringing up to use some of the new features and defines in DBusmenu 0.1.1 + +2009-09-04 Ted Gould <ted@canonical.com> + + A variable and a prototype. Such is life. + +2009-09-04 Ted Gould <ted@canonical.com> + + Fixing a header and some defines. + +2009-09-03 Ted Gould <ted@canonical.com> + + Using the defines fo dealing with the icons and using the generic image type. We're just passing along the PNGs right now. + +2009-09-03 Ted Gould <ted@canonical.com> + + Using defines for visibility. + +2009-09-03 Ted Gould <ted@canonical.com> + + Upping dbusmenu version + +2009-08-27 Ted Gould <ted@canonical.com> + + Updating to dbusmenu 0.1.0 as a versioning snafu got involved. + +2009-08-27 Ted Gould <ted@canonical.com> + + Changing to version 0.2.0. We need a release sometime. + +2009-08-27 Ted Gould <ted@canonical.com> + + Merging in a branch that updates to the new dbusmenu but also uses it to add a custom launcher item. + +2009-08-27 Ted Gould <ted@canonical.com> + + Checking args from libdbusmenu, stealing code from there. Comments by Neil. + +2009-08-26 Ted Gould <ted@canonical.com> + + Attaching a bug to a branch. + +2009-08-26 Ted Gould <ted@canonical.com> + + This stuff is crashing big time now. Not sure why it worked before, but not going to look into it now. + +2009-08-26 Ted Gould <ted@canonical.com> + + Adding a little style to our labels. Hopefully making them look a little nicer. + +2009-08-26 Ted Gould <ted@canonical.com> + + Use that handy get_description function that we just merged in. Heh, wonder why we did that... + +2009-08-26 Ted Gould <ted@canonical.com> + + Merging in the lift-and-separate branch to get the description function on there. + +2009-08-26 Ted Gould <ted@canonical.com> + + Adding a get_description function + +2009-08-25 Ted Gould <ted@canonical.com> + + Merging in the dirwatch branch + +2009-08-26 Ted Gould <ted@canonical.com> + + Setting the type of the item and app name + +2009-08-26 Ted Gould <ted@canonical.com> + + Filling in the new launcher menu item + +2009-08-26 Ted Gould <ted@canonical.com> + + Pulling the type and the properties into the shared DBus header. + +2009-08-26 Ted Gould <ted@canonical.com> + + Injecting in a type for the launchers. + +2009-08-26 Ted Gould <ted@canonical.com> + + Making ourselves a variable in the middle of everything. + +2009-08-26 Ted Gould <ted@canonical.com> + + Replacing the prop strings with defines + +2009-08-26 Ted Gould <ted@canonical.com> + + Locking to version 0.0.2 to use some of the new nicities + +2009-08-26 Ted Gould <ted@canonical.com> + + show -> visible + +2009-08-26 Ted Gould <ted@canonical.com> + + Merging in changes to make the green dot appear and the icon hide when no one is there. + +2009-08-26 Ted Gould <ted@canonical.com> + + Adding the green dot bug onto the branch. + +2009-08-26 Ted Gould <ted@canonical.com> + + Some debug messages and checking the list length, but most importantly, got the show/eclipsed logic backwards. + +2009-08-26 Ted Gould <ted@canonical.com> + + Checking hidden when servers are added and removed as well. + +2009-08-26 Ted Gould <ted@canonical.com> + + Putting in the hiding logic + +2009-08-26 Ted Gould <ted@canonical.com> + + Adding in teh ability to count the number of launchers that are visable + +2009-08-26 Ted Gould <ted@canonical.com> + + The documentation clearly states that you don't need these if the client supports introspection. I thought I was being old school by still putting them in. But, THE DOCUMENTATION LIES, you need to add the signals no matter what. + +2009-08-26 Ted Gould <ted@canonical.com> + + Forgot to change to Ayatana + +2009-08-26 Ted Gould <ted@canonical.com> + + Bad name, fixed. + +2009-08-26 Ted Gould <ted@canonical.com> + + Setting the attention parameter in the dbus interface. + +2009-08-26 Ted Gould <ted@canonical.com> + + Legal crap. + +2009-08-26 Ted Gould <ted@canonical.com> + + Oh, wow, now there's some flesh on these. Let's hide and show icons. + +2009-08-26 Ted Gould <ted@canonical.com> + + Setting up signals and callbacks, oh my! Watch for lions. + +2009-08-26 Ted Gould <ted@canonical.com> + + Building a proxy... + +2009-08-26 Ted Gould <ted@canonical.com> + + Okay, now we're signaling change. + +2009-08-26 Ted Gould <ted@canonical.com> + + Making some signal lovin' + +2009-08-26 Ted Gould <ted@canonical.com> + + Adding the basic set functions into the C files. + +2009-08-26 Ted Gould <ted@canonical.com> + + Some comments. + +2009-08-25 Ted Gould <ted@canonical.com> + + Bringing up the object and having some variables to access. + +2009-08-25 Ted Gould <ted@canonical.com> + + Creating a real object and initing it. + +2009-08-25 Ted Gould <ted@canonical.com> + + Building an object to represent the service over DBus. + +2009-08-25 Ted Gould <ted@canonical.com> + + Adding in a new dbus interface. + +2009-08-25 Ted Gould <ted@canonical.com> + + Switching to ayatana.org and adding a new name for the service as a whole. + +2009-08-25 Ted Gould <ted@canonical.com> + + Merging in the directory watch branch. + +2009-08-25 Ted Gould <ted@canonical.com> + + Checking to see if error is null before looking inside it. + +2009-08-21 Ted Gould <ted@canonical.com> + + Now we're really killing these puppies! Don't cry, they weren't cuddly puppies. + +2009-08-21 Ted Gould <ted@canonical.com> + + Fleshing out the first part of destroy, in that we're just removing an item from a list. + +2009-08-21 Ted Gould <ted@canonical.com> + + Relinking back to trunk. + +2009-08-21 Ted Gould <ted@canonical.com> + + The launcher creation didn't test to see if it already exists. Now we keep one launcher per desktop file. Makes sense, eh? That's what we're going for. + +2009-08-21 Ted Gould <ted@canonical.com> + + Start responding to changes in the applications directories + +2009-08-21 Ted Gould <ted@canonical.com> + + I'd have to say that hash_table_find didn't do what I expected, and is pretty useless. + +2009-08-21 Ted Gould <ted@canonical.com> + + Fleshing out remove to try to get rid of all these blacklist items. + +2009-08-21 Ted Gould <ted@canonical.com> + + Turning blacklist dir changes into events + +2009-08-20 Ted Gould <ted@canonical.com> + + Basic code to monitor the directories + +2009-08-20 Ted Gould <ted@canonical.com> + + Adding in black list support + +2009-08-25 Ted Gould <ted@canonical.com> + + Merging in the black list branch. + +2009-08-21 Ted Gould <ted@canonical.com> + + Updating to trunk + +2009-08-20 Ted Gould <ted@canonical.com> + + Adding the user APPS directory to the places where we can find applications + +2009-08-20 Ted Gould <ted@canonical.com> + + Switching the build to take the directory as a parameter + +2009-08-20 Ted Gould <ted@canonical.com> + + Some debug and fixing checking the desktop file. All good. + +2009-08-20 Ted Gould <ted@canonical.com> + + Now parsing the directory on start up. Getting this whole thing started up. + +2009-08-20 Ted Gould <ted@canonical.com> + + Writing the fairly extensive and complex check function. But, if that's the way it needs to be, I guess it needs to be that way. + +2009-08-20 Ted Gould <ted@canonical.com> + + We're taking ownership of that variable as well + +2009-08-20 Ted Gould <ted@canonical.com> + + Fleshing out the add function. Just a little. + +2009-08-20 Ted Gould <ted@canonical.com> + + More of a basis for the black list stuff. Some functions and an interface. + +2009-08-20 Ted Gould <ted@canonical.com> + + Adding in some seperators to make things more clear. + +2009-08-20 Ted Gould <ted@canonical.com> + + Adding in a couple of blacklist check point. + +2009-08-20 Ted Gould <ted@canonical.com> + + Merging in the launchers branch + +2009-08-21 Ted Gould <ted@canonical.com> + + Adding in support for launchers + +2009-08-20 Ted Gould <ted@canonical.com> + + Should be in milliseconds not micro + +2009-08-20 Ted Gould <ted@canonical.com> + + Use a GDK app context. Not sure about the timestamp units though. + +2009-08-19 Ted Gould <ted@canonical.com> + + Oh, some debug messages to see what's going on. + +2009-08-19 Ted Gould <ted@canonical.com> + + Ah, where casting kills. You can cast anything to the right value even though it's not. Nice opaque errors you get for that. + +2009-08-19 Ted Gould <ted@canonical.com> + + Big commit. Trying to check for eclipses, but first both objects needed to track their desktop file paths. So I had to add that little nugget in as well. + +2009-08-19 Ted Gould <ted@canonical.com> + + Adding an eclipsed function for the LMI + +2009-08-19 Ted Gould <ted@canonical.com> + + Clean up, clean up, everybody everywhere + +2009-08-19 Ted Gould <ted@canonical.com> + + Adding in a couple function to deal with disappearing launchers. + +2009-08-19 Ted Gould <ted@canonical.com> + + Adding in the activate logic so that the menu items actually launch the application. + +2009-08-19 Ted Gould <ted@canonical.com> + + Adding the launcher list to the resorting function. This looks more complex than it is, it's just merging the two lists on the fly in alphabetical order. + +2009-08-19 Ted Gould <ted@canonical.com> + + Making this file a little more readable. Eh, I guess you never plan on them getting this big when you start do you? I remember when he was just a little automake file. + +2009-08-19 Ted Gould <ted@canonical.com> + + Missing a couple headers for distcheckness + +2009-08-19 Ted Gould <ted@canonical.com> + + Getting launchers to add to the menu, and changing the function to do that so it's not all server based. We want everyone involved now. + +2009-08-19 Ted Gould <ted@canonical.com> + + Setting the label of the menu item. + +2009-08-19 Ted Gould <ted@canonical.com> + + Lots of debug, but also cleaning up the desktop file name path so it gets properly into the constructor. + +2009-08-19 Ted Gould <ted@canonical.com> + + Oops, forgot one level of redirection here + +2009-08-19 Ted Gould <ted@canonical.com> + + Spliting out the building of the items as it'll read the desktop file off disk and parse it. + +2009-08-19 Ted Gould <ted@canonical.com> + + Go through the launchers and start building items + +2009-08-19 Ted Gould <ted@canonical.com> + + Not sure why, but the naming of this file is really bugging me. Fixed now. + +2009-08-19 Ted Gould <ted@canonical.com> + + Adding in a new menu-item type. One for launchers! Woo Hoo! + +2009-08-19 Ted Gould <ted@canonical.com> + + No reason that all these should be linked into the loadable module. Err, fail. + +2009-08-19 Ted Gould <ted@canonical.com> + + Adding the basis for launchers + +2009-08-19 Ted Gould <ted@canonical.com> + + Adding directories. Let's put them in one file so that they'll be changable easy :) + +2009-08-19 Ted Gould <ted@canonical.com> + + AM 1.11 silent rule + +2009-08-05 Ted Gould <ted@canonical.com> + + Fixing the messaging indicator to unref the menu item, which removes the signal handlers. + +2009-08-04 Ted Gould <ted@canonical.com> + + indicate-gtk changes that are required + +2009-08-04 Ted Gould <ted@canonical.com> + + Merging in the branch that pulls in the dbusmenu changes that change to using a service. + +2009-05-28 Ted Gould <ted@canonical.com> + + Aw, bother, turns out I messed up the service file. Let's fix that. + +2009-05-28 Ted Gould <ted@canonical.com> + + Building a simple little activator to find out if we can activate the service. + +2009-05-28 Ted Gould <ted@canonical.com> + + Putting a little more error handling code in. + +2009-05-28 Ted Gould <ted@canonical.com> + + Failing on warnings + +2009-05-27 Ted Gould <ted@canonical.com> + + Switching to the better dbus service dir + +2009-05-27 Ted Gould <ted@canonical.com> + + Starting the service if it isn't there + +2009-05-27 Ted Gould <ted@canonical.com> + + Getting a name, and grabbing it, and loving it... + +2009-05-27 Ted Gould <ted@canonical.com> + + Removing the child_reorder function as it's now upstream + +2009-05-26 Ted Gould <ted@canonical.com> + + First pass at moving everything to doing work with the DbusmenuMenuitem's instead of GTK + +2009-05-26 Ted Gould <ted@canonical.com> + + Converting to a DbusmenuMenuitem instead of GtkMenuItem + +2009-05-26 Ted Gould <ted@canonical.com> + + Converting to a DbusmenuMenuitem instead of GtkMenuItem + +2009-05-26 Ted Gould <ted@canonical.com> + + First pass, build the listener and do fun stuff like that. + +2009-05-26 Ted Gould <ted@canonical.com> + + Building the indicator-messages-service + +2009-05-26 Ted Gould <ted@canonical.com> + + A simple main() to get things to compile + +2009-05-26 Ted Gould <ted@canonical.com> + + Install the DBus Service + +2009-05-26 Ted Gould <ted@canonical.com> + + Adding in a service descriptor for adding to DBUS + +2009-05-26 Ted Gould <ted@canonical.com> + + Lookup the dbus services + +2009-05-26 Ted Gould <ted@canonical.com> + + Linking in the dbus data + +2009-05-26 Ted Gould <ted@canonical.com> + + Moving the complex code into the service and leaving the rest for the loadable module. + +2009-05-26 Ted Gould <ted@canonical.com> + + Adding in dbus name and object + +2009-05-26 Ted Gould <ted@canonical.com> + + Adding a dependency on the dbus menu library. + +2009-05-13 Ted Gould <ted@canonical.com> + + Merging in fix for tracking the timers. + +2009-05-10 Ted Gould <ted@canonical.com> + + Not setting the variable time_update_min when creating the source. Bug found by Ka-Hing Cheung + +2009-04-22 Ted Gould <ted@canonical.com> + + Get rid of the main menu variable that we're not using. Hide the image. + +2009-04-22 Ted Gould <ted@canonical.com> + + Setting the name to 'messages' + +2009-04-22 Ted Gould <ted@canonical.com> + + removing a warning by ref'ing the default + +2009-04-22 Ted Gould <ted@canonical.com> + + Fixing return type + +2009-04-22 Ted Gould <ted@canonical.com> + + Breaking out into libindicator style function calls. + +2009-04-22 Ted Gould <ted@canonical.com> + + Including the indicator info + +2009-04-22 Ted Gould <ted@canonical.com> + + Installing to indicator dir instead of other fun places + +2009-04-22 Ted Gould <ted@canonical.com> + + Putting a 'dev' on the version number + +2009-04-22 Ted Gould <ted@canonical.com> + + Increasing the version of indicate required and requiring indicator + +2009-04-20 Ted Gould <ted@canonical.com> + + Some changes suggested by Cody Russell to make things a little bit safer. + +2009-04-20 Ted Gould <ted@canonical.com> + + Freeing the appinfo and type from the application object on finalize + +2009-04-20 Ted Gould <ted@canonical.com> + + Moving signal disconnecting and unref to the dispose function instead of finalize. Fix by Cody Russell on bug 362124. + +2009-04-20 Ted Gould <ted@canonical.com> + + Adding a ref'ing and deref'ing of the listener to the application menu item to ensure it stays around while we hav signals attached to it. Fix by Code Russell on bug 362124. + +2009-04-13 Ted Gould <ted@canonical.com> + + Fixes to the finalize function. + +2009-04-13 Ted Gould <ted@canonical.com> + + Making a 6 + +2009-04-13 Ted Gould <ted@canonical.com> + + Merging in Cody's fix for 359018 + +2009-04-13 cody <cody@raconteur> + + move parent->finalize() to the end of the finalize function + +2009-04-08 Ted Gould <ted@canonical.com> + + Including some cleanups from James Westby. Thanks + +2009-04-05 James Westby <james.westby@canonical.com> + + Be aware that appinfo can be NULL. + +2009-04-05 James Westby <james.westby@canonical.com> + + Fix PKG_NAME in autogen.sh. + +2009-04-07 Ted Gould <ted@canonical.com> + + Require indicate version 0.1.5 or higher + +2009-04-07 Ted Gould <ted@canonical.com> + + Trying to set this to also act like FUSA so that we get the same visual as the rest of the panel. + +2009-04-07 Ted Gould <ted@canonical.com> + + Make sure we disconnect from all our signals and free from memory that really exists. Lots of little nasty bugs. + +2009-04-07 Ted Gould <ted@canonical.com> + + Actually removing indicators when the server goes bye-bye and freeing up the indicator data. Wow, two biggie leaks. + +2009-04-07 Ted Gould <ted@canonical.com> + + Should have been using g_strcmp0 all along. No reason not to use the safer one. + +2009-04-07 Ted Gould <ted@canonical.com> + + Making these new0 to make sure that our lists are NULL + +2009-04-03 Ted Gould <ted@canonical.com> + + Using the right symbol names now + +2009-04-03 Ted Gould <ted@canonical.com> + + Using the correct way to find the DBus name and ids. + +2009-04-03 Ted Gould <ted@canonical.com> + + Setting version 0.1.5 + +2009-04-03 Ted Gould <ted@canonical.com> + + Showing some interest in teh clients we talk to. + +2009-04-03 Ted Gould <ted@canonical.com> + + Adding in some consts to match the new prototypes better + +2009-03-27 Ted Gould <ted@canonical.com> + + Changing version number + +2009-03-27 Ted Gould <ted@canonical.com> + + Making time more about it's own relative nature rather than a fixed time. + +2009-03-27 Ted Gould <ted@canonical.com> + + Adding in a couple of statics + +2009-03-24 Ted Gould <ted@canonical.com> + + Making it so that an indicator gets displayed when someone logs in, eventually it disappears. + +2009-03-18 Ted Gould <ted@canonical.com> + + Setting version number to 0.1.3 to match all of the other indicator stuff. Probably should split things out more later. + +2009-03-18 Ted Gould <ted@canonical.com> + + Making the truth correct + +2009-03-18 Ted Gould <ted@canonical.com> + + Backwards sorting + +2009-03-18 Ted Gould <ted@canonical.com> + + Adding in message.im, should have spec'd this better now there's some drift. + +2009-03-18 Ted Gould <ted@canonical.com> + + Making the IM list sorted and handling the time changed signal + +2009-03-18 Ted Gould <ted@canonical.com> + + Putting the seconds into the private structure, a function to get them, and a signal when they change. + +2009-03-18 Ted Gould <ted@canonical.com> + + Fleshing out the reconsile function. And making sure it gets called everytime there is a name change on the server side. + +2009-03-18 Ted Gould <ted@canonical.com> + + Wrong name + +2009-03-18 Ted Gould <ted@canonical.com> + + Relaying out the data structures so that the indicators are sub to the servers + +2009-03-17 Ted Gould <ted@canonical.com> + + Forgot to actually pass the value to the signal, ahhhh + +2009-03-15 Ted Gould <ted@canonical.com> + + Switching the servers from a hash table to a list. Cleans things up a little, and sets us up for menu organization at a more complete level. + +2009-03-15 Ted Gould <ted@canonical.com> + + Adding functions to make it so that we can get signaled on name changes and also query them in app-menu-items + +2009-03-15 Ted Gould <ted@canonical.com> + + Putting in a sorting function to make sure that the individual indicators are always below the server that they're associated with. + +2009-03-15 Ted Gould <ted@canonical.com> + + Bad truth + +2009-03-15 Ted Gould <ted@canonical.com> + + Disconnecting our signals properly, avoids a crash + +2009-03-15 Ted Gould <ted@canonical.com> + + Add simulation of zero count on server remove + +2009-03-15 Ted Gould <ted@canonical.com> + + Setting up the library versioning to basically not have any, this is a module. + +2009-03-15 Ted Gould <ted@canonical.com> + + Switching the icon to be based on whether or not the server is reporting indicators instead of counting the number of indicators items. + +2009-03-15 Ted Gould <ted@canonical.com> + + Splitting the label updating into it's own function and making that called by the other functions that adjust how that happens. + +2009-03-15 Ted Gould <ted@canonical.com> + + Adding in an unread count variable, and then a signal to show it chagned. Also, watching for the indicators on this server to make sure it stays correct. + +2009-03-13 Ted Gould <ted@canonical.com> + + Changing the version number, but don't release it :) + +2009-03-09 Ted Gould <ted@canonical.com> + + changing the size of the icon + +2009-02-16 Ted Gould <ted@canonical.com> + + Turns out that in configure it was 'messaging' -- oops, fixed to be the same as everywhere else. + +2009-02-16 Ted Gould <ted@canonical.com> + + Making this an upstream branch, no packaging. + +2009-02-15 Ted Gould <ted@canonical.com> + + releasing version 0.1~ppa15 + +2009-02-15 Ted Gould <ted@canonical.com> + + Making the menu hide itself if there is no one around + +2009-02-13 Ted Gould <ted@canonical.com> + + releasing version 0.1~ppa14 + +2009-02-13 Ted Gould <ted@canonical.com> + + Forgot to change all the names. + +2009-02-13 Ted Gould <ted@canonical.com> + + Making the image global, and changing it based on how many IMs we have. + +2009-02-13 Ted Gould <ted@canonical.com> + + Add a callback to display the app + +2009-02-13 Ted Gould <ted@canonical.com> + + Oh, I forgot these create log messages. Very annoying. + +2009-02-13 Ted Gould <ted@canonical.com> + + Adding in desktop file support, which required configure changes to get the right headers. + +2009-02-13 Ted Gould <ted@canonical.com> + + Adding in functions to get the desktop file and type of the application + +2009-02-13 Ted Gould <ted@canonical.com> + + Adding a callback for when things like the time get modified. + +2009-02-13 Ted Gould <ted@canonical.com> + + Adding in scaling of icons + +2009-02-13 Ted Gould <ted@canonical.com> + + Setting up to use the icon and time helper functions and make icons update. Whoot! + +2009-02-11 Ted Gould <ted@canonical.com> + + Adding in a copyright for the debian packaging and description of the package license + +2009-02-11 Ted Gould <ted@canonical.com> + + Adding myself as an author + +2009-02-11 Ted Gould <ted@canonical.com> + + Adding in license headers, GPL v3 + +2009-02-07 Ted Gould <ted@canonical.com> + + More debugging and temorarily showing the menu item ourselves + +2009-02-07 Ted Gould <ted@canonical.com> + + Adding in some debug messages + +2009-02-07 Ted Gould <ted@canonical.com> + + Adding in the basis for making a server based menu item + +2009-02-07 Ted Gould <ted@canonical.com> + + Removing the need for an indicator + +2009-02-06 Ted Gould <ted@canonical.com> + + Adding in an application menu item to start building those + +2009-02-06 Ted Gould <ted@canonical.com> + + Making the activate callback static and putting in a prototype + +2009-02-05 Ted Gould <ted@canonical.com> + + Removing warnings by getting the right pointer types + +2009-02-05 Ted Gould <ted@canonical.com> + + Oh, two things. First is setting alignment of the two strings and also getting the time from an ISO8601 string + +2009-02-04 Ted Gould <ted@canonical.com> + + releasing version 0.1~ppa13 + +2009-02-04 Ted Gould <ted@canonical.com> + + Using the right damn function + +2009-02-04 Ted Gould <ted@canonical.com> + + releasing version 0.1~ppa12 + +2009-02-04 Ted Gould <ted@canonical.com> + + Installing to the wrong directory + +2009-02-04 Ted Gould <ted@canonical.com> + + Adding in data directory + +2009-02-04 Ted Gould <ted@canonical.com> + + releasing version 0.1~ppa11 + +2009-02-04 Ted Gould <ted@canonical.com> + + Taking the icons from Evolution and GNOME icon themes. Some slight modifications. + +2009-02-04 Ted Gould <ted@canonical.com> + + releasing version 0.1~ppa10 + +2009-02-04 Ted Gould <ted@canonical.com> + + Adding in dummy icons + +2009-02-04 Ted Gould <ted@canonical.com> + + Adding in icons + +2009-02-03 Ted Gould <ted@canonical.com> + + Changed libindicate name to libindicate0, so need to have + another build in the PPA. + +2009-02-02 Ted Gould <ted@canonical.com> + + Bumping for PPA + +2009-01-30 Ted Gould <ted@canonical.com> + + Adding in activate callback when the menu item is + clicked on. + +2009-01-30 Ted Gould <ted@canonical.com> + + Adding in an activate callback + +2009-01-29 Ted Gould <ted@canonical.com> + + Making things better, now menu items are created and + destroyed as they are, well, indicators are created + and destroyed. Also minor cleanups. + +2009-01-29 Ted Gould <ted@canonical.com> + + Switching from a hash table to a list + +2009-01-29 Ted Gould <ted@canonical.com> + + Putting a debug message on compare + +2009-01-29 Ted Gould <ted@canonical.com> + + Warning on not removing something that should have been. + +2009-01-21 Ted Gould <ted@canonical.com> + + Basically now indicators show up if someone puts an IM message + on the Bus. Way cool. No delete or anything fancy, but good + progress. + +2009-01-21 Ted Gould <ted@canonical.com> + + I always get the order of these backwards + +2009-01-21 Ted Gould <ted@canonical.com> + + Changing the text to be a little shorter + +2009-01-21 Ted Gould <ted@canonical.com> + + Adding in a show that I forgot :( + +2009-01-21 Ted Gould <ted@canonical.com> + + Better debug message and getting the time callback to check for the right property + +2009-01-21 Ted Gould <ted@canonical.com> + + Lots of debugging message to figure out that I hadn't passed + the return variable in _new :( + +2009-01-21 Ted Gould <ted@canonical.com> + + I hate me + +2009-01-21 Ted Gould <ted@canonical.com> + + It's truly amazing how many logic errors I make + +2009-01-21 Ted Gould <ted@canonical.com> + + Make menu items for IM indicators + +2009-01-21 Ted Gould <ted@canonical.com> + + Adding in some more warnings + +2009-01-21 Ted Gould <ted@canonical.com> + + Forgot a _start + +2009-01-21 Ted Gould <ted@canonical.com> + + Forgot to connect in the signal handler, oops. + +2009-01-21 Ted Gould <ted@canonical.com> + + Get this to compile + +2009-01-21 Ted Gould <ted@canonical.com> + + Linking together + +2009-01-21 Ted Gould <ted@canonical.com> + + Fleshed this item out some + +2009-01-21 Ted Gould <ted@canonical.com> + + Boiler plate IM menu items + +2009-01-20 Ted Gould <ted@canonical.com> + + ifdef'ing out the mail stuff as we need to get IM working first + +2009-01-20 Ted Gould <ted@canonical.com> + + Building the basis of what needs to be the indicator. + +2009-01-19 Ted Gould <ted@canonical.com> + + Adding in libindicate as a dependency + +2008-12-04 Ted Gould <ted@canonical.com> + + Ignore stuff + +2008-12-04 Ted Gould <ted@canonical.com> + + Moving the directory + +2008-12-04 Ted Gould <ted@canonical.com> + + Starting Debian Packaging + +2008-12-04 Ted Gould <ted@canonical.com> + + Showing by default. + +2008-12-04 Ted Gould <ted@canonical.com> + + Making the directory the same as the applet. Should have done that first, eh. + +2008-12-04 Ted Gould <ted@canonical.com> + + Ignoring + +2008-12-04 Ted Gould <ted@canonical.com> + + Actually getting this all to build reasonably. + +2008-12-04 Ted Gould <ted@canonical.com> + + Checkmark checkin + diff --git a/Makefile.am b/Makefile.am index 26c2a33..d6f6168 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,5 +4,30 @@ SUBDIRS = \ data \ po -DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall +DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-deprecations +dist-hook: + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating ChangeLog && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + || (rm -f ChangeLog.tmp; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo Failed to generate ChangeLog: not a branch >&2; \ + fi + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating AUTHORS && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ + && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ + || (rm -f AUTHORS.tmp; \ + echo Failed to generate AUTHORS >&2 ); \ + else \ + echo Failed to generate AUTHORS: not a branch >&2; \ + fi diff --git a/Makefile.in b/Makefile.in index ab8e36c..3417139 100644 --- a/Makefile.in +++ b/Makefile.in @@ -187,6 +187,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -256,7 +258,7 @@ SUBDIRS = \ data \ po -DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall +DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-deprecations all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -517,6 +519,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ @@ -738,8 +743,8 @@ uninstall-am: .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ + dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -752,6 +757,32 @@ uninstall-am: ps ps-am tags tags-recursive uninstall uninstall-am +dist-hook: + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating ChangeLog && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + || (rm -f ChangeLog.tmp; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo Failed to generate ChangeLog: not a branch >&2; \ + fi + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating AUTHORS && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ + && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ + || (rm -f AUTHORS.tmp; \ + echo Failed to generate AUTHORS >&2 ); \ + else \ + echo Failed to generate AUTHORS: not a branch >&2; \ + fi + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -301,7 +301,7 @@ msgstr "" dnl These rules are solely for the distribution goal. While doing this dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. + dnl in configure.ac. for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" @@ -430,7 +430,7 @@ AC_DEFINE_UNQUOTED($1, "$localedir", dnl dnl Now the definitions that aclocal will find dnl -ifdef(glib_configure_in,[],[ +ifdef(glib_configure_ac,[],[ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ])dnl @@ -603,7 +603,7 @@ IT_PO_SUBDIR([po]) AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl The following CONFIG_COMMANDS should be executed at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ @@ -8612,8 +8612,9 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8631,20 +8632,21 @@ dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. # @@ -8672,7 +8674,10 @@ AC_DEFUN([AM_NLS], AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -8685,7 +8690,6 @@ if test -n "$PKG_CONFIG"; then AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -8694,34 +8698,31 @@ fi[]dnl # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) + m4_default([$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -8763,16 +8764,17 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - ifelse([$4], , [AC_MSG_ERROR(dnl + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -8780,25 +8782,24 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +_PKG_TEXT])[]dnl + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [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. _PKG_TEXT -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], - [$4]) +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl ])# PKG_CHECK_MODULES @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. +# Generated by GNU Autoconf 2.67. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -316,7 +316,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -356,19 +356,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -679,7 +679,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -762,6 +762,8 @@ INDICATORICONSDIR INDICATORDIR APPLET_LIBS APPLET_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG AM_BACKSLASH AM_DEFAULT_VERBOSITY @@ -916,6 +918,7 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_silent_rules +enable_deprecations enable_localinstall ' ac_precious_vars='build_alias @@ -928,6 +931,8 @@ LIBS CPPFLAGS CPP PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR APPLET_CFLAGS APPLET_LIBS' @@ -992,8 +997,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1038,7 +1044,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1064,7 +1070,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1268,7 +1274,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1284,7 +1290,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1314,8 +1320,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1323,7 +1329,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1341,13 +1347,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1370,7 +1376,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1384,8 +1390,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1400,9 +1406,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1441,11 +1447,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1485,7 +1491,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1559,6 +1565,7 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --enable-silent-rules less verbose build output (undo: `make V=1') --disable-silent-rules verbose build output (undo: `make V=0') + --enable-deprecations allow deprecated API usage [default=yes] --enable-localinstall install all of the files localy instead of system directories (for distcheck) @@ -1579,6 +1586,10 @@ Some influential environment variables: you have headers in a nonstandard directory <include dir> CPP C preprocessor PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path APPLET_CFLAGS C compiler flags for APPLET, overriding pkg-config APPLET_LIBS linker flags for APPLET, overriding pkg-config @@ -1650,9 +1661,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1755,7 +1766,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1835,7 +1846,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1902,7 +1913,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1932,10 +1943,10 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1971,7 +1982,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1998,7 +2009,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2015,7 +2026,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2125,11 +2136,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2163,11 +2172,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2180,11 +2187,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2198,11 +2203,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2257,7 +2260,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2272,7 +2280,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2348,7 +2360,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2370,16 +2382,22 @@ am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2495,11 +2513,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2521,7 +2539,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2531,7 +2549,7 @@ then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2769,7 +2787,7 @@ done $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2777,7 +2795,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2811,7 +2829,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2827,7 +2845,7 @@ fi # Define the identity of the package. PACKAGE=indicator-messages - VERSION=0.3.7 + VERSION=0.3.92 cat >>confdefs.h <<_ACEOF @@ -3268,8 +3286,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3383,9 +3401,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3427,8 +3444,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3485,9 +3502,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3538,8 +3555,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3891,7 +3908,7 @@ fi case "$am__api_version" in 1.01234) - as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; @@ -3908,7 +3925,7 @@ $as_echo_n "checking for intltool >= 0.35.0... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. @@ -4032,7 +4049,7 @@ fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -4314,13 +4331,13 @@ fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. @@ -4364,13 +4381,13 @@ fi if test -z "$INTLTOOL_PERL"; then - as_fn_error "perl not found" "$LINENO" 5 + as_fn_error $? "perl not found" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 $as_echo_n "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 + as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 @@ -4383,7 +4400,7 @@ $as_echo_n "checking for XML::Parser... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -4788,8 +4805,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -5164,7 +5181,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; } fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5323,7 +5340,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5339,11 +5356,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -5382,7 +5399,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5398,18 +5415,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -5470,7 +5487,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -5536,7 +5553,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -5719,7 +5736,7 @@ ltmain="$ac_aux_dir/ltmain.sh" # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -5730,16 +5747,16 @@ else test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -5764,7 +5781,7 @@ else ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -5772,7 +5789,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -5845,7 +5862,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -5924,7 +5941,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -6040,7 +6057,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -6242,13 +6259,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:6245: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6262: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6248: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6265: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6251: output\"" >&5) + (eval echo "\"\$as_me:6268: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7453,7 +7470,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7456 "configure"' > conftest.$ac_ext + echo '#line 7473 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8207,8 +8224,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -8699,11 +8715,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:8702: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8718: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8706: \$? = $ac_status" >&5 + echo "$as_me:8722: \$? = $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. @@ -9038,11 +9054,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:9041: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9057: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9045: \$? = $ac_status" >&5 + echo "$as_me:9061: \$? = $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. @@ -9143,11 +9159,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:9146: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9162: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9150: \$? = $ac_status" >&5 + echo "$as_me:9166: \$? = $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 @@ -9198,11 +9214,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:9201: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9217: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9205: \$? = $ac_status" >&5 + echo "$as_me:9221: \$? = $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 @@ -11582,7 +11598,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11585 "configure" +#line 11601 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11678,7 +11694,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11681 "configure" +#line 11697 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11922,6 +11938,18 @@ esac AM_BACKSLASH='\' +# Check whether --enable-deprecations was given. +if test "${enable_deprecations+set}" = set; then : + enableval=$enable_deprecations; +else + enable_deprecations=yes +fi + +if test "x$enable_deprecations" = xno; then : + CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES" + +fi + ########################### # Dependencies ########################### @@ -11929,9 +11957,13 @@ AM_BACKSLASH='\' GTK_REQUIRED_VERSION=2.12 GIO_UNIX_REQUIRED_VERSION=2.18 PANEL_REQUIRED_VERSION=2.0.0 -INDICATE_REQUIRED_VERSION=0.3.0 -INDICATOR_REQUIRED_VERSION=0.3.5 -DBUSMENUGTK_REQUIRED_VERSION=0.2.8 +INDICATE_REQUIRED_VERSION=0.4.90 +INDICATOR_REQUIRED_VERSION=0.3.19 +DBUSMENUGTK_REQUIRED_VERSION=0.3.94 + + + + @@ -12047,77 +12079,74 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } PKG_CONFIG="" fi - fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPLET" >&5 $as_echo_n "checking for APPLET... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$APPLET_CFLAGS"; then - pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$APPLET_CFLAGS"; then + pkg_cv_APPLET_CFLAGS="$APPLET_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 gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION indicator >= \$INDICATOR_REQUIRED_VERSION - indicate >= \$INDICATE_REQUIRED_VERSION - dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 + indicate-0.5 >= \$INDICATE_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - indicate >= $INDICATE_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 + indicate-0.5 >= $INDICATE_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_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - indicate >= $INDICATE_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` + indicate-0.5 >= $INDICATE_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$APPLET_LIBS"; then - pkg_cv_APPLET_LIBS="$APPLET_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$APPLET_LIBS"; then + pkg_cv_APPLET_LIBS="$APPLET_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 gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION indicator >= \$INDICATOR_REQUIRED_VERSION - indicate >= \$INDICATE_REQUIRED_VERSION - dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 + indicate-0.5 >= \$INDICATE_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - indicate >= $INDICATE_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5 + indicate-0.5 >= $INDICATE_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_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - indicate >= $INDICATE_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` + indicate-0.5 >= $INDICATE_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + 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 @@ -12125,26 +12154,26 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - indicate >= $INDICATE_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION"` + indicate-0.5 >= $INDICATE_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` else - APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - indicate >= $INDICATE_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION"` + indicate-0.5 >= $INDICATE_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$APPLET_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION + as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - indicate >= $INDICATE_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) were not met: + indicate-0.5 >= $INDICATE_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met: $APPLET_PKG_ERRORS @@ -12153,12 +12182,13 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables APPLET_CFLAGS and APPLET_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +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 +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. @@ -12167,13 +12197,13 @@ and APPLET_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else APPLET_CFLAGS=$pkg_cv_APPLET_CFLAGS APPLET_LIBS=$pkg_cv_APPLET_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -13041,6 +13071,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -13064,15 +13095,15 @@ else fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -13080,7 +13111,7 @@ fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -13230,19 +13261,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -13438,7 +13469,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -13492,7 +13523,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13558,10 +13589,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.65, +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13579,11 +13610,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -13605,6 +13641,7 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -13617,7 +13654,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -13626,7 +13663,7 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -13963,7 +14000,7 @@ do "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -14001,7 +14038,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -14018,7 +14055,7 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -14032,18 +14069,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -14132,20 +14169,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -14173,7 +14218,7 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -14258,7 +14303,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -14271,7 +14316,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -14299,7 +14344,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -14326,7 +14371,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -14463,22 +14508,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -14489,19 +14534,19 @@ which seems to be undefined. Please make sure it is defined." >&2;} $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -15281,7 +15326,7 @@ _LT_EOF esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -15309,7 +15354,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -15330,7 +15375,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff --git a/configure.ac b/configure.ac index 2f95071..962b6f0 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-messages.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.7) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.92) AM_MAINTAINER_MODE @@ -22,6 +22,15 @@ AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +AC_ARG_ENABLE([deprecations], + [AS_HELP_STRING([--enable-deprecations], + [allow deprecated API usage @<:@default=yes@:>@])], + [], + [enable_deprecations=yes]) +AS_IF([test "x$enable_deprecations" = xno], + [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"] +) + ########################### # Dependencies ########################### @@ -29,15 +38,15 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) GTK_REQUIRED_VERSION=2.12 GIO_UNIX_REQUIRED_VERSION=2.18 PANEL_REQUIRED_VERSION=2.0.0 -INDICATE_REQUIRED_VERSION=0.3.0 -INDICATOR_REQUIRED_VERSION=0.3.5 -DBUSMENUGTK_REQUIRED_VERSION=0.2.8 +INDICATE_REQUIRED_VERSION=0.4.90 +INDICATOR_REQUIRED_VERSION=0.3.19 +DBUSMENUGTK_REQUIRED_VERSION=0.3.94 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - indicate >= $INDICATE_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) + indicate-0.5 >= $INDICATE_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) diff --git a/data/Makefile.in b/data/Makefile.in index ac4521f..1e7ef9c 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -195,6 +195,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/16x16/Makefile.in b/data/icons/16x16/Makefile.in index 8a0395f..966c4b6 100644 --- a/data/icons/16x16/Makefile.in +++ b/data/icons/16x16/Makefile.in @@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/16x16/categories/Makefile.in b/data/icons/16x16/categories/Makefile.in index 2086a99..e5615cd 100644 --- a/data/icons/16x16/categories/Makefile.in +++ b/data/icons/16x16/categories/Makefile.in @@ -155,6 +155,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/16x16/status/Makefile.in b/data/icons/16x16/status/Makefile.in index 5be4d85..5c32fb8 100644 --- a/data/icons/16x16/status/Makefile.in +++ b/data/icons/16x16/status/Makefile.in @@ -155,6 +155,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/22x22/Makefile.in b/data/icons/22x22/Makefile.in index 28a0462..8a62ef5 100644 --- a/data/icons/22x22/Makefile.in +++ b/data/icons/22x22/Makefile.in @@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/22x22/categories/Makefile.in b/data/icons/22x22/categories/Makefile.in index d466de3..f8ff268 100644 --- a/data/icons/22x22/categories/Makefile.in +++ b/data/icons/22x22/categories/Makefile.in @@ -155,6 +155,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/22x22/status/Makefile.in b/data/icons/22x22/status/Makefile.in index c66693d..42b7d98 100644 --- a/data/icons/22x22/status/Makefile.in +++ b/data/icons/22x22/status/Makefile.in @@ -155,6 +155,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/24x24/Makefile.in b/data/icons/24x24/Makefile.in index a8d125b..aeb223a 100644 --- a/data/icons/24x24/Makefile.in +++ b/data/icons/24x24/Makefile.in @@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/24x24/status/Makefile.in b/data/icons/24x24/status/Makefile.in index c019c3d..41fcc05 100644 --- a/data/icons/24x24/status/Makefile.in +++ b/data/icons/24x24/status/Makefile.in @@ -155,6 +155,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/32x32/Makefile.in b/data/icons/32x32/Makefile.in index 62abec8..e1264c7 100644 --- a/data/icons/32x32/Makefile.in +++ b/data/icons/32x32/Makefile.in @@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/32x32/categories/Makefile.in b/data/icons/32x32/categories/Makefile.in index 72ef864..aa38cf5 100644 --- a/data/icons/32x32/categories/Makefile.in +++ b/data/icons/32x32/categories/Makefile.in @@ -155,6 +155,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/32x32/status/Makefile.in b/data/icons/32x32/status/Makefile.in index dd6680d..8daa1d8 100644 --- a/data/icons/32x32/status/Makefile.in +++ b/data/icons/32x32/status/Makefile.in @@ -155,6 +155,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/48x48/Makefile.in b/data/icons/48x48/Makefile.in index 326dcbc..e204db5 100644 --- a/data/icons/48x48/Makefile.in +++ b/data/icons/48x48/Makefile.in @@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/48x48/status/Makefile.in b/data/icons/48x48/status/Makefile.in index ab588f3..429d41d 100644 --- a/data/icons/48x48/status/Makefile.in +++ b/data/icons/48x48/status/Makefile.in @@ -155,6 +155,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in index bccbd27..cf831de 100644 --- a/data/icons/Makefile.in +++ b/data/icons/Makefile.in @@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/scalable/Makefile.in b/data/icons/scalable/Makefile.in index 1c4a84e..537468e 100644 --- a/data/icons/scalable/Makefile.in +++ b/data/icons/scalable/Makefile.in @@ -171,6 +171,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/scalable/categories/Makefile.in b/data/icons/scalable/categories/Makefile.in index 2ee0d5c..9cd4099 100644 --- a/data/icons/scalable/categories/Makefile.in +++ b/data/icons/scalable/categories/Makefile.in @@ -155,6 +155,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/icons/scalable/status/Makefile.in b/data/icons/scalable/status/Makefile.in index 43ebdd3..77829cc 100644 --- a/data/icons/scalable/status/Makefile.in +++ b/data/icons/scalable/status/Makefile.in @@ -155,6 +155,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/data/indicator-messages.service.in b/data/indicator-messages.service.in index 573a2d6..12e41e6 100644 --- a/data/indicator-messages.service.in +++ b/data/indicator-messages.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.ayatana.indicator.messages +Name=com.canonical.indicator.messages Exec=@libexecdir@/indicator-messages-service diff --git a/debian/changelog b/debian/changelog index 32663ae..5c9118d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,113 @@ +indicator-messages (0.3.92-1) unstable; urgency=low + + * Merge new upstream from Ubuntu. + + -- Evgeni Golov <evgeni@debian.org> Thu, 31 Mar 2011 14:02:12 +0200 + +indicator-messages (0.3.92-0ubuntu3) natty; urgency=low + + * debian/patches/lp_690668.patch + - Memory leak fixes (LP: #690668) + * debian/control + - Bump standards version to 3.9.1 + * debian/source/format + - Use source format 3.0 (quilt) + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 24 Feb 2011 12:13:33 -0500 + +indicator-messages (0.3.92-0ubuntu2) natty; urgency=low + + * src/launcher-menu-item.c + - Make sure menu entries are displayed for launchers that aren't running (LP: #723873) + + + -- Ken VanDine <ken.vandine@canonical.com> Wed, 23 Feb 2011 16:06:37 -0500 + +indicator-messages (0.3.92-0ubuntu1) natty; urgency=low + + * New upstream release. + * Adding in accessible description support + * debian/control: libindicator version 0.3.19 + + -- Ted Gould <ted@ubuntu.com> Thu, 17 Feb 2011 12:18:32 -0600 + +indicator-messages (0.3.91-0ubuntu1) natty; urgency=low + + * New upstream release. + * Fixing the service file + * Adding a log domain + * Fixing type handler for dbusmenu 0.3.94 + * debian/control: dbusmenu to 0.3.94 + + -- Ted Gould <ted@ubuntu.com> Thu, 27 Jan 2011 17:01:34 -0600 + +indicator-messages (0.3.90-0ubuntu1) natty; urgency=low + + [ Ted Gould ] + * New upstream release. + * GDBus Port + * New libindicate and dbusmenu + + [ Ken VanDine ] + * debian/control + - Build depends on libindicate-dev to 0.4.91 + - Build depends on dbusmenu to 0.3.91 + - Set Vcs to ~ubuntu-desktop + * data/indicator-messages.service.in + - Fixed dbus interface name + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 14 Jan 2011 14:50:30 -0600 + +indicator-messages (0.3.11-0ubuntu4) natty; urgency=low + + * debian/control + - Bump build depends for libdbusmenu-* to >= 0.3.90 + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 09 Dec 2010 11:39:40 -0500 + +indicator-messages (0.3.11-0ubuntu3) UNRELEASED; urgency=low + + * debian/control: package description spelling (LP: #658096) + + -- Greg Auger <gregory.auger@googlemail.com> Tue, 09 Nov 2010 18:49:38 +0000 + +indicator-messages (0.3.11-0ubuntu2) maverick; urgency=low + + * Rebuild for libindicator ABI change (LP: #637692) + * debian/control: depends on latest libindicator-dev + + -- Didier Roche <didrocks@ubuntu.com> Wed, 22 Sep 2010 18:39:27 +0200 + +indicator-messages (0.3.11-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Fixing triangles by passing data to callback (LP: #623453) + + -- Ted Gould <ted@ubuntu.com> Thu, 09 Sep 2010 13:24:13 -0500 + +indicator-messages (0.3.10-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Shifting icons into the gutter and adjusting the arrow + padding. + + -- Ted Gould <ted@ubuntu.com> Thu, 26 Aug 2010 15:08:31 -0500 + +indicator-messages (0.3.9-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Remove parens from counts + + -- Ted Gould <ted@ubuntu.com> Thu, 12 Aug 2010 13:10:10 -0500 + +indicator-messages (0.3.8-0ubuntu1) maverick; urgency=low + + * New upstream release. + - running apps triangle indicator overlay + - message counters are now rendered with a nice rounded background + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 29 Jul 2010 13:33:14 -0400 + indicator-messages (0.3.7-1) unstable; urgency=low * Merge from Ubuntu. @@ -360,3 +470,4 @@ indicator-messages (0.1-0ubuntu1) jaunty; urgency=low * debian/copyright: Properly describe license. -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 17 Feb 2009 11:35:38 +0100 + diff --git a/debian/control b/debian/control index c671c35..fba48e2 100644 --- a/debian/control +++ b/debian/control @@ -10,12 +10,12 @@ Build-Depends: debhelper (>= 5.0), gnome-doc-utils, scrollkeeper, intltool, - libindicate-dev (>= 0.3.0), - libindicate-gtk-dev (>= 0.3.0), - libindicator-dev (>= 0.3.5), - libdbusmenu-gtk-dev (>= 0.2.5), - libdbusmenu-glib-dev (>= 0.2.8) -Standards-Version: 3.8.4 + libindicate-dev (>= 0.4.91), + libindicate-gtk-dev (>= 0.4.91), + libindicator-dev (>= 0.3.19), + libdbusmenu-gtk-dev (>= 0.3.94), + libdbusmenu-glib-dev (>= 0.3.94) +Standards-Version: 3.9.1 Homepage: https://launchpad.net/indicator-messages Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/indicator-messages/debian Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/indicator-messages/debian @@ -27,6 +27,6 @@ Recommends: indicator-applet | indicator-renderer Breaks: indicator-applet (<< 0.3.0) Description: indicator that collects messages that need a response A place on the user's desktop that collects messages that need a response. - This menu provides a condenced and collected view of all of those messages + This menu provides a condensed and collected view of all of those messages for quick access, but without making them annoying in times that you want to ignore them. diff --git a/debian/patches/lp_690668.patch b/debian/patches/lp_690668.patch new file mode 100644 index 0000000..48ee7f5 --- /dev/null +++ b/debian/patches/lp_690668.patch @@ -0,0 +1,44 @@ +=== modified file 'src/indicator-messages.c' +--- old/src/indicator-messages.c 2011-01-14 19:10:10 +0000 ++++ new/src/indicator-messages.c 2011-01-21 20:08:53 +0000 +@@ -571,6 +571,7 @@ + width, + height, + GDK_INTERP_BILINEAR); ++ g_object_unref(pixbuf); + } else { + g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf)); + resized_pixbuf = pixbuf; +@@ -578,10 +579,7 @@ + + gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf); + +- /* The other pixbuf should be free'd by the dbusmenu. */ +- if (resized_pixbuf != pixbuf) { +- g_object_unref(resized_pixbuf); +- } ++ g_object_unref(resized_pixbuf); + + gtk_widget_show(mi_data->icon); + } else { +@@ -633,6 +631,7 @@ + width, + height, + GDK_INTERP_BILINEAR); ++ g_object_unref(pixbuf); + } else { + g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf)); + resized_pixbuf = pixbuf; +@@ -640,10 +639,7 @@ + + gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf); + +- /* The other pixbuf should be free'd by the dbusmenu. */ +- if (resized_pixbuf != pixbuf) { +- g_object_unref(resized_pixbuf); +- } ++ g_object_unref(resized_pixbuf); + } + gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5); + gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding); + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6badc75 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +lp_690668.patch diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/src/Makefile.am b/src/Makefile.am index 7c9842a..8597d77 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,9 +9,17 @@ messaginglibdir = $(INDICATORDIR) messaginglib_LTLIBRARIES = libmessaging.la libmessaging_la_SOURCES = \ indicator-messages.c \ - messages-service-client.h \ + gen-messages-service.xml.h \ + gen-messages-service.xml.c \ dbus-data.h -libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror +libmessaging_la_CFLAGS = \ + $(APPLET_CFLAGS) \ + -Wall \ + -Wl,-Bsymbolic-functions \ + -Wl,-z,defs \ + -Wl,--as-needed \ + -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Messages\" libmessaging_la_LIBADD = $(APPLET_LIBS) libmessaging_la_LDFLAGS = -module -avoid-version @@ -23,9 +31,10 @@ indicator_messages_service_SOURCES = \ default-applications.h \ default-applications.c \ messages-service.c \ - messages-service-server.h \ messages-service-dbus.c \ messages-service-dbus.h \ + gen-messages-service.xml.h \ + gen-messages-service.xml.c \ im-menu-item.c \ im-menu-item.h \ app-menu-item.c \ @@ -36,26 +45,29 @@ indicator_messages_service_SOURCES = \ seen-db.h \ dirs.h \ dbus-data.h -indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror +indicator_messages_service_CFLAGS = \ + $(APPLET_CFLAGS) \ + -Wall \ + -Wl,-Bsymbolic-functions \ + -Wl,-z,defs \ + -Wl,--as-needed \ + -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Messages\" indicator_messages_service_LDADD = $(APPLET_LIBS) -messages-service-client.h: $(srcdir)/messages-service.xml - dbus-binding-tool \ - --prefix=_messages_service_client \ - --mode=glib-client \ - --output=messages-service-client.h \ - $(srcdir)/messages-service.xml +gen-%.xml.h: %.xml + @echo "Building $@ from $<" + @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@ -messages-service-server.h: $(srcdir)/messages-service.xml - dbus-binding-tool \ - --prefix=_messages_service_server \ - --mode=glib-server \ - --output=messages-service-server.h \ - $(srcdir)/messages-service.xml +gen-%.xml.c: %.xml + @echo "Building $@ from $<" + echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@ + @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ + @echo ";" >> $@ BUILT_SOURCES = \ - messages-service-client.h \ - messages-service-server.h + gen-messages-service.xml.h \ + gen-messages-service.xml.c CLEANFILES = \ $(BUILT_SOURCES) diff --git a/src/Makefile.in b/src/Makefile.in index 756fbc9..c1ca548 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -72,7 +72,8 @@ am__installdirs = "$(DESTDIR)$(messaginglibdir)" \ LTLIBRARIES = $(messaginglib_LTLIBRARIES) am__DEPENDENCIES_1 = libmessaging_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libmessaging_la_OBJECTS = libmessaging_la-indicator-messages.lo +am_libmessaging_la_OBJECTS = libmessaging_la-indicator-messages.lo \ + libmessaging_la-gen-messages-service.xml.lo libmessaging_la_OBJECTS = $(am_libmessaging_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -86,6 +87,7 @@ am_indicator_messages_service_OBJECTS = \ indicator_messages_service-default-applications.$(OBJEXT) \ indicator_messages_service-messages-service.$(OBJEXT) \ indicator_messages_service-messages-service-dbus.$(OBJEXT) \ + indicator_messages_service-gen-messages-service.xml.$(OBJEXT) \ indicator_messages_service-im-menu-item.$(OBJEXT) \ indicator_messages_service-app-menu-item.$(OBJEXT) \ indicator_messages_service-launcher-menu-item.$(OBJEXT) \ @@ -209,6 +211,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -281,10 +285,19 @@ messaginglibdir = $(INDICATORDIR) messaginglib_LTLIBRARIES = libmessaging.la libmessaging_la_SOURCES = \ indicator-messages.c \ - messages-service-client.h \ + gen-messages-service.xml.h \ + gen-messages-service.xml.c \ dbus-data.h -libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror +libmessaging_la_CFLAGS = \ + $(APPLET_CFLAGS) \ + -Wall \ + -Wl,-Bsymbolic-functions \ + -Wl,-z,defs \ + -Wl,--as-needed \ + -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Messages\" + libmessaging_la_LIBADD = $(APPLET_LIBS) libmessaging_la_LDFLAGS = -module -avoid-version @@ -295,9 +308,10 @@ indicator_messages_service_SOURCES = \ default-applications.h \ default-applications.c \ messages-service.c \ - messages-service-server.h \ messages-service-dbus.c \ messages-service-dbus.h \ + gen-messages-service.xml.h \ + gen-messages-service.xml.c \ im-menu-item.c \ im-menu-item.h \ app-menu-item.c \ @@ -309,11 +323,19 @@ indicator_messages_service_SOURCES = \ dirs.h \ dbus-data.h -indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror +indicator_messages_service_CFLAGS = \ + $(APPLET_CFLAGS) \ + -Wall \ + -Wl,-Bsymbolic-functions \ + -Wl,-z,defs \ + -Wl,--as-needed \ + -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Messages\" + indicator_messages_service_LDADD = $(APPLET_LIBS) BUILT_SOURCES = \ - messages-service-client.h \ - messages-service-server.h + gen-messages-service.xml.h \ + gen-messages-service.xml.c CLEANFILES = \ $(BUILT_SOURCES) @@ -444,11 +466,13 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-app-menu-item.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-default-applications.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-im-menu-item.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-launcher-menu-item.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-messages-service-dbus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-messages-service.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-seen-db.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmessaging_la-gen-messages-service.xml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmessaging_la-indicator-messages.Plo@am__quote@ .c.o: @@ -483,6 +507,14 @@ libmessaging_la-indicator-messages.lo: indicator-messages.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) $(libmessaging_la_CFLAGS) $(CFLAGS) -c -o libmessaging_la-indicator-messages.lo `test -f 'indicator-messages.c' || echo '$(srcdir)/'`indicator-messages.c +libmessaging_la-gen-messages-service.xml.lo: gen-messages-service.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) $(libmessaging_la_CFLAGS) $(CFLAGS) -MT libmessaging_la-gen-messages-service.xml.lo -MD -MP -MF $(DEPDIR)/libmessaging_la-gen-messages-service.xml.Tpo -c -o libmessaging_la-gen-messages-service.xml.lo `test -f 'gen-messages-service.xml.c' || echo '$(srcdir)/'`gen-messages-service.xml.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmessaging_la-gen-messages-service.xml.Tpo $(DEPDIR)/libmessaging_la-gen-messages-service.xml.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-messages-service.xml.c' object='libmessaging_la-gen-messages-service.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) $(libmessaging_la_CFLAGS) $(CFLAGS) -c -o libmessaging_la-gen-messages-service.xml.lo `test -f 'gen-messages-service.xml.c' || echo '$(srcdir)/'`gen-messages-service.xml.c + indicator_messages_service-default-applications.o: default-applications.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -MT indicator_messages_service-default-applications.o -MD -MP -MF $(DEPDIR)/indicator_messages_service-default-applications.Tpo -c -o indicator_messages_service-default-applications.o `test -f 'default-applications.c' || echo '$(srcdir)/'`default-applications.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_messages_service-default-applications.Tpo $(DEPDIR)/indicator_messages_service-default-applications.Po @@ -531,6 +563,22 @@ indicator_messages_service-messages-service-dbus.obj: messages-service-dbus.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -c -o indicator_messages_service-messages-service-dbus.obj `if test -f 'messages-service-dbus.c'; then $(CYGPATH_W) 'messages-service-dbus.c'; else $(CYGPATH_W) '$(srcdir)/messages-service-dbus.c'; fi` +indicator_messages_service-gen-messages-service.xml.o: gen-messages-service.xml.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -MT indicator_messages_service-gen-messages-service.xml.o -MD -MP -MF $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Tpo -c -o indicator_messages_service-gen-messages-service.xml.o `test -f 'gen-messages-service.xml.c' || echo '$(srcdir)/'`gen-messages-service.xml.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Tpo $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-messages-service.xml.c' object='indicator_messages_service-gen-messages-service.xml.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_messages_service_CFLAGS) $(CFLAGS) -c -o indicator_messages_service-gen-messages-service.xml.o `test -f 'gen-messages-service.xml.c' || echo '$(srcdir)/'`gen-messages-service.xml.c + +indicator_messages_service-gen-messages-service.xml.obj: gen-messages-service.xml.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -MT indicator_messages_service-gen-messages-service.xml.obj -MD -MP -MF $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Tpo -c -o indicator_messages_service-gen-messages-service.xml.obj `if test -f 'gen-messages-service.xml.c'; then $(CYGPATH_W) 'gen-messages-service.xml.c'; else $(CYGPATH_W) '$(srcdir)/gen-messages-service.xml.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Tpo $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-messages-service.xml.c' object='indicator_messages_service-gen-messages-service.xml.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_messages_service_CFLAGS) $(CFLAGS) -c -o indicator_messages_service-gen-messages-service.xml.obj `if test -f 'gen-messages-service.xml.c'; then $(CYGPATH_W) 'gen-messages-service.xml.c'; else $(CYGPATH_W) '$(srcdir)/gen-messages-service.xml.c'; fi` + indicator_messages_service-im-menu-item.o: im-menu-item.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -MT indicator_messages_service-im-menu-item.o -MD -MP -MF $(DEPDIR)/indicator_messages_service-im-menu-item.Tpo -c -o indicator_messages_service-im-menu-item.o `test -f 'im-menu-item.c' || echo '$(srcdir)/'`im-menu-item.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_messages_service-im-menu-item.Tpo $(DEPDIR)/indicator_messages_service-im-menu-item.Po @@ -811,19 +859,15 @@ uninstall-am: uninstall-libexecPROGRAMS \ uninstall-messaginglibLTLIBRARIES -messages-service-client.h: $(srcdir)/messages-service.xml - dbus-binding-tool \ - --prefix=_messages_service_client \ - --mode=glib-client \ - --output=messages-service-client.h \ - $(srcdir)/messages-service.xml +gen-%.xml.h: %.xml + @echo "Building $@ from $<" + @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@ -messages-service-server.h: $(srcdir)/messages-service.xml - dbus-binding-tool \ - --prefix=_messages_service_server \ - --mode=glib-server \ - --output=messages-service-server.h \ - $(srcdir)/messages-service.xml +gen-%.xml.c: %.xml + @echo "Building $@ from $<" + echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@ + @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ + @echo ";" >> $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/app-menu-item.c b/src/app-menu-item.c index c276a90..e846914 100644 --- a/src/app-menu-item.c +++ b/src/app-menu-item.c @@ -70,8 +70,8 @@ static void app_menu_item_finalize (GObject *object); static void activate_cb (AppMenuItem * self, guint timestamp, gpointer data); static void count_changed (IndicateListener * listener, IndicateListenerServer * server, guint count, gpointer data); static void count_cb (IndicateListener * listener, IndicateListenerServer * server, guint value, gpointer data); -static void menu_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * menupath, gpointer data); -static void desktop_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data); +static void menu_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * menupath, gpointer data); +static void desktop_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * value, gpointer data); static void update_label (AppMenuItem * self); /* GObject Boilerplate */ @@ -300,7 +300,7 @@ count_cb (IndicateListener * listener, IndicateListenerServer * server, guint va app structure and start sucking data out of it. Mostly the name. */ static void -desktop_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data) +desktop_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * value, gpointer data) { g_return_if_fail(IS_APP_MENU_ITEM(data)); AppMenuItem * self = APP_MENU_ITEM(data); @@ -328,6 +328,7 @@ desktop_cb (IndicateListener * listener, IndicateListenerServer * server, gchar priv->desktop = g_strdup(value); dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); + dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), APPLICATION_MENUITEM_PROP_RUNNING, TRUE); update_label(self); @@ -355,7 +356,6 @@ child_added_cb (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint positio AppMenuItem * self = APP_MENU_ITEM(data); AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(self); DbusmenuMenuitemProxy * mip = dbusmenu_menuitem_proxy_new(child); - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(mip), DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK); priv->shortcuts = g_list_insert(priv->shortcuts, mip, position); @@ -456,7 +456,6 @@ root_changed (DbusmenuClient * client, DbusmenuMenuitem * newroot, gpointer data g_debug("\tProcessing %d children", g_list_length(children)); while (children != NULL) { DbusmenuMenuitemProxy * mip = dbusmenu_menuitem_proxy_new(DBUSMENU_MENUITEM(children->data)); - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(mip), DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK); priv->shortcuts = g_list_append(priv->shortcuts, mip); g_signal_emit(G_OBJECT(self), signals[SHORTCUT_ADDED], 0, mip, TRUE); children = g_list_next(children); @@ -470,7 +469,7 @@ root_changed (DbusmenuClient * client, DbusmenuMenuitem * newroot, gpointer data /* Gets the path to menuitems if there are some. Now we need to make them special. */ static void -menu_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * menupath, gpointer data) +menu_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * menupath, gpointer data) { g_debug("Got Menu: %s", menupath); g_return_if_fail(IS_APP_MENU_ITEM(data)); diff --git a/src/dbus-data.h b/src/dbus-data.h index c16b2b5..abff3aa 100644 --- a/src/dbus-data.h +++ b/src/dbus-data.h @@ -2,15 +2,16 @@ #ifndef __DBUS_DATA_H__ #define __DBUS_DATA_H__ 1 -#define INDICATOR_MESSAGES_DBUS_NAME "org.ayatana.indicator.messages" -#define INDICATOR_MESSAGES_DBUS_OBJECT "/org/ayatana/indicator/messages/menu" +#define INDICATOR_MESSAGES_DBUS_NAME "com.canonical.indicator.messages" +#define INDICATOR_MESSAGES_DBUS_OBJECT "/com/canonical/indicator/messages/menu" -#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT "/org/ayatana/indicator/messages/service" -#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE "org.ayatana.indicator.messages.service" +#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT "/com/canonical/indicator/messages/service" +#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE "com.canonical.indicator.messages.service" #define APPLICATION_MENUITEM_TYPE "application-item" -#define APPLICATION_MENUITEM_PROP_NAME "app-name" -#define APPLICATION_MENUITEM_PROP_ICON "app-icon" +#define APPLICATION_MENUITEM_PROP_NAME "label" +#define APPLICATION_MENUITEM_PROP_ICON "icon-name" +#define APPLICATION_MENUITEM_PROP_RUNNING "app-running" #define INDICATOR_MENUITEM_TYPE "indicator-item" #define INDICATOR_MENUITEM_PROP_LABEL "indicator-label" diff --git a/src/gen-messages-service.xml.c b/src/gen-messages-service.xml.c new file mode 100644 index 0000000..0a1c0d1 --- /dev/null +++ b/src/gen-messages-service.xml.c @@ -0,0 +1,27 @@ +const char * _messages_service = +"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +"<node name=\"/\">\n" +" <interface name=\"com.canonical.indicator.messages.service\">\n" +"\n" +"<!-- Methods -->\n" +" <method name=\"Watch\">\n" +" <annotation name=\"org.freedesktop.DBus.GLib.Async\" value=\"true\" />\n" +" </method>\n" +" <method name=\"AttentionRequested\">\n" +" <arg type=\"b\" name=\"dot\" direction=\"out\" />\n" +" </method>\n" +" <method name=\"IconShown\">\n" +" <arg type=\"b\" name=\"hidden\" direction=\"out\" />\n" +" </method>\n" +"\n" +"<!-- Signals -->\n" +" <signal name=\"AttentionChanged\">\n" +" <arg type=\"b\" name=\"dot\" direction=\"out\" />\n" +" </signal>\n" +" <signal name=\"IconChanged\">\n" +" <arg type=\"b\" name=\"hidden\" direction=\"out\" />\n" +" </signal>\n" +"\n" +" </interface>\n" +"</node>\n" +; diff --git a/src/gen-messages-service.xml.h b/src/gen-messages-service.xml.h new file mode 100644 index 0000000..7884498 --- /dev/null +++ b/src/gen-messages-service.xml.h @@ -0,0 +1 @@ +extern const char * _messages_service; diff --git a/src/im-menu-item.c b/src/im-menu-item.c index 5841d81..25fea52 100644 --- a/src/im-menu-item.c +++ b/src/im-menu-item.c @@ -348,7 +348,7 @@ count_cb (IndicateListener * listener, IndicateListenerServer * server, Indicate g_free(priv->count); } - priv->count = g_strdup_printf("(%s)", propertydata); + priv->count = g_strdup_printf("%s", propertydata); dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), INDICATOR_MENUITEM_PROP_RIGHT, priv->count); return; @@ -358,7 +358,7 @@ count_cb (IndicateListener * listener, IndicateListenerServer * server, Indicate this indicator should be calling for attention or not. If we are, we need to signal that. */ static void -attention_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const GValue * propertydata, gpointer data) +attention_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GVariant * propertydata, gpointer data) { g_debug("Got Attention Information"); ImMenuItem * self = IM_MENU_ITEM(data); @@ -373,10 +373,10 @@ attention_cb (IndicateListener * listener, IndicateListenerServer * server, Indi ImMenuItemPrivate * priv = IM_MENU_ITEM_GET_PRIVATE(self); gboolean wantit; - if (G_VALUE_HOLDS_BOOLEAN(propertydata)) { - wantit = g_value_get_boolean(propertydata); - } else if (G_VALUE_HOLDS_STRING(propertydata)) { - const gchar * propstring = g_value_get_string(propertydata); + if (g_variant_is_of_type(propertydata, G_VARIANT_TYPE_BOOLEAN)) { + wantit = g_variant_get_boolean(propertydata); + } else if (g_variant_is_of_type(propertydata, G_VARIANT_TYPE_STRING)) { + const gchar * propstring = g_variant_get_string(propertydata, NULL); if (propstring == NULL || propstring[0] == '\0' || !g_strcmp0(propstring, "false")) { wantit = FALSE; @@ -427,7 +427,7 @@ indicator_modified_cb (IndicateListener * listener, IndicateListenerServer * ser } else if (!g_strcmp0(property, INDICATE_INDICATOR_MESSAGES_PROP_COUNT)) { indicate_listener_get_property(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_COUNT, count_cb, self); } else if (!g_strcmp0(property, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION)) { - indicate_listener_get_property_value(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self); + indicate_listener_get_property_variant(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self); } else if (!g_strcmp0(property, "sender")) { /* This is a compatibility string with v1 and should be removed */ g_debug("Indicator is using 'sender' property which is a v1 string."); @@ -460,7 +460,7 @@ im_menu_item_new (IndicateListener * listener, IndicateListenerServer * server, indicate_listener_get_property_time(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_TIME, time_cb, self); indicate_listener_get_property(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ICON, icon_cb, self); indicate_listener_get_property(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_COUNT, count_cb, self); - indicate_listener_get_property_value(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self); + indicate_listener_get_property_variant(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self); indicate_listener_get_property(listener, server, indicator, "sender", sender_cb, self); g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL); diff --git a/src/indicator-messages.c b/src/indicator-messages.c index f47eccd..ed6caa6 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -23,11 +23,10 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <string.h> #include <glib.h> #include <glib-object.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <libdbusmenu-gtk/menu.h> #include <libdbusmenu-gtk/menuitem.h> -#include <dbus/dbus-glib.h> -#include <dbus/dbus-glib-bindings.h> #include <libindicator/indicator.h> #include <libindicator/indicator-object.h> @@ -35,7 +34,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libindicator/indicator-service-manager.h> #include "dbus-data.h" -#include "messages-service-client.h" +#include "gen-messages-service.xml.h" #define INDICATOR_MESSAGES_TYPE (indicator_messages_get_type ()) #define INDICATOR_MESSAGES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_MESSAGES_TYPE, IndicatorMessages)) @@ -44,11 +43,17 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #define IS_INDICATOR_MESSAGES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_MESSAGES_TYPE)) #define INDICATOR_MESSAGES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_MESSAGES_TYPE, IndicatorMessagesClass)) +#define M_PI 3.1415926535897932384626433832795028841971693993751 + +#define RIGHT_LABEL_FONT_SIZE 12 +#define RIGHT_LABEL_RADIUS 20 + typedef struct _IndicatorMessages IndicatorMessages; typedef struct _IndicatorMessagesClass IndicatorMessagesClass; struct _IndicatorMessagesClass { IndicatorObjectClass parent_class; + void (*update_a11y_desc) (IndicatorServiceManager * service, gpointer * user_data); }; struct _IndicatorMessages { @@ -64,8 +69,12 @@ INDICATOR_SET_TYPE(INDICATOR_MESSAGES_TYPE) /* Globals */ static GtkWidget * main_image = NULL; -static DBusGProxy * icon_proxy = NULL; +static GDBusProxy * icon_proxy = NULL; static GtkSizeGroup * indicator_right_group = NULL; +static GDBusNodeInfo * bus_node_info = NULL; +static GDBusInterfaceInfo * bus_interface_info = NULL; +static const gchar * accessible_desc = NULL; +static IndicatorObject * indicator = NULL; /* Prototypes */ static void indicator_messages_class_init (IndicatorMessagesClass *klass); @@ -74,12 +83,34 @@ static void indicator_messages_dispose (GObject *object); static void indicator_messages_finalize (GObject *object); static GtkImage * get_icon (IndicatorObject * io); static GtkMenu * get_menu (IndicatorObject * io); +static const gchar * get_accessible_desc (IndicatorObject * io); static void connection_change (IndicatorServiceManager * sm, gboolean connected, gpointer user_data); G_DEFINE_TYPE (IndicatorMessages, indicator_messages, INDICATOR_OBJECT_TYPE); +static void +update_a11y_desc (void) +{ + g_return_if_fail(IS_INDICATOR_MESSAGES(indicator)); + + GList *entries = indicator_object_get_entries(indicator); + IndicatorObjectEntry * entry = (IndicatorObjectEntry *)entries->data; + + entry->accessible_desc = get_accessible_desc(indicator); + + g_signal_emit(G_OBJECT(indicator), + INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID, + 0, + entry, + TRUE); + + g_list_free(entries); + + return; +} + /* Initialize the one-timers */ static void indicator_messages_class_init (IndicatorMessagesClass *klass) @@ -93,6 +124,25 @@ indicator_messages_class_init (IndicatorMessagesClass *klass) io_class->get_image = get_icon; io_class->get_menu = get_menu; + io_class->get_accessible_desc = get_accessible_desc; + + if (bus_node_info == NULL) { + GError * error = NULL; + + bus_node_info = g_dbus_node_info_new_for_xml(_messages_service, &error); + if (error != NULL) { + g_error("Unable to parse Messaging Menu Interface description: %s", error->message); + g_error_free(error); + } + } + + if (bus_interface_info == NULL) { + bus_interface_info = g_dbus_node_info_lookup_interface(bus_node_info, INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE); + + if (bus_interface_info == NULL) { + g_error("Unable to find interface '" INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE "'"); + } + } return; } @@ -108,6 +158,8 @@ indicator_messages_init (IndicatorMessages *self) self->service = indicator_service_manager_new_version(INDICATOR_MESSAGES_DBUS_NAME, 1); g_signal_connect(self->service, INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_change), self); + indicator = INDICATOR_OBJECT(self); + return; } @@ -140,54 +192,85 @@ indicator_messages_finalize (GObject *object) /* Functions */ -/* Called everytime the attention changes in the service. */ +/* Signal off of the proxy */ static void -attention_changed_cb (DBusGProxy * proxy, gboolean dot, gpointer userdata) +proxy_signal (GDBusProxy * proxy, const gchar * sender, const gchar * signal, GVariant * params, gpointer user_data) { - if (dot) { - indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages-new"); - } else { - indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages"); - } - return; -} + gboolean prop = g_variant_get_boolean(g_variant_get_child_value(params, 0)); -/* Change the icon to whether it should be visible or not */ -static void -icon_changed_cb (DBusGProxy * proxy, gboolean hidden, gpointer userdata) -{ - if (hidden) { - gtk_widget_hide(main_image); + if (g_strcmp0("AttentionChanged", signal) == 0) { + if (prop) { + indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages-new"); + accessible_desc = _("New Messages"); + } else { + indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages"); + accessible_desc = _("Messages"); + } + } else if (g_strcmp0("IconChanged", signal) == 0) { + if (prop) { + gtk_widget_hide(main_image); + } else { + gtk_widget_show(main_image); + } } else { - gtk_widget_show(main_image); + g_warning("Unknown signal %s", signal); } + + update_a11y_desc(); + return; } /* Callback from getting the attention status from the service. */ static void -attention_cb (DBusGProxy * proxy, gboolean dot, GError * error, gpointer userdata) +attention_cb (GObject * object, GAsyncResult * ares, gpointer user_data) { + GError * error = NULL; + GVariant * res = g_dbus_proxy_call_finish(G_DBUS_PROXY(object), ares, &error); + if (error != NULL) { g_warning("Unable to get attention status: %s", error->message); g_error_free(error); return; } - return attention_changed_cb(proxy, dot, userdata); + gboolean prop = g_variant_get_boolean(g_variant_get_child_value(res, 0)); + + if (prop) { + indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages-new"); + accessible_desc = _("New Messages"); + } else { + indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages"); + accessible_desc = _("Messages"); + } + + update_a11y_desc(); + + return; } /* Change from getting the icon visibility from the service */ static void -icon_cb (DBusGProxy * proxy, gboolean hidden, GError * error, gpointer userdata) +icon_cb (GObject * object, GAsyncResult * ares, gpointer user_data) { + GError * error = NULL; + GVariant * res = g_dbus_proxy_call_finish(G_DBUS_PROXY(object), ares, &error); + if (error != NULL) { g_warning("Unable to get icon visibility: %s", error->message); g_error_free(error); return; } - return icon_changed_cb(proxy, hidden, userdata); + gboolean prop = g_variant_get_boolean(g_variant_get_child_value(res, 0)); + + if (prop) { + gtk_widget_hide(main_image); + } else { + gtk_widget_show(main_image); + } + + return; } static guint connection_drop_timeout = 0; @@ -204,6 +287,43 @@ connection_drop_cb (gpointer user_data) return FALSE; } +/* Proxy is setup now.. whoo! */ +static void +proxy_ready_cb (GObject * obj, GAsyncResult * res, gpointer user_data) +{ + GError * error = NULL; + GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error); + + if (error != NULL) { + g_warning("Unable to get proxy of service: %s", error->message); + g_error_free(error); + return; + } + + icon_proxy = proxy; + + g_signal_connect(G_OBJECT(proxy), "g-signal", G_CALLBACK(proxy_signal), user_data); + + g_dbus_proxy_call(icon_proxy, + "AttentionRequested", + NULL, /* params */ + G_DBUS_CALL_FLAGS_NONE, + -1, /* timeout */ + NULL, /* cancel */ + attention_cb, + user_data); + g_dbus_proxy_call(icon_proxy, + "IconShown", + NULL, /* params */ + G_DBUS_CALL_FLAGS_NONE, + -1, /* timeout */ + NULL, /* cancel */ + icon_cb, + user_data); + + return; +} + /* Sets up all the icon information in the proxy. */ static void connection_change (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) @@ -220,51 +340,46 @@ connection_change (IndicatorServiceManager * sm, gboolean connected, gpointer us return; } - DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); - if (connection == NULL) { - g_warning("Unable to get session bus"); - return; - } - if (icon_proxy == NULL) { - icon_proxy = dbus_g_proxy_new_for_name(connection, - INDICATOR_MESSAGES_DBUS_NAME, - INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT, - INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE); - if (icon_proxy == NULL) { - g_warning("Unable to get messages service interface."); - return; - } - - dbus_g_proxy_add_signal(icon_proxy, "AttentionChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID); - dbus_g_proxy_connect_signal(icon_proxy, - "AttentionChanged", - G_CALLBACK(attention_changed_cb), - NULL, - NULL); - - dbus_g_proxy_add_signal(icon_proxy, "IconChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID); - dbus_g_proxy_connect_signal(icon_proxy, - "IconChanged", - G_CALLBACK(icon_changed_cb), - NULL, - NULL); + g_dbus_proxy_new_for_bus(G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_NONE, + bus_interface_info, + INDICATOR_MESSAGES_DBUS_NAME, + INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT, + INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE, + NULL, /* cancel */ + proxy_ready_cb, + sm); + } else { + g_dbus_proxy_call(icon_proxy, + "AttentionRequested", + NULL, /* params */ + G_DBUS_CALL_FLAGS_NONE, + -1, /* timeout */ + NULL, /* cancel */ + attention_cb, + sm); + g_dbus_proxy_call(icon_proxy, + "IconShown", + NULL, /* params */ + G_DBUS_CALL_FLAGS_NONE, + -1, /* timeout */ + NULL, /* cancel */ + icon_cb, + sm); } - org_ayatana_indicator_messages_service_attention_requested_async(icon_proxy, attention_cb, NULL); - org_ayatana_indicator_messages_service_icon_shown_async(icon_proxy, icon_cb, NULL); - return; } /* Sets the icon when it changes. */ static void -application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, gpointer user_data) +application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, gpointer user_data) { if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_ICON)) { /* Set the main icon */ if (GTK_IS_IMAGE(user_data)) { - gtk_image_set_from_icon_name(GTK_IMAGE(user_data), g_value_get_string(value), GTK_ICON_SIZE_MENU); + gtk_image_set_from_icon_name(GTK_IMAGE(user_data), g_variant_get_string(value, NULL), GTK_ICON_SIZE_MENU); } } @@ -273,24 +388,150 @@ application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, /* Sets the label when it changes. */ static void -application_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, gpointer user_data) +application_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, gpointer user_data) { if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_NAME)) { /* Set the main label */ if (GTK_IS_LABEL(user_data)) { - gtk_label_set_text(GTK_LABEL(user_data), g_value_get_string(value)); + gtk_label_set_text(GTK_LABEL(user_data), g_variant_get_string(value, NULL)); } } + if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_RUNNING)) { + /* TODO: should hide/show the triangle live if the menu was open. + In practice, this is rarely needed. */ + } + return; } +/* Draws a triangle on the left, using fg[STATE_TYPE] color. */ +static gboolean +application_triangle_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data) +{ + GtkAllocation allocation; + GtkStyle *style; + cairo_t *cr; + int x, y, arrow_width, arrow_height; + + if (!GTK_IS_WIDGET (widget)) return FALSE; + if (!DBUSMENU_IS_MENUITEM (data)) return FALSE; + + /* render the triangle indicator only if the application is running */ + if (! dbusmenu_menuitem_property_get_bool (DBUSMENU_MENUITEM(data), APPLICATION_MENUITEM_PROP_RUNNING)) + return FALSE;; + + /* get style */ + style = gtk_widget_get_style (widget); + + /* set arrow position / dimensions */ + arrow_width = 5; /* the pixel-based reference triangle is 5x9 */ + arrow_height = 9; + gtk_widget_get_allocation (widget, &allocation); + x = allocation.x; + y = allocation.y + allocation.height/2.0 - (double)arrow_height/2.0; + + /* initialize cairo drawing area */ + cr = (cairo_t*) gdk_cairo_create (gtk_widget_get_window (widget)); + + /* set line width */ + cairo_set_line_width (cr, 1.0); + + /* cairo drawing code */ + cairo_move_to (cr, x, y); + cairo_line_to (cr, x, y + arrow_height); + cairo_line_to (cr, x + arrow_width, y + (double)arrow_height/2.0); + cairo_close_path (cr); + cairo_set_source_rgb (cr, style->fg[gtk_widget_get_state(widget)].red/65535.0, + style->fg[gtk_widget_get_state(widget)].green/65535.0, + style->fg[gtk_widget_get_state(widget)].blue/65535.0); + cairo_fill (cr); + + /* remember to destroy cairo context to avoid leaks */ + cairo_destroy (cr); + + return FALSE; +} + +/* Custom function to draw rounded rectangle with max radius */ +static void +custom_cairo_rounded_rectangle (cairo_t *cr, + double x, double y, double w, double h) +{ + double radius = MIN (w/2.0, h/2.0); + + cairo_move_to (cr, x+radius, y); + cairo_arc (cr, x+w-radius, y+radius, radius, M_PI*1.5, M_PI*2); + cairo_arc (cr, x+w-radius, y+h-radius, radius, 0, M_PI*0.5); + cairo_arc (cr, x+radius, y+h-radius, radius, M_PI*0.5, M_PI); + cairo_arc (cr, x+radius, y+radius, radius, M_PI, M_PI*1.5); +} + +/* Draws a rounded rectangle with text inside. */ +static gboolean +numbers_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data) +{ + GtkAllocation allocation; + GtkStyle *style; + cairo_t *cr; + double x, y, w, h; + PangoLayout * layout; + gint font_size = RIGHT_LABEL_FONT_SIZE; + + if (!GTK_IS_WIDGET (widget)) return FALSE; + + /* get style */ + style = gtk_widget_get_style (widget); + + /* set arrow position / dimensions */ + gtk_widget_get_allocation (widget, &allocation); + w = allocation.width; + h = allocation.height; + x = allocation.x; + y = allocation.y; + + layout = gtk_label_get_layout (GTK_LABEL(widget)); + + /* This does not work, don't ask me why but font_size is 0. + * I wanted to use a dynamic font size to adjust the padding on left/right edges + * of the rounded rectangle. Andrea Cimitan */ + /* const PangoFontDescription * font_description = pango_layout_get_font_description (layout); + font_size = pango_font_description_get_size (font_description); */ + + /* initialize cairo drawing area */ + cr = (cairo_t*) gdk_cairo_create (gtk_widget_get_window (widget)); + + /* set line width */ + cairo_set_line_width (cr, 1.0); + + cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD); + + /* cairo drawing code */ + custom_cairo_rounded_rectangle (cr, x - font_size/2.0, y, w + font_size, h); + + cairo_set_source_rgba (cr, style->fg[gtk_widget_get_state(widget)].red/65535.0, + style->fg[gtk_widget_get_state(widget)].green/65535.0, + style->fg[gtk_widget_get_state(widget)].blue/65535.0, 0.5); + + cairo_move_to (cr, x, y); + pango_cairo_layout_path (cr, layout); + cairo_fill (cr); + + /* remember to destroy cairo context to avoid leaks */ + cairo_destroy (cr); + + return TRUE; +} + /* Builds a menu item representing a running application in the messaging menu */ static gboolean -new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) +new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data) { + g_debug ("%s (\"%s\")", __func__, dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME)); + GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new()); + gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(gmi), TRUE); gint padding = 4; gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL); @@ -302,9 +543,12 @@ new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); GtkWidget * icon = gtk_image_new_from_icon_name(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_ICON), GTK_ICON_SIZE_MENU); - gtk_widget_set_size_request(icon, width, height); - gtk_misc_set_alignment(GTK_MISC(icon), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, padding); + gtk_widget_set_size_request(icon, width + + 5 /* ref triangle is 5x9 pixels */ + + 2 /* padding */, + height); + gtk_misc_set_alignment(GTK_MISC(icon), 1.0 /* right aligned */, 0.5); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(gmi), icon); gtk_widget_show(icon); /* Application name in a label */ @@ -317,25 +561,17 @@ new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu gtk_container_add(GTK_CONTAINER(gmi), hbox); gtk_widget_show(hbox); - /* Build up the running icon */ - GtkWidget * running_icon = gtk_image_new_from_icon_name("application-running", GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(gmi), running_icon); - gtk_widget_show(running_icon); - - /* Make sure it always appears */ - gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(gmi), TRUE); - /* Attach some of the standard GTK stuff */ dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent); /* Make sure we can handle the label changing */ g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(application_prop_change_cb), label); g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(application_icon_change_cb), icon); + g_signal_connect_after(G_OBJECT (gmi), "expose_event", G_CALLBACK (application_triangle_draw_cb), newitem); return TRUE; } - typedef struct _indicator_item_t indicator_item_t; struct _indicator_item_t { GtkWidget * icon; @@ -346,14 +582,14 @@ struct _indicator_item_t { /* Whenever we have a property change on a DbusmenuMenuitem we need to be responsive to that. */ static void -indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data) +indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, indicator_item_t * mi_data) { if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) { /* Set the main label */ - gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value)); + gtk_label_set_text(GTK_LABEL(mi_data->label), g_variant_get_string(value, NULL)); } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT)) { /* Set the right label */ - gtk_label_set_text(GTK_LABEL(mi_data->right), g_value_get_string(value)); + gtk_label_set_text(GTK_LABEL(mi_data->right), g_variant_get_string(value, NULL)); } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_ICON)) { /* We don't use the value here, which is probably less efficient, but it's easier to use the easy function. And since th value @@ -383,6 +619,10 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, i if (resized_pixbuf != pixbuf) { g_object_unref(resized_pixbuf); } + + gtk_widget_show(mi_data->icon); + } else { + gtk_widget_hide(mi_data->icon); } } @@ -394,7 +634,7 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, i shifting over and putting the icon in with some right side text that'll be determined by the service. */ static gboolean -new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) +new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data) { g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE); g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE); @@ -405,6 +645,7 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new()); gint padding = 4; + gint font_size = RIGHT_LABEL_FONT_SIZE; gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL); GtkWidget * hbox = gtk_hbox_new(FALSE, 0); @@ -443,7 +684,10 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm } gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5); gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding); - gtk_widget_show(mi_data->icon); + + if (pixbuf != NULL) { + gtk_widget_show(mi_data->icon); + } /* Label, probably a username, chat room or mailbox name */ mi_data->label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL)); @@ -455,8 +699,12 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm item. */ mi_data->right = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_RIGHT)); gtk_size_group_add_widget(indicator_right_group, mi_data->right); + /* install extra decoration overlay */ + g_signal_connect (G_OBJECT (mi_data->right), "expose_event", + G_CALLBACK (numbers_draw_cb), NULL); + gtk_misc_set_alignment(GTK_MISC(mi_data->right), 1.0, 0.5); - gtk_box_pack_start(GTK_BOX(hbox), mi_data->right, FALSE, FALSE, padding); + gtk_box_pack_start(GTK_BOX(hbox), mi_data->right, FALSE, FALSE, padding + font_size/2.0); gtk_widget_show(mi_data->right); gtk_container_add(GTK_CONTAINER(gmi), hbox); @@ -495,3 +743,9 @@ get_menu (IndicatorObject * io) return GTK_MENU(menu); } +/* Returns the accessible description of the indicator */ +static const gchar * +get_accessible_desc (IndicatorObject * io) +{ + return accessible_desc; +} diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index 63e5594..60880ad 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -97,6 +97,8 @@ launcher_menu_item_init (LauncherMenuItem *self) priv->ids = NULL; priv->shortcuts = NULL; + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, APPLICATION_MENUITEM_TYPE); + return; } @@ -197,9 +199,9 @@ launcher_menu_item_new (const gchar * desktop_file) gint i; for (i = 0; nicks[i] != NULL; i++) { DbusmenuMenuitem * mi = dbusmenu_menuitem_new(); + dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_TYPE, APPLICATION_MENUITEM_TYPE); g_object_set_data(G_OBJECT(mi), NICK_DATA, (gpointer)nicks[i]); - dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK); dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, indicator_desktop_shortcuts_nick_get_name(priv->ids, nicks[i])); g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(nick_activate_cb), self); diff --git a/src/messages-service-client.h b/src/messages-service-client.h deleted file mode 100644 index 2a858e8..0000000 --- a/src/messages-service-client.h +++ /dev/null @@ -1,139 +0,0 @@ -/* Generated by dbus-binding-tool; do not edit! */ - -#include <glib.h> -#include <dbus/dbus-glib.h> - -G_BEGIN_DECLS - -#ifndef _DBUS_GLIB_ASYNC_DATA_FREE -#define _DBUS_GLIB_ASYNC_DATA_FREE -static -#ifdef G_HAVE_INLINE -inline -#endif -void -_dbus_glib_async_data_free (gpointer stuff) -{ - g_slice_free (DBusGAsyncData, stuff); -} -#endif - -#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_indicator_messages_service -#define DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_indicator_messages_service - -static -#ifdef G_HAVE_INLINE -inline -#endif -gboolean -org_ayatana_indicator_messages_service_watch (DBusGProxy *proxy, GError **error) - -{ - return dbus_g_proxy_call (proxy, "Watch", error, G_TYPE_INVALID, G_TYPE_INVALID); -} - -typedef void (*org_ayatana_indicator_messages_service_watch_reply) (DBusGProxy *proxy, GError *error, gpointer userdata); - -static void -org_ayatana_indicator_messages_service_watch_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) -{ - DBusGAsyncData *data = (DBusGAsyncData*) user_data; - GError *error = NULL; - dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID); - (*(org_ayatana_indicator_messages_service_watch_reply)data->cb) (proxy, error, data->userdata); - return; -} - -static -#ifdef G_HAVE_INLINE -inline -#endif -DBusGProxyCall* -org_ayatana_indicator_messages_service_watch_async (DBusGProxy *proxy, org_ayatana_indicator_messages_service_watch_reply callback, gpointer userdata) - -{ - DBusGAsyncData *stuff; - stuff = g_slice_new (DBusGAsyncData); - stuff->cb = G_CALLBACK (callback); - stuff->userdata = userdata; - return dbus_g_proxy_begin_call (proxy, "Watch", org_ayatana_indicator_messages_service_watch_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID); -} -static -#ifdef G_HAVE_INLINE -inline -#endif -gboolean -org_ayatana_indicator_messages_service_attention_requested (DBusGProxy *proxy, gboolean* OUT_dot, GError **error) - -{ - return dbus_g_proxy_call (proxy, "AttentionRequested", error, G_TYPE_INVALID, G_TYPE_BOOLEAN, OUT_dot, G_TYPE_INVALID); -} - -typedef void (*org_ayatana_indicator_messages_service_attention_requested_reply) (DBusGProxy *proxy, gboolean OUT_dot, GError *error, gpointer userdata); - -static void -org_ayatana_indicator_messages_service_attention_requested_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) -{ - DBusGAsyncData *data = (DBusGAsyncData*) user_data; - GError *error = NULL; - gboolean OUT_dot; - dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_BOOLEAN, &OUT_dot, G_TYPE_INVALID); - (*(org_ayatana_indicator_messages_service_attention_requested_reply)data->cb) (proxy, OUT_dot, error, data->userdata); - return; -} - -static -#ifdef G_HAVE_INLINE -inline -#endif -DBusGProxyCall* -org_ayatana_indicator_messages_service_attention_requested_async (DBusGProxy *proxy, org_ayatana_indicator_messages_service_attention_requested_reply callback, gpointer userdata) - -{ - DBusGAsyncData *stuff; - stuff = g_slice_new (DBusGAsyncData); - stuff->cb = G_CALLBACK (callback); - stuff->userdata = userdata; - return dbus_g_proxy_begin_call (proxy, "AttentionRequested", org_ayatana_indicator_messages_service_attention_requested_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID); -} -static -#ifdef G_HAVE_INLINE -inline -#endif -gboolean -org_ayatana_indicator_messages_service_icon_shown (DBusGProxy *proxy, gboolean* OUT_hidden, GError **error) - -{ - return dbus_g_proxy_call (proxy, "IconShown", error, G_TYPE_INVALID, G_TYPE_BOOLEAN, OUT_hidden, G_TYPE_INVALID); -} - -typedef void (*org_ayatana_indicator_messages_service_icon_shown_reply) (DBusGProxy *proxy, gboolean OUT_hidden, GError *error, gpointer userdata); - -static void -org_ayatana_indicator_messages_service_icon_shown_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) -{ - DBusGAsyncData *data = (DBusGAsyncData*) user_data; - GError *error = NULL; - gboolean OUT_hidden; - dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_BOOLEAN, &OUT_hidden, G_TYPE_INVALID); - (*(org_ayatana_indicator_messages_service_icon_shown_reply)data->cb) (proxy, OUT_hidden, error, data->userdata); - return; -} - -static -#ifdef G_HAVE_INLINE -inline -#endif -DBusGProxyCall* -org_ayatana_indicator_messages_service_icon_shown_async (DBusGProxy *proxy, org_ayatana_indicator_messages_service_icon_shown_reply callback, gpointer userdata) - -{ - DBusGAsyncData *stuff; - stuff = g_slice_new (DBusGAsyncData); - stuff->cb = G_CALLBACK (callback); - stuff->userdata = userdata; - return dbus_g_proxy_begin_call (proxy, "IconShown", org_ayatana_indicator_messages_service_icon_shown_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID); -} -#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_indicator_messages_service */ - -G_END_DECLS diff --git a/src/messages-service-dbus.c b/src/messages-service-dbus.c index d9c0e8d..6cc33e0 100644 --- a/src/messages-service-dbus.c +++ b/src/messages-service-dbus.c @@ -24,9 +24,10 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include "config.h" #endif -#include <dbus/dbus-glib.h> +#include <gio/gio.h> #include "messages-service-dbus.h" #include "dbus-data.h" +#include "gen-messages-service.xml.h" enum { ATTENTION_CHANGED, @@ -40,6 +41,7 @@ typedef struct _MessageServiceDbusPrivate MessageServiceDbusPrivate; struct _MessageServiceDbusPrivate { + GDBusConnection * connection; gboolean dot; gboolean hidden; }; @@ -51,15 +53,26 @@ static void message_service_dbus_class_init (MessageServiceDbusClass *klass); static void message_service_dbus_init (MessageServiceDbus *self); static void message_service_dbus_dispose (GObject *object); static void message_service_dbus_finalize (GObject *object); - -static void _messages_service_server_watch (void); -static gboolean _messages_service_server_attention_requested (MessageServiceDbus * self, gboolean * dot, GError ** error); -static gboolean _messages_service_server_icon_shown (MessageServiceDbus * self, gboolean * hidden, GError ** error); - -#include "messages-service-server.h" +static void bus_method_call (GDBusConnection * connection, + const gchar * sender, + const gchar * path, + const gchar * interface, + const gchar * method, + GVariant * params, + GDBusMethodInvocation * invocation, + gpointer user_data); + +static GDBusNodeInfo * bus_node_info = NULL; +static GDBusInterfaceInfo * bus_interface_info = NULL; +static const GDBusInterfaceVTable bus_interface_table = { + method_call: bus_method_call, + get_property: NULL, /* No properties */ + set_property: NULL /* No properties */ +}; G_DEFINE_TYPE (MessageServiceDbus, message_service_dbus, G_TYPE_OBJECT); + static void message_service_dbus_class_init (MessageServiceDbusClass *klass) { @@ -86,8 +99,57 @@ message_service_dbus_class_init (MessageServiceDbusClass *klass) g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + if (bus_node_info == NULL) { + GError * error = NULL; + + bus_node_info = g_dbus_node_info_new_for_xml(_messages_service, &error); + if (error != NULL) { + g_error("Unable to parse Messaging Menu Interface description: %s", error->message); + g_error_free(error); + } + } + + if (bus_interface_info == NULL) { + bus_interface_info = g_dbus_node_info_lookup_interface(bus_node_info, INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE); + + if (bus_interface_info == NULL) { + g_error("Unable to find interface '" INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE "'"); + } + } + + return; +} + +static void +connection_cb (GObject * object, GAsyncResult * res, gpointer user_data) +{ + GError * error = NULL; + GDBusConnection * connection = g_bus_get_finish(res, &error); + + if (error != NULL) { + g_error("Unable to connect to the session bus: %s", error->message); + g_error_free(error); + return; + } + + MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(user_data); + priv->connection = connection; + + g_dbus_connection_register_object(connection, + INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT, + bus_interface_info, + &bus_interface_table, + user_data, + NULL, /* destroy */ + &error); + + if (error != NULL) { + g_error("Unable to register on session bus: %s", error->message); + g_error_free(error); + return; + } - dbus_g_object_type_install_info(MESSAGE_SERVICE_DBUS_TYPE, &dbus_glib__messages_service_server_object_info); + g_debug("Service on session bus"); return; } @@ -95,10 +157,7 @@ message_service_dbus_class_init (MessageServiceDbusClass *klass) static void message_service_dbus_init (MessageServiceDbus *self) { - DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); - dbus_g_connection_register_g_object(connection, - INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT, - G_OBJECT(self)); + g_bus_get(G_BUS_TYPE_SESSION, NULL, connection_cb, self); MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(self); @@ -111,7 +170,12 @@ message_service_dbus_init (MessageServiceDbus *self) static void message_service_dbus_dispose (GObject *object) { + MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(object); + if (priv->connection != NULL) { + g_object_unref(priv->connection); + priv->connection = NULL; + } G_OBJECT_CLASS (message_service_dbus_parent_class)->dispose (object); return; @@ -132,31 +196,23 @@ message_service_dbus_new (void) return MESSAGE_SERVICE_DBUS(g_object_new(MESSAGE_SERVICE_DBUS_TYPE, NULL)); } -/* DBus function to say that someone is watching */ +/* Method request off of DBus */ static void -_messages_service_server_watch (void) -{ - -} - -/* DBus interface to request the private variable to know - whether there is a green dot. */ -static gboolean -_messages_service_server_attention_requested (MessageServiceDbus * self, gboolean * dot, GError ** error) +bus_method_call (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * method, GVariant * params, GDBusMethodInvocation * invocation, gpointer user_data) { - MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(self); - *dot = priv->dot; - return TRUE; -} + MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(user_data); + + if (g_strcmp0("AttentionRequested", method) == 0) { + g_dbus_method_invocation_return_value(invocation, g_variant_new("(b)", priv->dot)); + return; + } else if (g_strcmp0("IconShown", method) == 0) { + g_dbus_method_invocation_return_value(invocation, g_variant_new("(b)", priv->hidden)); + return; + } else { + g_warning("Unknown function call '%s'", method); + } -/* DBus interface to request the private variable to know - whether the icon is hidden. */ -static gboolean -_messages_service_server_icon_shown (MessageServiceDbus * self, gboolean * hidden, GError ** error) -{ - MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(self); - *hidden = priv->hidden; - return TRUE; + return; } void @@ -167,6 +223,16 @@ message_service_dbus_set_attention (MessageServiceDbus * self, gboolean attentio if (attention != priv->dot) { priv->dot = attention; g_signal_emit(G_OBJECT(self), signals[ATTENTION_CHANGED], 0, priv->dot, TRUE); + + if (priv->connection != NULL) { + g_dbus_connection_emit_signal(priv->connection, + NULL, + INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT, + INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE, + "AttentionChanged", + g_variant_new("(b)", priv->dot), + NULL); + } } return; } @@ -179,6 +245,16 @@ message_service_dbus_set_icon (MessageServiceDbus * self, gboolean hidden) if (hidden != priv->hidden) { priv->hidden = hidden; g_signal_emit(G_OBJECT(self), signals[ICON_CHANGED], 0, priv->hidden, TRUE); + + if (priv->connection != NULL) { + g_dbus_connection_emit_signal(priv->connection, + NULL, + INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT, + INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE, + "IconChanged", + g_variant_new("(b)", priv->hidden), + NULL); + } } return; } diff --git a/src/messages-service-server.h b/src/messages-service-server.h deleted file mode 100644 index 61921f9..0000000 --- a/src/messages-service-server.h +++ /dev/null @@ -1,126 +0,0 @@ -/* Generated by dbus-binding-tool; do not edit! */ - - -#ifndef __dbus_glib_marshal__messages_service_server_MARSHAL_H__ -#define __dbus_glib_marshal__messages_service_server_MARSHAL_H__ - -#include <glib-object.h> - -G_BEGIN_DECLS - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* NONE:POINTER */ -#define dbus_glib_marshal__messages_service_server_VOID__POINTER g_cclosure_marshal_VOID__POINTER -#define dbus_glib_marshal__messages_service_server_NONE__POINTER dbus_glib_marshal__messages_service_server_VOID__POINTER - -/* BOOLEAN:POINTER,POINTER */ -extern void dbus_glib_marshal__messages_service_server_BOOLEAN__POINTER_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -void -dbus_glib_marshal__messages_service_server_BOOLEAN__POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_BOOLEAN__POINTER_POINTER callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - gboolean v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_BOOLEAN__POINTER_POINTER) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_pointer (param_values + 1), - g_marshal_value_peek_pointer (param_values + 2), - data2); - - g_value_set_boolean (return_value, v_return); -} - -G_END_DECLS - -#endif /* __dbus_glib_marshal__messages_service_server_MARSHAL_H__ */ - -#include <dbus/dbus-glib.h> -static const DBusGMethodInfo dbus_glib__messages_service_server_methods[] = { - { (GCallback) _messages_service_server_watch, dbus_glib_marshal__messages_service_server_NONE__POINTER, 0 }, - { (GCallback) _messages_service_server_attention_requested, dbus_glib_marshal__messages_service_server_BOOLEAN__POINTER_POINTER, 48 }, - { (GCallback) _messages_service_server_icon_shown, dbus_glib_marshal__messages_service_server_BOOLEAN__POINTER_POINTER, 121 }, -}; - -const DBusGObjectInfo dbus_glib__messages_service_server_object_info = { - 0, - dbus_glib__messages_service_server_methods, - 3, -"org.ayatana.indicator.messages.service\0Watch\0A\0\0org.ayatana.indicator.messages.service\0AttentionRequested\0S\0dot\0O\0F\0N\0b\0\0org.ayatana.indicator.messages.service\0IconShown\0S\0hidden\0O\0F\0N\0b\0\0\0", -"org.ayatana.indicator.messages.service\0AttentionChanged\0org.ayatana.indicator.messages.service\0IconChanged\0\0", -"\0" -}; - diff --git a/src/messages-service.c b/src/messages-service.c index 0783d91..e3352e8 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -25,7 +25,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libintl.h> #include <config.h> #include <pango/pango-utils.h> -#include <dbus/dbus-glib-bindings.h> #include <libindicate/listener.h> #include <libindicator/indicator-service.h> #include <gio/gio.h> @@ -1346,6 +1345,7 @@ build_launcher_core (const gchar * desktop) launcherList = g_list_insert_sorted(launcherList, ll, launcherList_sort); /* Add it to the menu */ + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(ll->menuitem), DBUSMENU_MENUITEM_PROP_TYPE, APPLICATION_MENUITEM_TYPE); dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->menuitem)); GList * shortcuts = launcher_menu_item_get_items(ll->menuitem); while (shortcuts != NULL) { diff --git a/src/messages-service.xml b/src/messages-service.xml index f991179..8a592db 100644 --- a/src/messages-service.xml +++ b/src/messages-service.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <node name="/"> - <interface name="org.ayatana.indicator.messages.service"> + <interface name="com.canonical.indicator.messages.service"> <!-- Methods --> <method name="Watch"> |