ruby-libnotify 0.4.1.1 → 0.5.0

data/examples/markup.rb

@@ -20,10 +20,7 @@ end
 
 Notify.init("Test6")
 
-test = Notify::Notification.new("Test 6", "<b>Markup</b> <u>test</u>\n<i> ...savvy?</i>", nil, nil)
+test = Notify::Notification.new("Test 6", "<b>Markup</b> <u>test</u>\n<i> ...savvy?</i>", nil)
 test.timeout= 5000      #5 seconds
 test.show
 
-sleep(2)
-test.close
-Notify.uninit

data/examples/multi-actions.rb

@@ -21,7 +21,7 @@ end
 Gtk.init
 Notify.init("Test4")
 
-test = Notify::Notification.new("Test 4", "multi actions test", nil, nil)
+test = Notify::Notification.new("Test 4", "multi actions test", nil)
 test.timeout= Notify::Notification::EXPIRES_NEVER
 test.signal_connect("closed") { Gtk.main_quit }
 

data/examples/update.rb

@@ -20,7 +20,7 @@ end
 
 Notify.init("Test2")
 
-test = Notify::Notification.new("Test 2", "This is a test", nil, nil)
+test = Notify::Notification.new("Test 2", "This is a test", nil)
 test.timeout= Notify::Notification::EXPIRES_NEVER
 test.show
 
@@ -29,8 +29,3 @@ sleep(3)
 test.update("Test 2", "Message replaced!", nil)
 test.timeout=5000       #5 seconds
 test.show
-
-sleep(6)
-
-test.close
-Notify.uninit

data/examples/urgency.rb

@@ -20,7 +20,7 @@ end
 
 Notify.init("Test5")
 
-test = Notify::Notification.new("Test 5", "urgency test - LOW", nil, nil)
+test = Notify::Notification.new("Test 5", "urgency test - LOW", nil)
 test.urgency= Notify::Notification::URGENCY_LOW
 test.timeout= 3000      #3 seconds
 test.show
@@ -28,7 +28,7 @@ test.show
 sleep(3)
 test.close
 
-test = Notify::Notification.new("Test 5", "urgency test - NORMAL", nil, nil)
+test = Notify::Notification.new("Test 5", "urgency test - NORMAL", nil)
 test.urgency= Notify::Notification::URGENCY_NORMAL
 test.timeout= 3000      #3 seconds
 test.show
@@ -36,12 +36,7 @@ test.show
 sleep(3)
 test.close
 
-test = Notify::Notification.new("Test 5", "urgency test - CRITICAL", nil, nil)
+test = Notify::Notification.new("Test 5", "urgency test - CRITICAL", nil)
 test.urgency= Notify::Notification::URGENCY_CRITICAL
 test.timeout= 3000      #3 seconds
 test.show
-
-sleep(3)
-test.close
-
-Notify.uninit

data/examples/xy.rb

@@ -20,13 +20,8 @@ end
 
 Notify.init("Test7")
 
-test = Notify::Notification.new("Test 7", "This notification point to 150,100", nil, nil)
+test = Notify::Notification.new("Test 7", "This notification point to 150,100", nil)
 test.hint32("x", 150)
 test.hint32("y", 100)
 test.timeout= 5000      #5 seconds
 test.show
-
-sleep(6)
-test.clear_hints
-test.close
-Notify.uninit

data/ext/extconf.rb

@@ -23,47 +23,36 @@ def find_gtk2_rb
    File.exist?("#{Config::CONFIG["rubylibdir"]}/gtk2.rb"))
 end
 
-def check_status_icon_gtk2
-  if PKGConfig.check_version?("gtk+-2.0", 2, 9, 1) == true
-    $CFLAGS << ' -DHAVE_STATUS_ICON'
-    puts "with GtkStatusIcon.. yes"
+def check_set_app_name_libnotify
+  if PKGConfig.check_version?("libnotify", 0, 7, 2) == true
+    $CFLAGS << ' -DHAVE_SET_APP_NAME'
+    puts "with set application name.. yes"
   else
