Changeset 2469

Show
Ignore:
Timestamp:
01/22/06 23:47:03
Author:
chipx86
Message:

Fix some errors in the spec file. Some pieces were not updated when the specification was changed, and some pieces were invalid XML.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libnotify/ChangeLog

    r2458 r2469  
     1Sun Jan 22 23:46:27 PST 2006  Christian Hammond <chipx86@chipx86.com> 
     2 
     3    * docs/notification-spec.xml: 
     4      - Fix some errors in the spec file. Some pieces were not updated when 
     5        the specification was changed, and some pieces were invalid XML. 
     6 
    17Sun Jan 22 13:21:52 PST 2006  Christian Hammond <chipx86@chipx86.com> 
    28 
  • trunk/libnotify/docs/notification-spec.xml

    r2452 r2469  
    228228       requested by the client. As an example one possible rendering of 
    229229       actions would be as buttons in the notification popup. 
    230  
     230      </entry> 
     231      <entry> 
    231232       Actions are sent over as a list of pairs. Each even element in the 
    232233       list (starting at index 0) represents the identifier for the action. 
     
    234235       displayed to the user. 
    235236      </entry> 
     237      <entry> 
     238       The default action (usually invoked my clicking the notification) 
     239       should have a key named <literal>"default"</literal>. The name can 
     240       be anything, though implementations are free not to display it. 
     241      <entry> 
    236242     </row> 
    237243     <row> 
     
    949955        <entry>ARRAY</entry> 
    950956        <entry> 
    951          Actions are sent over as a list of pairs.  Each even element in the list  
    952          (starting at index 0) represents the identifier for the action.  Each odd 
    953          element in the list is the localized string that will be displayed to the user. 
     957         Actions are sent over as a list of pairs. Each even element in 
     958         the list (starting at index 0) represents the identifier for the 
     959         action. Each odd element in the list is the localized string 
     960         that will be displayed to the user. 
    954961        </entry> 
    955962       </row> 
     
    11421149      </funcdef> 
    11431150      <paramdef>UINT32 <parameter>id</parameter></paramdef> 
    1144 <!--  <paramdef>BOOL <parameter>default_action</parameter></paramdef> --> 
    1145       <paramdef>UINT32 <parameter>action_id</parameter></paramdef> 
     1151      <paramdef>STRING <parameter>action_key</parameter></paramdef> 
    11461152     </funcprototype> 
    11471153    </funcsynopsis> 
     
    11811187        </entry> 
    11821188       </row> 
    1183 <!-- 
    1184        <row> 
    1185         <entry><parameter>default_action</parameter></entry> 
    1186         <entry>BOOL</entry> 
    1187         <entry> 
    1188          <constant>TRUE</constant> if the default action was invoked. 
    1189          The default action is often a click on the notification. If this 
    1190          is <constant>TRUE</constant>, the <parameter>action_id</parameter> 
    1191          parameter is ignored. 
    1192         </entry> 
    1193        </row> 
    1194 --> 
    1195        <row> 
    1196         <entry><parameter>action_id</parameter></entry> 
    1197         <entry>UINT32</entry> 
    1198         <entry> 
    1199          The ID of the action invoked. A value of 0 means that the default 
    1200          action was invoked, i.e., clicking the notification itself. 
    1201          IDs greater than zero are the action IDs as defined by the 
    1202          calling application. 
    1203 <!-- 
    1204          This is ignored if 
    1205          <parameter>default_action</parameter> is <constant>TRUE</constant>. 
    1206 --> 
     1189       <row> 
     1190        <entry><parameter>action_key</parameter></entry> 
     1191        <entry>STRING</entry> 
     1192        <entry> 
     1193         The key of the action invoked. These match the keys sent over 
     1194         in the list of actions. 
    12071195        </entry> 
    12081196       </row> 
  • trunk/libnotify/libnotify/notification.c

    r2458 r2469  
    8989 
    9090static void 
    91 notify_notification_class_init(NotifyNotificationClass * klass) 
     91notify_notification_class_init(NotifyNotificationClass *klass) 
    9292{ 
    9393    GObjectClass *object_class = G_OBJECT_CLASS(klass);