Code cleanup

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

View File

@ -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)
GTK_STOCK_FULLSCREEN,
# else # else
{ N_("_Fullscreen"), G_CALLBACK(on_view_fullscreen), NULL, 0, NULL,
GDK_KEY_F11 },
# 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 },

View File

@ -123,12 +123,11 @@ 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 }
}; };