1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-02-03 15:34:54 -05:00

Make function declaration match function prototype.

- Extra NULL check.
This commit is contained in:
Dave Davenport 2017-06-09 09:18:17 +02:00
parent b99f86f341
commit 067544120f
3 changed files with 12 additions and 6 deletions

View file

@ -225,13 +225,13 @@ char * rofi_force_utf8 ( const gchar *data, ssize_t length );
char * rofi_latin_to_utf8_strdup ( const char *input, gssize length );
/**
* @param input the string to escape
* @param text the string to escape
*
* Escape XML markup from the string. @param input is freed.
*
* @return the escaped string
*/
gchar *rofi_escape_markup ( gchar *input );
gchar *rofi_escape_markup ( gchar *text );
/**
* @param pattern The user input to match against.

View file

@ -272,11 +272,11 @@ WidgetTriggerActionResult widget_trigger_action ( widget *wid, guint action, gin
/**
* @param wid The widget handle
* @param cb The widget trigger action callback
* @param udata the user data to pass to callback
* @param cb_data the user data to pass to callback
*
* Override the widget trigger action handler on widget.
*/
void widget_set_trigger_action_handler ( widget *wid, widget_trigger_action_cb cb, void *udata );
void widget_set_trigger_action_handler ( widget *wid, widget_trigger_action_cb cb, void *cb_data );
/**
* @param wid The widget handle

View file

@ -551,14 +551,20 @@ int widget_padding_get_padding_width ( const widget *wid )
int widget_get_desired_height ( widget *wid )
{
if ( wid && wid->get_desired_height ) {
if ( wid == NULL ) {
return 0;
}
if ( wid->get_desired_height ) {
return wid->get_desired_height ( wid );
}
return wid->h;
}
int widget_get_desired_width ( widget *wid )
{
if ( wid && wid->get_desired_width ) {
if ( wid == NULL ) {
return 0;
}
if ( wid->get_desired_width ) {
return wid->get_desired_width ( wid );
}
return wid->w;