DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2012-06-26 22:11:22 +00:00
parent d9aafd3076
commit eace2f90ea
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/surfer.c
View File

@ -149,11 +149,11 @@ static const DesktopMenu _menu_edit[] =
GDK_CONTROL_MASK, GDK_KEY_V }, GDK_CONTROL_MASK, GDK_KEY_V },
{ "", NULL, NULL, 0, 0 }, { "", NULL, NULL, 0, 0 },
{ N_("Select _all"), G_CALLBACK(on_edit_select_all), { N_("Select _all"), G_CALLBACK(on_edit_select_all),
#if GTK_CHECK_VERSION(2, 10, 0) # if GTK_CHECK_VERSION(2, 10, 0)
GTK_STOCK_SELECT_ALL, GTK_STOCK_SELECT_ALL,
#else # else
NULL, NULL,
#endif # endif
GDK_CONTROL_MASK, GDK_KEY_A }, GDK_CONTROL_MASK, GDK_KEY_A },
{ N_("_Unselect all"), G_CALLBACK(on_edit_unselect_all), NULL, 0, 0 }, { N_("_Unselect all"), G_CALLBACK(on_edit_unselect_all), NULL, 0, 0 },
{ "", NULL, NULL, 0, 0 }, { "", NULL, NULL, 0, 0 },
@ -174,13 +174,13 @@ static const DesktopMenu _menu_view[] =
{ N_("Normal size"), G_CALLBACK(on_view_normal_size), { N_("Normal size"), G_CALLBACK(on_view_normal_size),
"zoom-original", GDK_CONTROL_MASK, GDK_KEY_0 }, "zoom-original", GDK_CONTROL_MASK, GDK_KEY_0 },
{ "", NULL, NULL, 0, 0 }, { "", NULL, NULL, 0, 0 },
#if GTK_CHECK_VERSION(2, 8, 0)
{ N_("_Fullscreen"), G_CALLBACK(on_view_fullscreen), { N_("_Fullscreen"), G_CALLBACK(on_view_fullscreen),
GTK_STOCK_FULLSCREEN, 0, GDK_KEY_F11 }, # if GTK_CHECK_VERSION(2, 8, 0)
#else GTK_STOCK_FULLSCREEN,
{ N_("_Fullscreen"), G_CALLBACK(on_view_fullscreen), NULL, 0, # else
GDK_KEY_F11 }, NULL,
#endif # endif
0, GDK_KEY_F11 },
{ "", NULL, NULL, 0, 0 }, { "", NULL, NULL, 0, 0 },
{ N_("_Refresh"), G_CALLBACK(on_view_refresh), GTK_STOCK_REFRESH, { N_("_Refresh"), G_CALLBACK(on_view_refresh), GTK_STOCK_REFRESH,
GDK_CONTROL_MASK, GDK_KEY_R }, GDK_CONTROL_MASK, GDK_KEY_R },
@ -201,11 +201,11 @@ static const DesktopMenu _menu_help[] =
{ N_("_Contents"), G_CALLBACK(on_help_contents), "help-contents", { N_("_Contents"), G_CALLBACK(on_help_contents), "help-contents",
0, GDK_KEY_F1 }, 0, GDK_KEY_F1 },
{ N_("_About"), G_CALLBACK(on_help_about), { N_("_About"), G_CALLBACK(on_help_about),
#if GTK_CHECK_VERSION(2, 6, 0) # if GTK_CHECK_VERSION(2, 6, 0)
GTK_STOCK_ABOUT, 0, 0 }, GTK_STOCK_ABOUT, 0, 0 },
#else # else
NULL, 0, 0 }, NULL, 0, 0 },
#endif # endif
{ NULL, NULL, NULL, 0, 0 } { NULL, NULL, NULL, 0, 0 }
}; };

9
tools/helper.c
View File

@ -123,13 +123,12 @@ static const DesktopMenu _menu_file[] =
static const DesktopMenu _menu_view[] = static const DesktopMenu _menu_view[] =
{ {
#if GTK_CHECK_VERSION(2, 8, 0)
{ N_("_Fullscreen"), G_CALLBACK(_helper_on_view_fullscreen), { N_("_Fullscreen"), G_CALLBACK(_helper_on_view_fullscreen),
# if GTK_CHECK_VERSION(2, 8, 0)
GTK_STOCK_FULLSCREEN, 0, GDK_KEY_F11 }, GTK_STOCK_FULLSCREEN, 0, GDK_KEY_F11 },
#else # else
{ N_("_Fullscreen"), G_CALLBACK(_helper_on_view_fullscreen), NULL, 0, NULL, 0, GDK_KEY_F11 },
GDK_KEY_F11 }, # endif
#endif
{ NULL, NULL, NULL, 0, 0 } { NULL, NULL, NULL, 0, 0 }
}; };