diff -s -r libnotifymm-0.6.1/configure.ac libnotifymm-0.7.5/configure.ac
19,20c19,20
< LIBNOTIFYMM_MINOR_VERSION=6
< LIBNOTIFYMM_MICRO_VERSION=1
---
> LIBNOTIFYMM_MINOR_VERSION=7
> LIBNOTIFYMM_MICRO_VERSION=5
29c29
< LIBNOTIFYMM_SO_VERSION=7:0:0
---
> LIBNOTIFYMM_SO_VERSION=7:5:0
33,36c33,36
< AC_DEFINE_UNQUOTED(LIBNOTIFYMM_MAJOR_VERSION, $LIBNOTIFYMM_MAJOR_VERSION)
< AC_DEFINE_UNQUOTED(LIBNOTIFYMM_MINOR_VERSION, $LIBNOTIFYMM_MINOR_VERSION)
< AC_DEFINE_UNQUOTED(LIBNOTIFYMM_MICRO_VERSION, $LIBNOTIFYMM_MICRO_VERSION)
< AC_DEFINE_UNQUOTED(LIBNOTIFYMM_VERSION, "$LIBNOTIFYMM_VERSION")
---
> AC_DEFINE_UNQUOTED(LIBNOTIFYMM_MAJOR_VERSION, $LIBNOTIFYMM_MAJOR_VERSION, [libnotifymm major version])
> AC_DEFINE_UNQUOTED(LIBNOTIFYMM_MINOR_VERSION, $LIBNOTIFYMM_MINOR_VERSION, [libnotifymm minor version])
> AC_DEFINE_UNQUOTED(LIBNOTIFYMM_MICRO_VERSION, $LIBNOTIFYMM_MICRO_VERSION, [libnotifymm micro version])
> AC_DEFINE_UNQUOTED(LIBNOTIFYMM_VERSION, "$LIBNOTIFYMM_VERSION", [libnotifymm version])
67,68c67,68
< AM_DISABLE_STATIC
< AM_PROG_LIBTOOL
---
> AC_DISABLE_STATIC
> AC_PROG_LIBTOOL
85c85
< PKG_CHECK_MODULES(LIBNOTIFYMM, glibmm-2.4 >= 2.12.8 gtkmm-2.4 >= 2.10 libnotify >= 0.4.3)
---
> PKG_CHECK_MODULES(LIBNOTIFYMM, glibmm-2.4 >= 2.28.0 gtkmm-3.0 >= 3.4.1 libnotify >= 0.7.5)
159d158
<     examples/status-icon/Makefile
diff -s -r libnotifymm-0.6.1/examples/Makefile.am libnotifymm-0.7.5/examples/Makefile.am
1c1
< SUBDIRS =  basic icon status-icon update server-info widget action
---
> SUBDIRS =  basic icon update server-info widget action
Only in libnotifymm-0.6.1/examples: status-icon
diff -s -r libnotifymm-0.6.1/libnotify/libnotifymmconfig.h.in libnotifymm-0.7.5/libnotify/libnotifymmconfig.h.in
1,2c1
< #ifndef _LIBNOTIFYMM_CONFIG_H
< #define _LIBNOTIFYMM_CONFIG_H 1
---
> /* libnotify/libnotifymmconfig.h.in.  Generated from configure.ac by autoheader.  */
4c3,4
< #include "glibmmconfig.h"
---
> /* Define to 1 if you have the <dlfcn.h> header file. */
> #undef HAVE_DLFCN_H
6,10c6,7
< /* version numbers */
< /* #undef LIBNOTIFYMM_MAJOR_VERSION */
< /* #undef LIBNOTIFYMM_MINOR_VERSION */
< /* #undef LIBNOTIFYMM_MICRO_VERSION */
< /* #undef LIBNOTIFYMM_VERSION */
---
> /* Define to 1 if you have the <inttypes.h> header file. */
> #undef HAVE_INTTYPES_H
12c9,10
< #endif /* _LIBNOTIFYMM_CONFIG_H */
---
> /* Define to 1 if you have the <memory.h> header file. */
> #undef HAVE_MEMORY_H
13a12,74
> /* Define to 1 if you have the <stdint.h> header file. */
> #undef HAVE_STDINT_H
> 
> /* Define to 1 if you have the <stdlib.h> header file. */
> #undef HAVE_STDLIB_H
> 
> /* Define to 1 if you have the <strings.h> header file. */
> #undef HAVE_STRINGS_H
> 
> /* Define to 1 if you have the <string.h> header file. */
> #undef HAVE_STRING_H
> 
> /* Define to 1 if you have the <sys/stat.h> header file. */
> #undef HAVE_SYS_STAT_H
> 
> /* Define to 1 if you have the <sys/types.h> header file. */
> #undef HAVE_SYS_TYPES_H
> 
> /* Define to 1 if you have the <unistd.h> header file. */
> #undef HAVE_UNISTD_H
> 
> /* libnotifymm major version */
> #undef LIBNOTIFYMM_MAJOR_VERSION
> 
> /* libnotifymm micro version */
> #undef LIBNOTIFYMM_MICRO_VERSION
> 
> /* libnotifymm minor version */
> #undef LIBNOTIFYMM_MINOR_VERSION
> 
> /* libnotifymm version */
> #undef LIBNOTIFYMM_VERSION
> 
> /* Define to the sub-directory in which libtool stores uninstalled libraries.
>    */
> #undef LT_OBJDIR
> 
> /* Name of package */
> #undef PACKAGE
> 
> /* Define to the address where bug reports for this package should be sent. */
> #undef PACKAGE_BUGREPORT
> 
> /* Define to the full name of this package. */
> #undef PACKAGE_NAME
> 
> /* Define to the full name and version of this package. */
> #undef PACKAGE_STRING
> 
> /* Define to the one symbol short name of this package. */
> #undef PACKAGE_TARNAME
> 
> /* Define to the home page for this package. */
> #undef PACKAGE_URL
> 
> /* Define to the version of this package. */
> #undef PACKAGE_VERSION
> 
> /* Define to 1 if you have the ANSI C header files. */
> #undef STDC_HEADERS
> 
> /* Version number of package */
> #undef VERSION
diff -s -r libnotifymm-0.6.1/libnotify/src/libnotify_methods.defs libnotifymm-0.7.5/libnotify/src/libnotify_methods.defs
29,30d28
<   (parameters
<   )
38,52c36,38
<     '("const-gchar*" "summary")
<     '("const-gchar*" "body")
<     '("const-gchar*" "icon")
<     '("GtkWidget*" "attach")
<   )
< )
< 
< (define-function notify_notification_new_with_status_icon
<   (c-name "notify_notification_new_with_status_icon")
<   (return-type "NotifyNotification*")
<   (parameters
<     '("const-gchar*" "summary")
<     '("const-gchar*" "body")
<     '("const-gchar*" "icon")
<     '("GtkStatusIcon*" "status_icon")
---
>     '("const-char*" "summary")
>     '("const-char*" "body")
>     '("const-char*" "icon")
61,92c47,49
<     '("const-gchar*" "summary")
<     '("const-gchar*" "body")
<     '("const-gchar*" "icon")
<   )
< )
< 
< (define-method attach_to_widget
<   (of-object "NotifyNotification")
<   (c-name "notify_notification_attach_to_widget")
<   (return-type "none")
<   (parameters
<     '("GtkWidget*" "attach")
<   )
< )
< 
< (define-method attach_to_status_icon
<   (of-object "NotifyNotification")
<   (c-name "notify_notification_attach_to_status_icon")
<   (return-type "none")
<   (parameters
<     '("GtkStatusIcon*" "status_icon")
<   )
< )
< 
< (define-method set_geometry_hints
<   (of-object "NotifyNotification")
<   (c-name "notify_notification_set_geometry_hints")
<   (return-type "none")
<   (parameters
<     '("GdkScreen*" "screen")
<     '("gint" "x")
<     '("gint" "y")
---
>     '("const-char*" "summary")
>     '("const-char*" "body")
>     '("const-char*" "icon")
131a89,97
> (define-method set_image_from_pixbuf
>   (of-object "NotifyNotification")
>   (c-name "notify_notification_set_image_from_pixbuf")
>   (return-type "none")
>   (parameters
>     '("GdkPixbuf*" "pixbuf")
>   )
> )
> 
146c112
<     '("const-gchar*" "key")
---
>     '("const-char*" "key")
150a117,126
> (define-method set_hint_uint32
>   (of-object "NotifyNotification")
>   (c-name "notify_notification_set_hint_uint32")
>   (return-type "none")
>   (parameters
>     '("const-char*" "key")
>     '("guint" "value")
>   )
> )
> 
156c132
<     '("const-gchar*" "key")
---
>     '("const-char*" "key")
166,167c142,143
<     '("const-gchar*" "key")
<     '("const-gchar*" "value")
---
>     '("const-char*" "key")
>     '("const-char*" "value")
176c152
<     '("const-gchar*" "key")
---
>     '("const-char*" "key")
186c162
<     '("const-gchar*" "key")
---
>     '("const-char*" "key")
191a168,186
> (define-method set_hint
>   (of-object "NotifyNotification")
>   (c-name "notify_notification_set_hint")
>   (return-type "none")
>   (parameters
>     '("const-char*" "key")
>     '("GVariant*" "value")
>   )
> )
> 
> (define-method set_app_name
>   (of-object "NotifyNotification")
>   (c-name "notify_notification_set_app_name")
>   (return-type "none")
>   (parameters
>     '("const-char*" "app_name")
>   )
> )
> 
225a221,226
> (define-method get_closed_reason
>   (of-object "NotifyNotification")
>   (c-name "notify_notification_get_closed_reason")
>   (return-type "gint")
> )
> 
236a238,241
> ;; From notify-features.h
> 
> 
> 
259c264,272
<   (return-type "const-gchar*")
---
>   (return-type "const-char*")
> )
> 
> (define-function notify_set_app_name
>   (c-name "notify_set_app_name")
>   (return-type "none")
>   (parameters
>     '("const-char*" "app_name")
>   )
diff -s -r libnotifymm-0.6.1/libnotify/src/libnotify_signals.defs libnotifymm-0.7.5/libnotify/src/libnotify_signals.defs
9c9
< (define-property summary
---
> (define-property id
11,12c11,12
<   (prop-type "GParamString")
<   (docs "The summary text")
---
>   (prop-type "GParamInt")
>   (docs "The notification ID")
18c18
< (define-property body
---
> (define-property app-name
21c21
<   (docs "The message body text")
---
>   (docs "The application name to use for this notification")
27c27
< (define-property icon-name
---
> (define-property summary
30c30
<   (docs "The icon filename or icon theme-compliant name")
---
>   (docs "The summary text")
36c36
< (define-property attach-widget
---
> (define-property body
38,39c38,39
<   (prop-type "GParamObject")
<   (docs "The widget to attach the notification to")
---
>   (prop-type "GParamString")
>   (docs "The message body text")
45c45
< (define-property status-icon
---
> (define-property icon-name
47,48c47,48
<   (prop-type "GParamObject")
<   (docs "The status icon to attach the notification to")
---
>   (prop-type "GParamString")
>   (docs "The icon filename or icon theme-compliant name")
50a51,59
>   (construct-only #f)
> )
> 
> (define-property closed-reason
>   (of-object "NotifyNotification")
>   (prop-type "GParamInt")
>   (docs "The reason code for why the notification was closed")
>   (readable #t)
>   (writable #f)
diff -s -r libnotifymm-0.6.1/libnotify/src/notification.ccg libnotifymm-0.7.5/libnotify/src/notification.ccg
23d22
< #include <libnotify/notify-enum-types.h>
28,41c27
< const int EXPIRES_DEFAULT = NOTIFY_EXPIRES_DEFAULT;
< const int EXPIRES_NEVER = NOTIFY_EXPIRES_NEVER;
< 
< Notification::Notification(const Glib::ustring& summary, const Glib::ustring& body) :
< 	_CONSTRUCT("summary", summary.c_str(), "body", body.c_str(), "icon-name", NULL, 
< 						 "attach-widget", NULL)
< {
< 	
< }
< 	
< Notification::Notification(const Glib::ustring& summary, const Glib::ustring& body,
< 													 const Glib::ustring& icon_name) :
< 	_CONSTRUCT("summary", summary.c_str(), "body", body.c_str(), "icon-name", icon_name.c_str(), 
< 						 "attach-widget", NULL)
---
> void Notification::set_hint(const Glib::ustring& key, const Glib::ArrayHandle<guchar>& values) 
43c29
< 	
---
>   notify_notification_set_hint_byte_array(gobj(), key.c_str(), values.data(), values.size());
46c32
< void Notification::set_hint(const Glib::ustring& key, const Glib::ArrayHandle<guchar>& values)
---
> void Notification::add_action(const Glib::ustring& action, const Glib::ustring& label, const SlotInvokeAction& slot) 
48c34,40
< 	notify_notification_set_hint_byte_array (gobj(), key.c_str(), values.data(), values.size());
---
>   // Create a copy of the slot object. A pointer to this will be passed
>   // through the callback's data parameter.  It will be deleted
>   // when SignalProxy_SlotForwardPage_gtk_callback_destroy() is called.
> 
>   SlotInvokeAction* slot_copy = new SlotInvokeAction(slot);
>   
>   notify_notification_add_action(gobj(), action.c_str(), label.c_str(), &SignalProxy_ActivateLink_gtk_callback, slot_copy, &SignalProxy_ActivateLink_gtk_callback_destroy);
76,87d67
< void Notification::add_action(const Glib::ustring& action, const Glib::ustring& label, const SlotInvokeAction& slot)
< {
< 	// Create a copy of the slot object. A pointer to this will be passed
<   // through the callback's data parameter.  It will be deleted
<   // when SignalProxy_SlotForwardPage_gtk_callback_destroy() is called.
<   SlotInvokeAction* slot_copy = new SlotInvokeAction(slot);
< 
<   notify_notification_add_action(gobj(), action.c_str(), label.c_str(),
<       &SignalProxy_ActivateLink_gtk_callback, slot_copy,
<       &SignalProxy_ActivateLink_gtk_callback_destroy);
< }
< 
89d68
<  
diff -s -r libnotifymm-0.6.1/libnotify/src/notification.hg libnotifymm-0.7.5/libnotify/src/notification.hg
29c29
< #include <gtkmm/statusicon.h>
---
> #include <libnotify/notify-enum-types.h>
34,36c34,37
< //TODO: Use an enum?
< extern const int EXPIRES_DEFAULT;
< extern const int EXPIRES_NEVER;
---
> enum ExpireTime{
>   EXPIRES_DEFAULT = NOTIFY_EXPIRES_DEFAULT,
>   EXPIRES_NEVER = NOTIFY_EXPIRES_NEVER
> };
40,42d40
< /** Notification offers a way to show notification for a widget or 
<  * in the system tray.
<  */
47,65d44
<   
<   /** A constructor for Notification
<    *
<    * @param summary summary of the notification
<    * @param body body text of the notification
<    *
<    * Creates a new Notification with summary and body. You can set attach_widget and icon later
<    */
<   Notification(const Glib::ustring& summary, const Glib::ustring& body);
<   
<   /** A constructor for Notification
<    *
<    * @param summary summary of the notification
<    * @param body body text of the notification
<    * @param icon_name name of the icon for the notification, can be a stock id
<    *
<    * Creates a new Notification with summary, body and icon. You can set an attach_widget later
<    */
<   Notification(const Glib::ustring& summary, const Glib::ustring& body, const Glib::ustring& icon_name);
68c47
<    *
---
>    * 
70,72c49,50
<    * @param body body text of the notification
<    * @param icon_name name of the icon for the notification, can be a stock id
<    * @param attach_widget widget the notification is attach to
---
>    * @param body (optional) body text of the notification
>    * @param icon (optional) name of the icon for the notification, can be a filename or a stockid
74c52
<    * Creates a new Notification
---
>    * Creates a new Notification with summary, body and icon.
76c54
<   _WRAP_CTOR(Notification(const Glib::ustring& summary, const Glib::ustring& body, const Glib::ustring& icon_name, Gtk::Widget& attach_widget), notify_notification_new)
---
>   _WRAP_CTOR(Notification(const Glib::ustring& summary, const Glib::ustring& body{?}, const Glib::ustring& icon{?}), notify_notification_new);
78,89c56
<   /** A constructor for Notification
<    *
<    * @param summary summary of the notification
<    * @param body body text of the notification
<    * @param icon_name name of the icon for the notification, can be a stock id
<    * @param status_icon Gtk::StatusIcon the notification is attached to
<    *
<    * Creates a new Notification
<    */
<   _WRAP_CTOR(Notification(const Glib::ustring& summary, const Glib::ustring& body, const Glib::ustring& icon_name, const Glib::RefPtr<Gtk::StatusIcon>& status_icon), notify_notification_new_with_status_icon)
< 
<   _WRAP_METHOD(bool update(const Glib::ustring& summary, const Glib::ustring& body, const Glib::ustring& icon), notify_notification_update)
---
>   _WRAP_METHOD(bool update(const Glib::ustring& summary, const Glib::ustring& body{?}, const Glib::ustring& icon{?}), notify_notification_update);
91,92c58,82
<   _WRAP_METHOD(void attach_to_widget(Gtk::Widget& attach), notify_notification_attach_to_widget);
<   _WRAP_METHOD(void attach_to_status_icon(const Glib::RefPtr<Gtk::StatusIcon>& status_icon), notify_notification_attach_to_status_icon)
---
>   _WRAP_METHOD(bool show(), notify_notification_show, errthrow);
>   
>   _WRAP_METHOD(void set_app_name(const Glib::ustring& app_name), notify_notification_set_app_name);
>   
>   _WRAP_METHOD(void set_timeout(int timeout), notify_notification_set_timeout);
>   
>   _WRAP_METHOD(void set_category(const Glib::ustring& category), notify_notification_set_category);
>   
>   _WRAP_METHOD(void set_urgency(const Urgency& urgency), notify_notification_set_urgency);
>   
>   _WRAP_METHOD(void set_icon_from_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& icon), notify_notification_set_icon_from_pixbuf);
>   
>   _WRAP_METHOD(void set_image_from_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), notify_notification_set_image_from_pixbuf);
>   
>   _WRAP_METHOD(void set_hint(const Glib::ustring& key, const Glib::VariantBase& value), notify_notification_set_hint);
>   
>   _WRAP_METHOD(void set_hint(const Glib::ustring& key, int value), notify_notification_set_hint_int32);
>   
>   _WRAP_METHOD(void set_hint(const Glib::ustring& key, guint value), notify_notification_set_hint_uint32);
>   
>   _WRAP_METHOD(void set_hint(const Glib::ustring& key, double value), notify_notification_set_hint_double);
>   
>   _WRAP_METHOD(void set_hint(const Glib::ustring& key, const Glib::ustring& value), notify_notification_set_hint_string);
>   
>   _WRAP_METHOD(void set_hint(const Glib::ustring& key, guchar value), notify_notification_set_hint_byte);
94,105d83
<   _WRAP_METHOD(void set_geometry_hints(const Glib::RefPtr<Gdk::Screen>& screen, int x, int y), notify_notification_set_geometry_hints)
<   _WRAP_METHOD(bool show(), notify_notification_show, errthrow)
<   _WRAP_METHOD(void set_timeout(int timeout), notify_notification_set_timeout)
<   _WRAP_METHOD(void set_category(const Glib::ustring& category), notify_notification_set_category)
<   _WRAP_METHOD(void set_urgency(Urgency urgency), notify_notification_set_urgency)
<   _WRAP_METHOD(void set_icon_from_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& icon), notify_notification_set_icon_from_pixbuf)
< 
<   _WRAP_METHOD(void set_hint(const Glib::ustring& key, int value), notify_notification_set_hint_int32)
<   _WRAP_METHOD(void set_hint(const Glib::ustring& key, double value), notify_notification_set_hint_double)
<   _WRAP_METHOD(void set_hint(const Glib::ustring& key, const Glib::ustring& value), notify_notification_set_hint_string)
<   _WRAP_METHOD(void set_hint(const Glib::ustring& key, guchar value), notify_notification_set_hint_byte)
<     
108,109c86,87
<    * @param key The hint.
<    * @param values The hint's value.
---
>    * @param key the hint
>    * @param values the hint's value
111c89
<    * Sets a hint with a byte array value.
---
>    * Sets a hint with a byte array value
114c92
<   _IGNORE(notify_notification_set_hint_byte_array)
---
>   _IGNORE(notify_notification_set_hint_byte_array);
116,124c94,101
<    /** For instance,
<     * void on_invoke(const Glib::ustring& action);
<     */
<    typedef sigc::slot<void, const Glib::ustring& /* action */> SlotInvokeAction;
<    
<    /** Add an action to the notification
<    *
<    * @param action The action id
<    * @param label The action label
---
>   _WRAP_METHOD(void clear_hints(), notify_notification_clear_hints);
>   
>   typedef sigc::slot<void, const Glib::ustring& /* action */> SlotInvokeAction;
>   
>   /** Add an action to the notification
>    * 
>    * @param action the action id
>    * @param label the action label
127,128c104,105
<    * Adds an action to a notification. When the action is invoked, the
<    * specified callback function will be called.
---
>    * Adds an action to a notification. When the action is invoked, 
>    * the specified callback function will be called.
130c107
<    void add_action(const Glib::ustring& action, const Glib::ustring& label, const SlotInvokeAction& slot);
---
>   void add_action(const Glib::ustring& action, const Glib::ustring& label, const SlotInvokeAction& slot);
133,134d109
<   _WRAP_METHOD(void clear_hints(), notify_notification_clear_hints);
<     
136c111,114
<   _WRAP_METHOD(void close(), notify_notification_close, errthrow);
---
>   
>   _WRAP_METHOD(bool close(), notify_notification_close, errthrow);
>   
>   _WRAP_METHOD(int get_closed_reason(), notify_notification_get_closed_reason);
140,145c118,123
<   _WRAP_PROPERTY("id", int)
<   _WRAP_PROPERTY("summary", Glib::ustring)
<   _WRAP_PROPERTY("body", Glib::ustring)
<   _WRAP_PROPERTY("icon-name", Glib::ustring)
<   _WRAP_PROPERTY("attach-widget", Gtk::Widget)
<   _WRAP_PROPERTY("status-icon", Glib::RefPtr<Gtk::StatusIcon>)
---
>   _WRAP_PROPERTY("id", int);
>   _WRAP_PROPERTY("summary", Glib::ustring);
>   _WRAP_PROPERTY("body", Glib::ustring);
>   _WRAP_PROPERTY("icon-name", Glib::ustring);
>   _WRAP_PROPERTY("app-name", Glib::ustring);
>   _WRAP_PROPERTY("closed-reason", int);
149d126
< 
diff -s -r libnotifymm-0.6.1/Makefile.am libnotifymm-0.7.5/Makefile.am
1c1
< SUBDIRS		= tools libnotify docs  examples
---
> SUBDIRS		= tools libnotify docs examples
diff -s -r libnotifymm-0.6.1/tools/extra_defs_gen/generate_defs_libnotify.cc libnotifymm-0.7.5/tools/extra_defs_gen/generate_defs_libnotify.cc
22c22
< #include "glibmm_generate_extra_defs/generate_extra_defs.h"
---
> #include <glibmm_generate_extra_defs/generate_extra_defs.h>
24a25
> #include <iostream>
26c27
< int main (int argc, char *argv[])
---
> int main(int, char**)
28c29
<     notify_init("generate_extra_defs");
---
>   notify_init("generate_extra_defs");
30c31,33
<     std::cout << get_defs(NOTIFY_TYPE_NOTIFICATION);
---
>   std::cout << get_defs(NOTIFY_TYPE_NOTIFICATION);
> 
>   return 0;
diff -s -r libnotifymm-0.6.1/tools/m4/convert_libnotifymm.m4 libnotifymm-0.7.5/tools/m4/convert_libnotifymm.m4
1,2d0
< _CONVERSION(`const Glib::RefPtr<Gtk::StatusIcon>&',`GtkStatusIcon*',__CONVERT_REFPTR_TO_P)
< 
diff -s -r libnotifymm-0.6.1/tools/m4/convert.m4 libnotifymm-0.7.5/tools/m4/convert.m4
5,6c5
< include(convert_gtkmm.m4)
< include(convert_libnotifymm.m4)
---
> m4_include(`convert_libnotifymm.m4')
