Changeset 2822
- Timestamp:
- 06/06/06 00:14:42
- Files:
-
- trunk/libnotify (modified) (1 prop)
- trunk/libnotify/ChangeLog (modified) (1 diff)
- trunk/libnotify/Doxyfile.in (deleted)
- trunk/libnotify/Makefile.am (modified) (2 diffs)
- trunk/libnotify/autogen.sh (modified) (2 diffs)
- trunk/libnotify/configure.ac (modified) (4 diffs)
- trunk/libnotify/docs (modified) (1 prop)
- trunk/libnotify/docs/Makefile.am (added)
- trunk/libnotify/docs/reference (added)
- trunk/libnotify/docs/reference/Makefile.am (added)
- trunk/libnotify/docs/reference/libnotify-docs.sgml (added)
- trunk/libnotify/docs/reference/libnotify-overrides.txt (added)
- trunk/libnotify/docs/reference/libnotify-sections.txt (added)
- trunk/libnotify/docs/reference/tmpl (added)
- trunk/libnotify/docs/reference/tmpl/libnotify-docs.sgml (added)
- trunk/libnotify/docs/reference/tmpl/libnotify-unused.sgml (added)
- trunk/libnotify/docs/reference/tmpl/notification.sgml (added)
- trunk/libnotify/docs/reference/tmpl/notify.sgml (added)
- trunk/libnotify/libnotify/notification.c (modified) (7 diffs)
- trunk/libnotify/libnotify/notification.h (modified) (2 diffs)
- trunk/libnotify/libnotify/notify.c (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libnotify
- Property svn:ignore changed from ABOUT-NLS Doxyfile Makefile.in Makefile aclocal.m4 autom4te*.cache confdefs.h config.cache config.guess config.h config.h.in config.log config.status config.sub configure depcomp install-sh intl libnotify.pc libnotify.spec libtool ltconfig ltmain.sh m4 missing mkinstalldirs stamp-h stamp-h1 stamp-h.in tags .todo.* .*.swp .*.swo *.patch *.diff *.tar.gz to ABOUT-NLS Doxyfile Makefile.in Makefile aclocal.m4 autom4te*.cache confdefs.h config.cache config.guess config.h config.h.in config.log config.status config.sub configure depcomp gtk-doc.make install-sh intl libnotify.pc libnotify.spec libtool ltconfig ltmain.sh m4 missing mkinstalldirs stamp-h stamp-h1 stamp-h.in tags .todo.* .*.swp .*.swo *.patch *.diff *.tar.gz
trunk/libnotify/ChangeLog
r2821 r2822 1 Tue Jun 06 00:14:00 PDT 2006 Christian Hammond <chipx86@chipx86.com> 2 3 A docs/reference/libnotify-docs.sgml: 4 A docs/reference/libnotify-overrides.txt: 5 A docs/reference/libnotify-sections.txt: 6 A docs/reference/tmpl: 7 A docs/reference/tmpl/libnotify-docs.sgml: 8 A docs/reference/tmpl/libnotify-unused.sgml: 9 A docs/reference/tmpl/notification.sgml: 10 A docs/reference/tmpl/notify.sgml: 11 A docs/reference/Makefile.am: 12 A docs/Makefile.am: 13 * libnotify/notification.c: 14 * libnotify/notification.h: 15 * libnotify/notify.c: 16 D Doxyfile.in: 17 * Makefile.am: 18 * autogen.sh: 19 * configure.ac: 20 - Add some gtk-doc documentation. 21 1 22 Sun Jun 04 17:44:27 PDT 2006 Christian Hammond <chipx86@chipx86.com> 2 23 trunk/libnotify/Makefile.am
r2286 r2822 1 SUBDIRS = libnotify tools tests1 SUBDIRS = libnotify docs tools tests 2 2 3 3 pcdata_DATA = libnotify.pc … … 23 23 @echo "Running doxygen..." 24 24 @doxygen Doxyfile 25 26 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc trunk/libnotify/autogen.sh
r2286 r2822 32 32 } 33 33 34 (gtkdocize --version) < /dev/null > /dev/null 2>&1 || { 35 echo 36 echo "You must have gtkdocize installed to compile $PACKAGE." 37 echo "Download the appropriate package for your distribution," 38 echo "or get the source tarball at ftp://ftp.gnome.org/pub/gnome/sources/gtk-doc" 39 } 40 34 41 [ $DIE -eq 1 ] && exit 1; 35 42 … … 38 45 echo " aclocal $ACLOCAL_FLAGS" 39 46 aclocal $ACLOCAL_FLAGS 47 echo " gtkdocize" 48 gtkdocize 40 49 echo " autoheader" 41 50 autoheader trunk/libnotify/configure.ac
r2819 r2822 21 21 22 22 if test "x$LIBGALAGO_DEVEL_VERSION" != "x0"; then 23 if test "x$LIBGALAGO_MICRO_VERSION" = "x0"; then 24 LIBGALAGO_MICRO_VERSION=$LIBGALAGO_DEVEL_VERSION 25 LIBGALAGO_VERSION=$LIBGALAGO_MAJOR_VERSION.$LIBGALAGO_MINOR_VERSION.$LIBGALAGO_DEVEL_VERSION 26 else 27 LIBGALAGO_VERSION=$LIBGALAGO_VERSION.$LIBGALAGO_DEVEL_VERSION 28 fi 23 LIBGALAGO_VERSION=$LIBGALAGO_VERSION.$LIBGALAGO_DEVEL_VERSION 29 24 fi 30 25 … … 115 110 AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, ,DBUS API is subject to change) 116 111 112 113 dnl ################################################################ 114 dnl # Set up gtk-doc 115 dnl ################################################################ 116 GTK_DOC_CHECK([1.4]) 117 118 117 119 dnl # Use wall if we have GCC 118 120 if test "x$GCC" = "xyes"; then … … 126 128 dnl ################################################################ 127 129 AC_CONFIG_FILES([ 128 Doxyfile129 130 Makefile 131 docs/Makefile 132 docs/reference/Makefile 130 133 libnotify.pc 131 134 libnotify/Makefile … … 143 146 echo "Then su to root and type: make install" 144 147 echo 145 trunk/libnotify/docs
- Property svn:ignore set to Makefile Makefile.in *.dvi *.out *.log *.txt *.ps *.pdf *.aux .*.swp
trunk/libnotify/libnotify/notification.c
r2821 r2822 461 461 #endif 462 462 463 /** 464 * notify_notification_new: 465 * @summary: The required summary text. 466 * @body: The optional body text. 467 * @icon: The optional icon theme icon name or filename. 468 * @attach: The optional widget to attach to. 469 * 470 * Creates a new #NotifyNotification. The summary text is required, but 471 * all other parameters are optional. 472 * 473 * Returns: The new #NotifyNotification. 474 */ 463 475 NotifyNotification * 464 476 notify_notification_new(const gchar *summary, const gchar *body, … … 476 488 477 489 #ifdef HAVE_STATUS_ICON 490 /** 491 * notify_notification_new_with_status_icon: 492 * @summary: The required summary text. 493 * @body: The optional body text. 494 * @icon: The optional icon theme icon name or filename. 495 * @status_icon: The required #GtkStatusIcon. 496 * 497 * Creates a new #NotifyNotification and attaches to a #GtkStatusIcon. 498 * The summary text and @status_icon is required, but all other parameters 499 * are optional. 500 * 501 * Returns: The new #NotifyNotification. 502 * 503 * Since: 0.4.1 504 */ 478 505 NotifyNotification * 479 506 notify_notification_new_with_status_icon(const gchar *summary, … … 482 509 GtkStatusIcon *status_icon) 483 510 { 484 g_return_val_if_fail(status_icon == NULL || GTK_IS_STATUS_ICON(status_icon), NULL); 511 g_return_val_if_fail(status_icon == NULL, NULL); 512 g_return_val_if_fail(GTK_IS_STATUS_ICON(status_icon), NULL); 485 513 486 514 return g_object_new(NOTIFY_TYPE_NOTIFICATION, … … 493 521 #endif /* HAVE_STATUS_ICON */ 494 522 523 /** 524 * notify_notification_update: 525 * @notification: The notification to update. 526 * @summary: The new required summary text. 527 * @body: The optional body text. 528 * @icon: The optional icon theme icon name or filename. 529 * 530 * Updates the notification text and icon. This won't send the update out 531 * and display it on the screen. For that, you will need to call 532 * notify_notification_show(). 533 * 534 * Returns: %TRUE, unless an invalid parameter was passed. 535 */ 495 536 gboolean 496 537 notify_notification_update(NotifyNotification *notification, … … 530 571 } 531 572 573 /** 574 * notify_notification_attach_to_widget: 575 * @notification: The notification. 576 * @attach: The widget to attach to, or %NULL. 577 * 578 * Attaches the notification to a widget. This will set hints on the 579 * notification requesting that the notification point to the widget's 580 * location. If @attach is %NULL, the widget will be unset. 581 */ 532 582 void 533 583 notify_notification_attach_to_widget(NotifyNotification *notification, … … 549 599 550 600 #ifdef HAVE_STATUS_ICON 601 /** 602 * notify_notification_attach_to_status_icon: 603 * @notification: The notification. 604 * @status_icon: The #GtkStatusIcon to attach to, or %NULL. 605 * 606 * Attaches the notification to a #GtkStatusIcon. This will set hints on the 607 * notification requesting that the notification point to the status icon's 608 * location. If @status_icon is %NULL, the status icon will be unset. 609 * 610 * Since: 0.4.1 611 */ 551 612 void 552 613 notify_notification_attach_to_status_icon(NotifyNotification *notification, … … 592 653 notify_notification_set_hint_int32(notification, "x", rect->x); 593 654 notify_notification_set_hint_int32(notification, "y", rect->y); 594 notify_notification_set_hint_int32(notification, "width", rect->width);595 notify_notification_set_hint_int32(notification, "height", rect->height);596 655 597 656 display_name = gdk_screen_make_display_name(screen); trunk/libnotify/libnotify/notification.h
r2821 r2822 85 85 86 86 NotifyNotification *notify_notification_new(const gchar *summary, 87 const gchar * message,87 const gchar *body, 88 88 const gchar *icon, 89 89 GtkWidget *attach); 90 90 #if GTK_CHECK_VERSION(2, 9, 2) 91 91 NotifyNotification *notify_notification_new_with_status_icon( 92 const gchar *summary, const gchar * message,92 const gchar *summary, const gchar *body, 93 93 const gchar *icon, GtkStatusIcon *status_icon); 94 94 #endif … … 96 96 gboolean notify_notification_update(NotifyNotification *notification, 97 97 const gchar *summary, 98 const gchar * message,98 const gchar *body, 99 99 const gchar *icon); 100 100 trunk/libnotify/libnotify/notify.c
r2820 r2822 40 40 #endif 41 41 42 /** 43 * notify_init: 44 * @app_name: The name of the application initializing libnotify. 45 * 46 * Initialized libnotify. This must be called before any other functions. 47 * 48 * Returns: %TRUE if successful, or %FALSE on error. 49 */ 42 50 gboolean 43 51 notify_init(const char *app_name) … … 89 97 } 90 98 99 /** 100 * notify_get_app_name: 101 * 102 * Gets the application name registered. 103 * 104 * Returns: The registered application name, passed to notify_init(). 105 */ 91 106 const gchar * 92 107 notify_get_app_name(void) … … 95 110 } 96 111 112 /** 113 * notify_uninit: 114 * 115 * Uninitialized libnotify. 116 * 117 * This should be called when the program no longer needs libnotify for 118 * the rest of its lifecycle, typically just before exitting. 119 */ 97 120 void 98 121 notify_uninit(void) … … 120 143 } 121 144 145 /** 146 * notify_is_initted: 147 * 148 * Gets whether or not libnotify is initialized. 149 * 150 * Returns: %TRUE if libnotify is initialized, or %FALSE otherwise. 151 */ 122 152 gboolean 123 153 notify_is_initted(void) … … 138 168 } 139 169 170 /** 171 * notify_get_server_caps: 172 * 173 * Queries the server for its capabilities and returns them in a #GList. 174 * 175 * Returns: A #GList of server capability strings. 176 */ 140 177 GList * 141 178 notify_get_server_caps(void) … … 167 204 } 168 205 206 /** 207 * notify_get_server_info: 208 * @ret_name: The resulting server name. 209 * @ret_vendor: The resulting server vendor. 210 * @ret_version: The resulting server version. 211 * @ret_spec_version: The resulting version of the specification the server is 212 * compliant with. 213 * 214 * Queries the server for its information, specifically, the name, vendor, 215 * server version, and the version of the notifications specification that it 216 * is compliant with. 217 * 218 * Returns: %TRUE if successful, and the variables passed will be set. %FALSE 219 * on failure. 220 */ 169 221 gboolean 170 222 notify_get_server_info(char **ret_name, char **ret_vendor,
