ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-04-23 19:10:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into gtk3

Browse source 
Conflicts:
	radiant/mainframe.cpp
This commit is contained in:
Timothee "TTimo" Besset 2015-09-27 11:39:45 -05:00
commit d5af21b669
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/vfspk3/vfs.cpp
View file

@ -114,9 +114,10 @@ static void vfsInitPakFile( const char *filename ){
guint32 i;
int err;
errno = 0;
uf = unzOpen( filename );
if ( uf == NULL ) {
g_FuncTable.m_pfnSysFPrintf( SYS_WRN, " failed to init pak file %s\n", filename );
g_FuncTable.m_pfnSysFPrintf( SYS_WRN, " failed to init pak file %s. %s\n", filename, ( errno !=0 ? strerror( errno ): "" ) );
return;
}
g_FuncTable.m_pfnSysPrintf( " pak file: %s\n", filename );

3
radiant/mainframe.cpp
View file

@ -1520,6 +1520,7 @@ void MainFrame::create_main_menu( GtkWidget *window, GtkWidget *vbox ){
item = create_menu_item_with_mnemonic( menu, _( "Simple Patch Mesh..." ),
G_CALLBACK( HandleCommand ), ID_CURVE_SIMPLEPATCHMESH );
g_object_set_data( G_OBJECT( window ), "menu_simplepatchmesh", item );
create_menu_item_with_mnemonic( menu, _( "Patch Inspector" ), GTK_SIGNAL_FUNC( HandleCommand ), ID_PATCH_INSPECTOR );
menu_separator( menu );
menu_in_menu = create_menu_in_menu_with_mnemonic( menu, _( "Insert" ) );
create_menu_item_with_mnemonic( menu_in_menu, _( "Insert (2) Columns" ),
@ -1981,7 +1982,7 @@ void MainFrame::create_plugin_toolbar( GtkWidget *window, GtkWidget *vbox ){
gtk_box_pack_start( GTK_BOX( vbox ), toolbar, FALSE, FALSE, 0 );
g_object_set_data( G_OBJECT( window ), "toolbar_plugin", toolbar );
if ( g_PrefsDlg.m_bPluginToolbar ) {
gtk_widget_show( toolbar );
gtk_widget_show( toolbar );
}
}