-    puts "with GtkStatusIcon.. no"
+    puts "with set application name.. no"
   end
 end
 
-def check_geometry_hints_libnotify
-  if PKGConfig.check_version?("libnotify", 0, 4, 1) == true
-    $CFLAGS << ' -DHAVE_GEOMETRY_HINTS'
-    puts "with geometry hints.. yes"
-  else
-    puts "with geometry hints.. no"
-  end
-end
-
-def check_closed_reason_libnotify
-  if PKGConfig.check_version?("libnotify", 0, 4, 5) == true
-    $CFLAGS << ' -DHAVE_CLOSED_REASON'
-    puts "with closed reason.. yes"
-  else
-    puts "with closed reason.. no"
-  end
+def check_required_version(app, maj, min, mic)
+  PKGConfig.check_version?(app, maj, min, mic)
 end
 
-if find_gtk2_rb == true
-  if have_library("notify", "notify_init") == true
-    $CFLAGS << ' -DDEBUG' if type == 0
-    $CFLAGS << ' -Wall' << " -I#{Config::CONFIG["sitearchdir"]} " << PKGConfig.cflags("libnotify")
-    $LIBS << ' ' << PKGConfig.libs("libnotify")
-    check_status_icon_gtk2
-    check_geometry_hints_libnotify
-    check_closed_reason_libnotify
-    create_makefile("rnotify")
+if check_required_version("libnotify", 0, 7, 0) == true
+  if find_gtk2_rb == true
+    if have_library("notify", "notify_init") == true
+      $CFLAGS << ' -DDEBUG' if type == 0
+      $CFLAGS << ' -Wall' << " -I#{Config::CONFIG["sitearchdir"]} " << PKGConfig.cflags("libnotify")
+      $LIBS << ' ' << PKGConfig.libs("libnotify")
+      check_set_app_name_libnotify
+      create_makefile("rnotify")
+    else
+      puts "ERROR: please install libnotify",
+	    "[ http://www.galago-project.org/ ]"
+    end
   else
-    puts "ERROR: please install libnotify",
-           "[ http://www.galago-project.org/ ]"
+    puts "ERROR: no gtk2.rb found, please install Ruby/Gtk2",
+         "[ http://ruby-gnome2.sourceforge.jp/ ]"
   end
 else
-  puts "ERROR: no gtk2.rb found, please install Ruby/Gtk2",
-         "[ http://ruby-gnome2.sourceforge.jp/ ]"
+  puts "libnotify >= 0.7.0 is required in order to use this release."
+  puts "if you have libnotify <= 0.6.0 please install ruby-libnotify < 0.5.0"
 end

data/ext/rnotify.c

@@ -111,7 +111,7 @@ _wrap_notify_is_initted(VALUE self)
 
 /*
  * call-seq:
- *      app_name
+ *      name
  *
  * Returns the application name passed to Notify.init
  */
@@ -123,6 +123,28 @@ _wrap_notify_get_app_name(VALUE self)
   return rb_str_new2(name);
 }
 
+#ifdef HAVE_SET_APP_NAME
+/*
+ * call-seq:
+ *      name= new_name
+ *
+ *  if new_name is a valid string, change the application name to new_name
+ *  otherwise nothing will be changed
+ * 
+ *  ** ONLY WHEN COMPILED AGAINST LIBNOTIFY >= 0.7.2 **
+ */
+static VALUE
+_wrap_notify_set_app_name(VALUE self, VALUE app_name)
+{
+  char *name = NIL_P(app_name) ? NULL : StringValuePtr(app_name);
+
+  if(name != NULL || *name != '\0')
+    notify_set_app_name(name);
+
+  return Qnil;
+}
+#endif
+
 /*
  * call-seq:
  *      server_caps
@@ -197,7 +219,7 @@ _wrap_notify_get_server_info(VALUE self)
 
 /*
  * call-seq:
- *      new(summ, msg, icon, widget)
+ *      new(summ, msg, icon)
  *
  * summ = The summary text (required)
  *
@@ -205,38 +227,20 @@ _wrap_notify_get_server_info(VALUE self)
  *
  * icon = The icon or nil
  *
- * widget = The widget (or a Gtk::StatusIcon, when compiled against GTK+ >= 2.9.2 and libnotify >= 0.4.1) to attach to or nil
- *
  * Creates and returns a new notification, throw an exception on error
  */
 static VALUE
