mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2025-01-31 00:24:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of pwmt.org:zathura into develop

Browse source
This commit is contained in:
Sebastian Ramacher 2011-12-09 22:18:12 +01:00
commit 435727672c
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
callbacks.c
View file

@ -98,8 +98,9 @@ cb_pages_per_row_value_changed(girara_session_t* UNUSED(session), const char* UN
void void
cb_index_row_activated(GtkTreeView* tree_view, GtkTreePath* path, cb_index_row_activated(GtkTreeView* tree_view, GtkTreePath* path,
GtkTreeViewColumn* UNUSED(column), zathura_t* zathura) GtkTreeViewColumn* UNUSED(column), void* data)
{ {
zathura_t* zathura = data;
if (tree_view == NULL || zathura == NULL || zathura->ui.session == NULL) { if (tree_view == NULL || zathura == NULL || zathura->ui.session == NULL) {
return; return;
} }

7
callbacks.h
View file

@ -5,8 +5,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <girara/types.h> #include <girara/types.h>
#include <girara/macros.h>
#include "zathura.h"
/** /**
* Quits the current zathura session * Quits the current zathura session
@ -39,7 +38,7 @@ void cb_view_vadjustment_value_changed(GtkAdjustment *adjustment, gpointer data)
* @param session The current girara session * @param session The current girara session
* @param setting The "pages-per-row" setting * @param setting The "pages-per-row" setting
*/ */
void cb_pages_per_row_value_changed(girara_session_t* UNUSED(session), const char* UNUSED(name), girara_setting_type_t UNUSED(type), void* value, void* data); void cb_pages_per_row_value_changed(girara_session_t* GIRARA_UNUSED(session), const char* GIRARA_UNUSED(name), girara_setting_type_t GIRARA_UNUSED(type), void* value, void* data);
/** /**
* Called when an index element is activated (e.g.: double click) * Called when an index element is activated (e.g.: double click)
@ -50,6 +49,6 @@ void cb_pages_per_row_value_changed(girara_session_t* UNUSED(session), const cha
* @param zathura Zathura session * @param zathura Zathura session
*/ */
void cb_index_row_activated(GtkTreeView* tree_view, GtkTreePath* path, void cb_index_row_activated(GtkTreeView* tree_view, GtkTreePath* path,
GtkTreeViewColumn* column, zathura_t* zathura); GtkTreeViewColumn* column, void* zathura);
#endif // CALLBACKS_H #endif // CALLBACKS_H

2
commands.c
View file

@ -270,7 +270,7 @@ cmd_savef(girara_session_t* session, girara_list_t* argument_list)
} }
bool bool
cmd_search(girara_session_t* session, char* input, girara_argument_t* argument) cmd_search(girara_session_t* session, const char* input, girara_argument_t* argument)
{ {
g_return_val_if_fail(session != NULL, false); g_return_val_if_fail(session != NULL, false);
g_return_val_if_fail(input != NULL, false); g_return_val_if_fail(input != NULL, false);

2
commands.h
View file

@ -104,6 +104,6 @@ bool cmd_savef(girara_session_t* session, girara_list_t* argument_list);
* @param argument Passed argument * @param argument Passed argument
* @return true if no error occured * @return true if no error occured
*/ */
bool cmd_search(girara_session_t* session, char* input, girara_argument_t* argument); bool cmd_search(girara_session_t* session, const char* input, girara_argument_t* argument);
#endif // COMMANDS_H #endif // COMMANDS_H