Download as
Browse Code »

Commit f503b3ee321d866656e2829626712dcdaed3e2ad

Authored by Perry Werneck
1 parent 5fbb011d
Exists in master and in 2 other branches develop, script-support

Fixing schema paths.

Showing 4 changed files with 8 additions and 17 deletions   Show diff stats
schemas/linux/application.gschema.xml.in
  Diff comments   View file @f503b3e
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 30
31 <schemalist> 31 <schemalist>
32 32
33 - <schema id="br.com.bb.@PACKAGE_NAME@"> 33 + <schema path="/br/com/bb/@PRODUCT_NAME@/" id="br.com.bb.@PRODUCT_NAME@">
34 34
35 <key name="ui-style" type="u"> 35 <key name="ui-style" type="u">
36 <default>2</default> 36 <default>2</default>
schemas/linux/window.gschema.xml.in
  Diff comments   View file @f503b3e
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 30
31 <schemalist> 31 <schemalist>
32 32
33 - <schema id="br.com.bb.@PACKAGE_NAME@.window"> 33 + <schema path="/br/com/bb/@PRODUCT_NAME@/window/" id="br.com.bb.@PRODUCT_NAME@.window">
34 34
35 <key name="width" type="i"> 35 <key name="width" type="i">
36 <default>-1</default> 36 <default>-1</default>
src/objects/application/application.c
  Diff comments   View file @f503b3e
@@ -492,9 +492,6 @@ @@ -492,9 +492,6 @@
492 492
493 GSettings *settings = NULL; 493 GSettings *settings = NULL;
494 494
495 - g_autofree gchar * path = g_strconcat("/apps/" PACKAGE_NAME "/", g_get_application_name(),"/",NULL);  
496 - debug("path=%s",path);  
497 -  
498 #ifdef DEBUG 495 #ifdef DEBUG
499 GError * error = NULL; 496 GError * error = NULL;
500 GSettingsSchemaSource * source = 497 GSettingsSchemaSource * source =
@@ -510,18 +507,18 @@ @@ -510,18 +507,18 @@
510 GSettingsSchema * schema = 507 GSettingsSchema * schema =
511 g_settings_schema_source_lookup( 508 g_settings_schema_source_lookup(
512 source, 509 source,
513 - "br.com.bb." PACKAGE_NAME, 510 + "br.com.bb." G_STRINGIFY(PRODUCT_NAME),
514 TRUE); 511 TRUE);
515 512
516 debug("schema %s=%p","br.com.bb." PACKAGE_NAME,schema); 513 debug("schema %s=%p","br.com.bb." PACKAGE_NAME,schema);
517 514
518 - settings = g_settings_new_full(schema, NULL, path); 515 + settings = g_settings_new_full(schema, NULL, NULL);
519 516
520 g_settings_schema_source_unref(source); 517 g_settings_schema_source_unref(source);
521 518
522 #else 519 #else
523 520
524 - settings = g_settings_new_with_path("br.com.bb." PACKAGE_NAME, path); 521 + settings = g_settings_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME));
525 522
526 #endif // DEBUG 523 #endif // DEBUG
527 524
src/objects/window/window.c
  Diff comments   View file @f503b3e
@@ -841,10 +841,6 @@ @@ -841,10 +841,6 @@
841 841
842 GSettings *pw3270_application_window_settings_new() { 842 GSettings *pw3270_application_window_settings_new() {
843 843
844 - // Get settings  
845 - g_autofree gchar * path = g_strconcat("/apps/" PACKAGE_NAME "/", g_get_application_name(), "/window/",NULL);  
846 - debug("path=%s",path);  
847 -  
848 #ifdef DEBUG 844 #ifdef DEBUG
849 845
850 GError * error = NULL; 846 GError * error = NULL;
@@ -861,18 +857,16 @@ @@ -861,18 +857,16 @@
861 GSettingsSchema * schema = 857 GSettingsSchema * schema =
862 g_settings_schema_source_lookup( 858 g_settings_schema_source_lookup(
863 source, 859 source,
864 - "br.com.bb." PACKAGE_NAME ".window", 860 + "br.com.bb." G_STRINGIFY(PRODUCT_NAME) ".window",
865 TRUE); 861 TRUE);
866 862
867 - debug("schema %s=%p path=%s","br.com.bb." PACKAGE_NAME ".window",schema,path);  
868 -  
869 - GSettings * settings = g_settings_new_full(schema, NULL, path); 863 + GSettings * settings = g_settings_new_full(schema, NULL, NULL);
870 864
871 g_settings_schema_source_unref(source); 865 g_settings_schema_source_unref(source);
872 866
873 #else 867 #else
874 868
875 - GSettings * settings = g_settings_new_with_path("br.com.bb." PACKAGE_NAME ".window", path); 869 + GSettings * settings = g_settings_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME) ".window");
876 870
877 #endif // DEBUG 871 #endif // DEBUG
878 872