-_wrap_notification_init(VALUE self, VALUE summ, VALUE msg,
-                        VALUE icon, VALUE widget)
+_wrap_notification_init(VALUE self, VALUE summ, VALUE msg, VALUE icon)
 {
-  GObject *obj = G_OBJECT(RVAL2GOBJ(widget));
   char *nsumm = NIL_P(summ) ? NULL : StringValuePtr(summ);
   NotifyNotification *n = NULL;
 
   if(nsumm == NULL || *nsumm == '\0')
-    rb_raise( rb_eArgError, "REQUIRED: the `summ` field" );
-
-#ifdef HAVE_STATUS_ICON
-  if(GTK_IS_STATUS_ICON(obj))
-    n = notify_notification_new_with_status_icon(nsumm,
-                                                 NIL_P(msg) ? NULL : StringValuePtr(msg),
-                                                 NIL_P(icon) ? NULL : StringValuePtr(icon),
-                                                 GTK_STATUS_ICON(obj));
-  else
-    n = notify_notification_new(nsumm,
-                                NIL_P(msg) ? NULL : StringValuePtr(msg),
-                                NIL_P(icon) ? NULL : StringValuePtr(icon),
-                                GTK_WIDGET(obj));
-#else
+    rb_raise(rb_eArgError, "You need to supply a valid summary string");
+
   n = notify_notification_new(nsumm,
                               NIL_P(msg) ? NULL : StringValuePtr(msg),
-                              NIL_P(icon) ? NULL : StringValuePtr(icon),
-                              GTK_WIDGET(obj));
-#endif
+                              NIL_P(icon) ? NULL : StringValuePtr(icon));
 
   if(n == NULL)
     rb_raise(rb_eRuntimeError, "Can not create a new notification");
@@ -281,7 +285,7 @@ _wrap_notification_update(VALUE self, VALUE summ, VALUE msg, VALUE icon)
 #endif
 
   if(nsumm == NULL || *nsumm == '\0')
-    rb_raise(rb_eArgError, "REQUIRED: the `summ` field");
+    rb_raise(rb_eArgError, "You need to supply a valid summary string");
 
   if(notify_notification_update(n, nsumm, nmsg, nicon) == TRUE)
     return Qtrue;
@@ -289,39 +293,6 @@ _wrap_notification_update(VALUE self, VALUE summ, VALUE msg, VALUE icon)
   return Qfalse;
 }
 
