PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-18 13:54:36 -05:00
Code Releases Activity

Quick fix.

Browse source
This commit is contained in:
Dave Davenport 2016-03-21 20:27:16 +01:00
parent 8914fbf2df
commit 3ac0c6dd7d
5 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile.am
View file

@ -139,9 +139,9 @@ update-manpage: $(top_srcdir)/doc/rofi-manpage.markdown
## ##
# Rofi test program # Rofi test program
## ##
check_PROGRAMS=rofi_test textbox_test helper_test helper_expand check_PROGRAMS=history_test textbox_test helper_test helper_expand
rofi_test_CFLAGS=\ history_test_CFLAGS=\
$(AM_CFLAGS)\ $(AM_CFLAGS)\
$(glib_CFLAGS)\ $(glib_CFLAGS)\
$(libsn_CFLAGS)\ $(libsn_CFLAGS)\
@ -149,11 +149,11 @@ rofi_test_CFLAGS=\
-I$(top_srcdir)/config/\ -I$(top_srcdir)/config/\
-I$(top_builddir)/ -I$(top_builddir)/
rofi_test_LDADD=\ history_test_LDADD=\
$(glib_LIBS) $(glib_LIBS)
rofi_test_SOURCES=\ history_test_SOURCES=\
source/history.c\ source/history.c\
config/config.c\ config/config.c\
include/rofi.h\ include/rofi.h\
@ -252,7 +252,7 @@ helper_expand_CFLAGS=${helper_test_CFLAGS}
helper_expand_LDADD=${helper_test_LDADD} helper_expand_LDADD=${helper_test_LDADD}
TESTS=\ TESTS=\
rofi_test\ history_test\
helper_test\ helper_test\
helper_expand helper_expand
@ -308,7 +308,7 @@ test-x1: $(bin_PROGRAMS)
.PHONY: indent .PHONY: indent
indent: $(rofi_SOURCES) $(helper_test_SOURCES) $(textbox_test_SOURCES) $(rofi_test_SOURCES) indent: $(rofi_SOURCES) $(helper_test_SOURCES) $(textbox_test_SOURCES) $(history_test_SOURCES) $(helper_expand_SOURCES)
uncrustify -c $(top_srcdir)/data/uncrustify.cfg --replace $^ uncrustify -c $(top_srcdir)/data/uncrustify.cfg --replace $^
.PHONY: cppcheck .PHONY: cppcheck

3
source/dialogs/run.c
View file

@ -401,14 +401,13 @@ static ModeMode run_mode_result ( Mode *sw, int mretv, char **input, unsigned in
delete_entry ( rmpd->cmd_list[selected_line] ); delete_entry ( rmpd->cmd_list[selected_line] );
// Clear the list. // Clear the list.
retv = RELOAD_DIALOG; retv = RELOAD_DIALOG;
run_mode_destroy ( sw ); run_mode_destroy ( sw );
run_mode_init ( sw ); run_mode_init ( sw );
} }
return retv; return retv;
} }
static char *_get_display_value ( const Mode *sw, unsigned int selected_line, G_GNUC_UNUSED int *state, int get_entry ) static char *_get_display_value ( const Mode *sw, unsigned int selected_line, G_GNUC_UNUSED int *state, int get_entry )
{ {
const RunModePrivateData *rmpd = (const RunModePrivateData *) sw->private_data; const RunModePrivateData *rmpd = (const RunModePrivateData *) sw->private_data;

2
source/view.c
View file

@ -1415,7 +1415,7 @@ static void rofi_view_mainloop_iter ( RofiViewState *state, xcb_generic_event_t
state->selected_line = UINT32_MAX; state->selected_line = UINT32_MAX;
if ( state->selected < state->filtered_lines ) { if ( state->selected < state->filtered_lines ) {
( state->selected_line ) = state->line_map[state->selected]; ( state->selected_line ) = state->line_map[state->selected];
state->retv = MENU_OK; state->retv = MENU_OK;
} }
else{ else{
// Nothing entered and nothing selected. // Nothing entered and nothing selected.

4
source/x11-helper.c
View file

@ -280,8 +280,8 @@ void monitor_active ( workarea *mon )
// place the menu above the window // place the menu above the window
// if some window is focused, place menu above window, else fall // if some window is focused, place menu above window, else fall
// back to selected monitor. // back to selected monitor.
mon->x = t->dst_x-r->x; mon->x = t->dst_x - r->x;
mon->y = t->dst_y-r->y; mon->y = t->dst_y - r->y;
mon->w = r->width; mon->w = r->width;
mon->h = r->height; mon->h = r->height;
mon->t = r->border_width; mon->t = r->border_width;

1
test/helper-expand.c
View file

@ -73,5 +73,4 @@ int main ( int argc, char ** argv )
str = rofi_expand_path ( "~root/" ); str = rofi_expand_path ( "~root/" );
TASSERT ( str[0] == '/' ); TASSERT ( str[0] == '/' );
g_free ( str ); g_free ( str );
} }