Mageia Bugzilla – Attachment 1495 Details for
Bug 4408
metacity segfaults in oxygen theme (gtk2)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
another patch
metacity.patch (text/plain), 870 bytes, created by
Hugo Pereira Da Costa
on 2012-02-05 17:48:01 CET
(
hide
)
Description:
another patch
Filename:
MIME Type:
Creator:
Hugo Pereira Da Costa
Created:
2012-02-05 17:48:01 CET
Size:
870 bytes
patch
obsolete
>diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp >index 4ed5401..d0e4e84 100644 >--- a/src/oxygenqtsettings.cpp >+++ b/src/oxygenqtsettings.cpp >@@ -449,8 +449,12 @@ namespace Oxygen > gchar** gtkSearchPath; > int nElements; > gtk_icon_theme_get_search_path( gtk_icon_theme_get_default(), >kSearchPath, &nElements ); >- for( int i=0; i<nElements; i++ ) { searchPath.insert( gtkSearchPath[i] ); } >- g_free( gtkSearchPath ); >+ if( gtkSearchPath ) >+ { >+ for( int i=0; i<nElements; i++ ) >+ { searchPath.insert( gtkSearchPath[i] ); } >+ g_free( gtkSearchPath ); >+ } > > // add kde's path. Loop is reversed because added path must be prepended. > for( PathList::const_reverse_iterator iter = _kdeIconPathList.rbegin(); iter != _kdeIconPathList.rend(); ++iter )
diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp index 4ed5401..d0e4e84 100644 --- a/src/oxygenqtsettings.cpp +++ b/src/oxygenqtsettings.cpp @@ -449,8 +449,12 @@ namespace Oxygen gchar** gtkSearchPath; int nElements; gtk_icon_theme_get_search_path( gtk_icon_theme_get_default(), >kSearchPath, &nElements ); - for( int i=0; i<nElements; i++ ) { searchPath.insert( gtkSearchPath[i] ); } - g_free( gtkSearchPath ); + if( gtkSearchPath ) + { + for( int i=0; i<nElements; i++ ) + { searchPath.insert( gtkSearchPath[i] ); } + g_free( gtkSearchPath ); + } // add kde's path. Loop is reversed because added path must be prepended. for( PathList::const_reverse_iterator iter = _kdeIconPathList.rbegin(); iter != _kdeIconPathList.rend(); ++iter )
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 4408
:
1492
|
1493
|
1494
|
1495
|
1496
|
1497
|
1499