-/*
- * call-seq:
- *      attach_to(widget)
- *
- * widget = The widget (or a Gtk::StatusIcon, when compiled against GTK+ >= 2.9.2 and libnotify >= 0.4.1) to attach to
- *
- * Attaches the notification to a Gtk::Widget or Gtk::StatusIcon
- */
-static VALUE
-_wrap_notification_attach_to(VALUE self, VALUE widget)
-{
-  GObject *obj = G_OBJECT(RVAL2GOBJ(widget));
-  NotifyNotification *n = NOTIFY_NOTIFICATION(RVAL2GOBJ(self));
-
-#ifdef DEBUG
-  if(NOTIFY_IS_NOTIFICATION(n))
-    rb_warn("attach_to, ok");
-  else
-    rb_warn("attach_to, no ok");
-#endif
-
-#ifdef HAVE_STATUS_ICON
-  if(GTK_IS_STATUS_ICON(obj))
-    notify_notification_attach_to_status_icon(n, GTK_STATUS_ICON(obj));
-  else
-    notify_notification_attach_to_widget(n, GTK_WIDGET(obj));
-#else
-  notify_notification_attach_to_widget(n, GTK_WIDGET(obj));
-#endif
-
-  return Qnil;
-}
-
 /*
  * call-seq:
  *      show
@@ -455,21 +426,21 @@ _wrap_notification_set_pixbuf_icon(VALUE self, VALUE icon)
     rb_warn("pixbuf_icon, no ok");
 #endif
 
-  notify_notification_set_icon_from_pixbuf(n, pix);
+  notify_notification_set_image_from_pixbuf(n, pix);
 
   return Qnil;
 }
 
 /*
- * call-seq:
- *      hint32(key, value)
- *
- * key = The hint
- *
- * value = The hint's value
- *
- * Sets a hint with a 32-bit integer value
- */
+* call-seq:
+* hint32(key, value)
+*
+* key = The hint
+*
+* value = The hint's value
+*
+* Sets a hint with a 32-bit integer value
+*/
 static VALUE
 _wrap_notification_set_hint32(VALUE self, VALUE key, VALUE value)
 {
@@ -489,15 +460,15 @@ _wrap_notification_set_hint32(VALUE self, VALUE key, VALUE value)
 }
 
 /*
- * call-seq:
- *      hint_double(key, value)
- *
- * key = The hint
- *
- * value = The hint's value
- *
- * Sets a hint with a double value
- */
+* call-seq:
+* hint_double(key, value)
+*
+* key = The hint
+*
+* value = The hint's value
+*
+* Sets a hint with a double value
+*/
 static VALUE
 _wrap_notification_set_hint_double(VALUE self, VALUE key, VALUE value)
 {
@@ -517,15 +488,15 @@ _wrap_notification_set_hint_double(VALUE self, VALUE key, VALUE value)
 }
 
 /*
- * call-seq:
- *      hint_string(key, value)
- *
- * key = The hint
- *
- * value = The hint's value
- *
- * Sets a hint with a string value
- */
+* call-seq:
+* hint_string(key, value)
+*
+* key = The hint
+*
+* value = The hint's value
+*
+* Sets a hint with a string value
+*/
 static VALUE
 _wrap_notification_set_hint_string(VALUE self, VALUE key, VALUE value)
 {
@@ -546,15 +517,15 @@ _wrap_notification_set_hint_string(VALUE self, VALUE key, VALUE value)
 }
 
 /*
- * call-seq:
- *      hint_byte(key, value)
- *
- * key = The hint
- *
- * value = The hint's value
- *
- * Sets a hint with a byte value
- */
+* call-seq:
+* hint_byte(key, value)
+*
+* key = The hint
+*
+* value = The hint's value
+*
+* Sets a hint with a byte value
+*/
 static VALUE
 _wrap_notification_set_hint_byte(VALUE self, VALUE key, VALUE value)
 {
@@ -596,43 +567,6 @@ _wrap_notification_clear_hints(VALUE self)
   return Qnil;
 }
 
