Download as
Browse Code »

Commit 4be428c22ebf8a82ffcff6694e75de09b3a02e7c

Authored by Perry Werneck
2 parents 1418030b f503b3ee
Exists in master and in 2 other branches develop, script-support

Merge branch 'master' into develop

Showing 4 changed files with 8 additions and 17 deletions   Show diff stats
schemas/linux/application.gschema.xml.in
  Diff comments   View file @4be428c
@@ -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 @4be428c
@@ -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 @4be428c
@@ -525,9 +525,6 @@ @@ -525,9 +525,6 @@
525 525
526 GSettings *settings = NULL; 526 GSettings *settings = NULL;
527 527
528 - g_autofree gchar * path = g_strconcat("/apps/" PACKAGE_NAME "/", g_get_application_name(),"/",NULL);  
529 - debug("path=%s",path);  
530 -  
531 #ifdef DEBUG 528 #ifdef DEBUG
532 GError * error = NULL; 529 GError * error = NULL;
533 GSettingsSchemaSource * source = 530 GSettingsSchemaSource * source =
@@ -543,18 +540,18 @@ @@ -543,18 +540,18 @@
543 GSettingsSchema * schema = 540 GSettingsSchema * schema =
544 g_settings_schema_source_lookup( 541 g_settings_schema_source_lookup(
545 source, 542 source,
546 - "br.com.bb." PACKAGE_NAME, 543 + "br.com.bb." G_STRINGIFY(PRODUCT_NAME),
547 TRUE); 544 TRUE);
548 545
549 debug("schema %s=%p","br.com.bb." PACKAGE_NAME,schema); 546 debug("schema %s=%p","br.com.bb." PACKAGE_NAME,schema);
550 547
551 - settings = g_settings_new_full(schema, NULL, path); 548 + settings = g_settings_new_full(schema, NULL, NULL);
552 549
553 g_settings_schema_source_unref(source); 550 g_settings_schema_source_unref(source);
554 551
555 #else 552 #else
556 553
557 - settings = g_settings_new_with_path("br.com.bb." PACKAGE_NAME, path); 554 + settings = g_settings_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME));
558 555
559 #endif // DEBUG 556 #endif // DEBUG
560 557
src/objects/window/window.c
  Diff comments   View file @4be428c
@@ -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