~ubuntu-branches/ubuntu/vivid/nip2/vivid-proposed

« back to all changes in this revision

Viewing changes to src/paintboxview.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry
  • Date: 2009-05-12 09:26:46 UTC
  • mfrom: (1.2.11 upstream) (2.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090512092646-j8lb1w2x69pvgma4
Tags: 7.18.1-1ubuntu1
* Merge from debian unstable (LP: #375435), remaining changes:
  - debian/control: Also Recommend abrowser

Show diffs side-by-side

added added

removed removed

Lines of Context:
189
189
 
190
190
        imageinfo_undo_clear( pbv->ii );
191
191
 
192
 
        nfn( sys, IWINDOW_TRUE );
 
192
        nfn( sys, IWINDOW_YES );
193
193
}
194
194
 
195
195
static void
298
298
                        GTK_SIGNAL_FUNC( paintboxview_tool_toggled_cb ), pbv );
299
299
                image = gtk_image_new_from_stock( tool_names[i],
300
300
                        GTK_ICON_SIZE_BUTTON );
301
 
                set_tooltip( pbv->tool[i], tool_tooltips[i] );
 
301
                set_tooltip( pbv->tool[i], "%s", tool_tooltips[i] );
302
302
                gtk_container_add( GTK_CONTAINER( pbv->tool[i] ), image );
303
303
 
304
304
                gtk_box_pack_start( GTK_BOX( hb2 ), 
344
344
                        GTK_SIGNAL_FUNC( paintboxview_tool_toggled_cb ), pbv );
345
345
                image = gtk_image_new_from_stock( tool_names[i],
346
346
                        GTK_ICON_SIZE_BUTTON );
347
 
                set_tooltip( pbv->tool[i], tool_tooltips[i] );
 
347
                set_tooltip( pbv->tool[i], "%s", tool_tooltips[i] );
348
348
                gtk_container_add( GTK_CONTAINER( pbv->tool[i] ), image );
349
349
 
350
350
                gtk_box_pack_start( GTK_BOX( hb2 ),