-#ifdef HAVE_GEOMETRY_HINTS
-/*
- * call-seq:
- *      geometry_hints(screen, x, y)
- *
- * ** WHEN COMPILED AGAINST LIBNOTIFY 0.4.1 OR HIGHER **
- *
- * screen = The Gdk::Screen the notification should appear on
- *
- * x = The X coordinate to point to
- *
- * y = The Y coordinate to point to
- *
- * Sets the geometry hints on the notification
- */
-static VALUE
-_wrap_notification_set_geometry_hints(VALUE self, VALUE screen, VALUE x, VALUE y)
-{
-  GdkScreen *sc = GDK_SCREEN(RVAL2GOBJ(screen));
-  NotifyNotification *n = NOTIFY_NOTIFICATION(RVAL2GOBJ(self));
-
-  if(sc == NULL)
-    rb_raise(rb_eArgError, "REQUIRED: the `screen` field");
-
-#ifdef DEBUG
-  if(NOTIFY_IS_NOTIFICATION(n) && GDK_IS_SCREEN(sc))
-    rb_warn("set_geometry_hints, ok");
-  else
-    rb_warn("set_geometry_hints, no ok");
-#endif
-
-  notify_notification_set_geometry_hints(n, sc, FIX2INT(x), FIX2INT(y));
-
-  return Qnil;
-}
-#endif
-
 /*
  * call-seq:
  *      add_action(action, label, user_data) { |action, user_data| ... }
@@ -684,7 +618,7 @@ _wrap_notification_add_action(int argc, VALUE *argv, VALUE self)
   notify_notification_add_action(n,
                                  NIL_P(action) ? NULL : StringValuePtr(action),
                                  NIL_P(label) ? NULL : StringValuePtr(label),
-                                 (NotifyActionCallback) _notification_action_cb,
+                                 NOTIFY_ACTION_CALLBACK(_notification_action_cb),
                                  actionData, (GFreeFunc)_notification_action_free);
 
   return Qnil;
@@ -737,13 +671,10 @@ _wrap_notification_close(VALUE self)
   return Qfalse;
 }
 
-#ifdef HAVE_CLOSED_REASON
 /*
  * call-seq:
  *       closed_reason
  *
- * ** WHEN COMPILED AGAINST LIBNOTIFY 0.4.5 OR HIGHER **
- *
  * Returns the reason code why the notification was closed
  */
 static VALUE
@@ -763,7 +694,6 @@ _wrap_notification_get_closed_reason(VALUE self)
 
   return INT2FIX(reason);
 }
