1 # HG changeset patch

     2 # User Wolfgang Rosenauer <wr@rosenauer.org>

     3 # Parent  04d0a1058aef5d88bddfca8f37759d7abea4bd5b

     4 

     5 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js

     6 --- a/browser/app/profile/firefox.js

     7 +++ b/browser/app/profile/firefox.js

     8 @@ -465,21 +465,17 @@ pref("browser.tabs.warnOnOpen", true);

     9  pref("browser.tabs.maxOpenBeforeWarn", 15);

    10  pref("browser.tabs.loadInBackground", true);

    11  pref("browser.tabs.opentabfor.middleclick", true);

    12  pref("browser.tabs.loadDivertedInBackground", false);

    13  pref("browser.tabs.loadBookmarksInBackground", false);

    14  pref("browser.tabs.loadBookmarksInTabs", false);

    15  pref("browser.tabs.tabClipWidth", 140);

    16  pref("browser.tabs.tabMinWidth", 76);

    17 -#ifdef UNIX_BUT_NOT_MAC

    18 -pref("browser.tabs.drawInTitlebar", false);

    19 -#else

    20  pref("browser.tabs.drawInTitlebar", true);

    21 -#endif

    22  

    23  // Offer additional drag space to the user. The drag space

    24  // will only be shown if browser.tabs.drawInTitlebar is true.

    25  pref("browser.tabs.extraDragSpace", false);

    26  

    27  // 0 - Disable the tabbar session restore button.

    28  // 1 - Enable the tabbar session restore button.

    29  // 2 - Control group. The tabbar session restore button is disabled,

    30 diff --git a/browser/base/moz.build b/browser/base/moz.build

    31 --- a/browser/base/moz.build

    32 +++ b/browser/base/moz.build

    33 @@ -52,15 +52,15 @@ BROWSER_CHROME_MANIFESTS += [

    34  DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']

    35  DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']

    36  

    37  DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR

    38  

    39  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):

    40      DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1

    41  

    42 -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):

    43 +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa', 'gtk3'):

    44      DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1

    45  

    46  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):

    47      DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1

    48  

    49  JAR_MANIFESTS += ['jar.mn']

    50 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js

    51 --- a/modules/libpref/init/all.js

    52 +++ b/modules/libpref/init/all.js

    53 @@ -4936,16 +4936,17 @@ pref("gfx.content.always-paint", false);

    54  pref("gfx.apitrace.enabled",false);

    55  #endif

    56  

    57  #ifdef MOZ_X11

    58  #ifdef MOZ_WIDGET_GTK

    59  pref("gfx.xrender.enabled",false);

    60  pref("widget.chrome.allow-gtk-dark-theme", false);

    61  pref("widget.content.allow-gtk-dark-theme", false);

    62 +pref("widget.allow-client-side-decoration", false);

    63  #endif

    64  #endif

    65  

    66  pref("widget.window-transforms.disabled", false);

    67  

    68  #ifdef XP_WIN

    69  // Whether to disable the automatic detection and use of direct2d.

    70  pref("gfx.direct2d.disabled", false);

    71 diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build

    72 --- a/toolkit/modules/moz.build

    73 +++ b/toolkit/modules/moz.build

    74 @@ -254,17 +254,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco

    75  EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']

    76  EXTRA_JS_MODULES.sessionstore += [

    77      'sessionstore/PrivacyLevel.jsm',

    78      'sessionstore/SessionHistory.jsm',

    79      'sessionstore/Utils.jsm',

    80  ]

    81  

    82  DEFINES['INSTALL_COMPACT_THEMES'] = 1

    83 -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):

    84 +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa', 'gtk3'):

    85      DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1

    86  

    87  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):

    88      DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1

    89  

    90  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):

    91      DEFINES['HAVE_SHELL_SERVICE'] = 1

    92