-#endif
 
 /*
  * libnotify ruby interface
@@ -785,13 +715,15 @@ Init_rnotify()
   rb_define_module_function(mNotify, "init", _wrap_notify_init, 1);
   rb_define_module_function(mNotify, "uninit", _wrap_notify_uninit, 0);
   rb_define_module_function(mNotify, "init?", _wrap_notify_is_initted, 0);
-  rb_define_module_function(mNotify, "app_name", _wrap_notify_get_app_name, 0);
+  rb_define_module_function(mNotify, "name", _wrap_notify_get_app_name, 0);
+#ifdef HAVE_SET_APP_NAME
+  rb_define_module_function(mNotify, "name=", _wrap_notify_set_app_name, 1);
+#endif
   rb_define_module_function(mNotify, "server_caps", _wrap_notify_get_server_caps, 0);
   rb_define_module_function(mNotify, "server_info", _wrap_notify_get_server_info, 0);
 
-  rb_define_method(cNotification, "initialize", _wrap_notification_init, 4);
+  rb_define_method(cNotification, "initialize", _wrap_notification_init, 3);
   rb_define_method(cNotification, "update", _wrap_notification_update, 3);
-  rb_define_method(cNotification, "attach_to", _wrap_notification_attach_to, 1);
   rb_define_method(cNotification, "show", _wrap_notification_show, 0);
   rb_define_method(cNotification, "timeout=", _wrap_notification_set_timeout, 1);
   rb_define_method(cNotification, "category=", _wrap_notification_set_category, 1);
@@ -801,14 +733,9 @@ Init_rnotify()
   rb_define_method(cNotification, "hint_double", _wrap_notification_set_hint_double, 2);
   rb_define_method(cNotification, "hint_string", _wrap_notification_set_hint_string, 2);
   rb_define_method(cNotification, "hint_byte", _wrap_notification_set_hint_byte, 2);
-#ifdef HAVE_GEOMETRY_HINTS
-  rb_define_method(cNotification, "geometry_hints", _wrap_notification_set_geometry_hints, 3);
-#endif
   rb_define_method(cNotification, "add_action", _wrap_notification_add_action, -1);
   rb_define_method(cNotification, "clear_actions", _wrap_notification_clear_actions, 0);
   rb_define_method(cNotification, "clear_hints", _wrap_notification_clear_hints, 0);
-#ifdef HAVE_CLOSED_REASON
   rb_define_method(cNotification, "closed_reason", _wrap_notification_get_closed_reason, 0);
-#endif
   rb_define_method(cNotification, "close", _wrap_notification_close, 0);
 }

data/lib/RNotify.rb

@@ -11,5 +11,5 @@ require 'gtk2'
 require 'rnotify.so'
 
 module Notify
-  VERSION = "0.4.1.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-libnotify
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  - 1
-  version: 0.4.1.1
+  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors: 
 - Luca Russo
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +01:00
+date: 2011-04-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 7
         version: 1.0.7
   type: :runtime
   version_requirements: *id001
@@ -42,49 +33,43 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- doc/ext/rnotify_c.html
 - doc/created.rid
-- doc/fr_file_index.html
-- doc/files/lib/RNotify_rb.html
-- doc/files/rnotify_c.html
-- doc/classes/Notify/Notification.html
-- doc/classes/Notify/Notification.src/M000024.html
-- doc/classes/Notify/Notification.src/M000020.html
-- doc/classes/Notify/Notification.src/M000014.html
-- doc/classes/Notify/Notification.src/M000022.html
-- doc/classes/Notify/Notification.src/M000012.html
-- doc/classes/Notify/Notification.src/M000018.html
-- doc/classes/Notify/Notification.src/M000019.html
-- doc/classes/Notify/Notification.src/M000016.html
-- doc/classes/Notify/Notification.src/M000010.html
-- doc/classes/Notify/Notification.src/M000017.html
-- doc/classes/Notify/Notification.src/M000007.html
-- doc/classes/Notify/Notification.src/M000013.html
-- doc/classes/Notify/Notification.src/M000023.html
-- doc/classes/Notify/Notification.src/M000015.html
-- doc/classes/Notify/Notification.src/M000021.html
-- doc/classes/Notify/Notification.src/M000011.html
-- doc/classes/Notify/Notification.src/M000009.html
-- doc/classes/Notify/Notification.src/M000008.html
-- doc/classes/Notify.html
-- doc/classes/Notify.src/M000002.html
-- doc/classes/Notify.src/M000004.html
-- doc/classes/Notify.src/M000005.html
-- doc/classes/Notify.src/M000006.html
-- doc/classes/Notify.src/M000001.html
-- doc/classes/Notify.src/M000003.html
-- doc/fr_method_index.html
-- doc/rdoc-style.css
-- doc/fr_class_index.html
+- doc/Notify/Notification.html
+- doc/lib/RNotify_rb.html
 - doc/index.html
+- doc/js/thickbox-compressed.js
+- doc/js/darkfish.js
+- doc/js/quicksearch.js
+- doc/js/jquery.js
+- doc/Notify.html
+- doc/rdoc.css
+- doc/images/find.png
+- doc/images/plugin.png
+- doc/images/bug.png
+- doc/images/bullet_toggle_plus.png
+- doc/images/loadingAnimation.gif
+- doc/images/wrench.png
+- doc/images/date.png
+- doc/images/page_white_text.png
+- doc/images/tag_green.png
+- doc/images/bullet_toggle_minus.png
+- doc/images/wrench_orange.png
+- doc/images/macFFBgHack.png
+- doc/images/brick_link.png
+- doc/images/page_white_width.png
+- doc/images/brick.png
+- doc/images/ruby.png
+- doc/images/bullet_black.png
+- doc/images/zoom.png
+- doc/images/package.png
+- doc/images/page_green.png
 - examples/multi-actions.rb
 - examples/markup.rb
 - examples/action.rb
 - examples/base.rb
 - examples/update.rb
-- examples/geometry-hints.rb
-- examples/attach_to.rb
 - examples/info.rb
-- examples/attach_to_status_icon.rb
 - examples/icon.png
 - examples/xy.rb
 - examples/urgency.rb
@@ -110,21 +95,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: ruby-libnotify is a ruby binding for libnotify