vcs.maemo.org Git - oespirit1/blob - libhildonfm/mer-changes.patch

   1 --- debian/rules
   2 +++ debian/rules
   3 @@ -13,7 +13,7 @@
   4  DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
   5
   6
   7 -CFLAGS = -Wall -g -Werror
   8 +CFLAGS = -Wall -g
   9
  10  ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
  11         CFLAGS += -O0
  12 --- debian/control
  13 +++ debian/control
  14 @@ -2,7 +2,7 @@
  15  Section: x11
  16  Priority: optional
  17  Maintainer: Richard Sun <richard.sun@nokia.com>
  18 -Build-Depends: debhelper (>= 4.0.0), pkg-config, libosso-dev (>= 0.9.1-1), libgtk2.0-dev (>= 2:2.10), libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, libhildon-thumbnail-dev, osso-gwconnect-dev, mce-dev, libdbus-1-dev (>= 1.0), libdbus-glib-1-dev (>= 0.50-1osso), libhildon1-dev, libhildonmime-dev, gtk-doc-tools
  19 +Build-Depends: debhelper (>= 4.0.0), pkg-config, libosso-dev (>= 0.9.1-1), libgtk2.0-dev (>= 2:2.10), libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, libhildon-thumbnail-dev, osso-gwconnect-dev, mce-dev, libdbus-1-dev (>= 1.0), libdbus-glib-1-dev (>= 0.50-1osso), libhildon1-dev, libhildonmime-dev, gtk-doc-tools, autoconf, automake, libtool
  20  Standards-Version: 3.6.0
  21
  22 --- hildon-fm/hildon-fm-enum-types.h
  23 +++ hildon-fm/hildon-fm-enum-types.h
  24 @@ -0,0 +1,30 @@
  25 +
  26 +/* Generated data (by glib-mkenums) */
  27 +
  28 +#ifndef __HILDON_FM_ENUM_TYPES_H__
  29 +#define __HILDON_FM_ENUM_TYPES_H__
  30 +
  31 +#include <glib-object.h>
  32 +
  33 +G_BEGIN_DECLS
  34 +/* enumerations from "hildon-file-selection.h" */
  35 +GType hildon_file_selection_mode_get_type (void);
  36 +#define HILDON_TYPE_FILE_SELECTION_MODE (hildon_file_selection_mode_get_type())
  37 +GType hildon_file_selection_sort_key_get_type (void);
  38 +#define HILDON_TYPE_FILE_SELECTION_SORT_KEY (hildon_file_selection_sort_key_get_type())
  39 +GType hildon_file_selection_pane_get_type (void);
  40 +#define HILDON_TYPE_FILE_SELECTION_PANE (hildon_file_selection_pane_get_type())
  41 +GType hildon_file_selection_visible_columns_get_type (void);
  42 +#define HILDON_TYPE_FILE_SELECTION_VISIBLE_COLUMNS (hildon_file_selection_visible_columns_get_type())
  43 +/* enumerations from "hildon-file-system-model.h" */
  44 +GType hildon_file_system_model_columns_get_type (void);
  45 +#define HILDON_TYPE_FILE_SYSTEM_MODEL_COLUMNS (hildon_file_system_model_columns_get_type())
  46 +/* enumerations from "hildon-file-system-common.h" */
  47 +GType hildon_file_system_model_item_type_get_type (void);
  48 +#define HILDON_TYPE_FILE_SYSTEM_MODEL_ITEM_TYPE (hildon_file_system_model_item_type_get_type())
  49 +G_END_DECLS
  50 +
  51 +#endif /* __HILDON_FM_ENUM_TYPES_H__ */
  52 +
  53 +/* Generated data ends here */
  54 +
  55 --- hildon-fm/hildon-fm-enum-types.c
  56 +++ hildon-fm/hildon-fm-enum-types.c
  57 @@ -0,0 +1,143 @@
  58 +
  59 +/* Generated data (by glib-mkenums) */
  60 +
  61 +#include "hildon-file-chooser-dialog.h"
  62 +#include "hildon-file-details-dialog.h"
  63 +#include "hildon-file-selection.h"
  64 +#include "hildon-file-system-common.h"
  65 +#include "hildon-file-system-info.h"
  66 +#include "hildon-file-system-model.h"
  67 +#include "hildon-fm-enum-types.h"
  68 +#include <glib-object.h>
  69 +
  70 +/* enumerations from "hildon-file-selection.h" */
  71 +GType
  72 +hildon_file_selection_mode_get_type (void)
  73 +{
  74 +  static GType etype = 0;
  75 +  if (etype == 0) {
  76 +    static const GEnumValue values[] = {
  77 +      { HILDON_FILE_SELECTION_MODE_LIST, "HILDON_FILE_SELECTION_MODE_LIST", "list" },
  78 +      { HILDON_FILE_SELECTION_MODE_THUMBNAILS, "HILDON_FILE_SELECTION_MODE_THUMBNAILS", "thumbnails" },
  79 +      { 0, NULL, NULL }
  80 +    };
  81 +    etype = g_enum_register_static ("HildonFileSelectionMode", values);
  82 +  }
  83 +  return etype;
  84 +}
  85 +GType
  86 +hildon_file_selection_sort_key_get_type (void)
  87 +{
  88 +  static GType etype = 0;
  89 +  if (etype == 0) {
  90 +    static const GEnumValue values[] = {
  91 +      { HILDON_FILE_SELECTION_SORT_NAME, "HILDON_FILE_SELECTION_SORT_NAME", "name" },
  92 +      { HILDON_FILE_SELECTION_SORT_TYPE, "HILDON_FILE_SELECTION_SORT_TYPE", "type" },
  93 +      { HILDON_FILE_SELECTION_SORT_MODIFIED, "HILDON_FILE_SELECTION_SORT_MODIFIED", "modified" },
  94 +      { HILDON_FILE_SELECTION_SORT_SIZE, "HILDON_FILE_SELECTION_SORT_SIZE", "size" },
  95 +      { 0, NULL, NULL }
  96 +    };
  97 +    etype = g_enum_register_static ("HildonFileSelectionSortKey", values);
  98 +  }
  99 +  return etype;
 100 +}
 101 +GType
 102 +hildon_file_selection_pane_get_type (void)
 103 +{
 104 +  static GType etype = 0;
 105 +  if (etype == 0) {
 106 +    static const GEnumValue values[] = {
 107 +      { HILDON_FILE_SELECTION_PANE_NAVIGATION, "HILDON_FILE_SELECTION_PANE_NAVIGATION", "navigation" },
 108 +      { HILDON_FILE_SELECTION_PANE_CONTENT, "HILDON_FILE_SELECTION_PANE_CONTENT", "content" },
 109 +      { 0, NULL, NULL }
 110 +    };
 111 +    etype = g_enum_register_static ("HildonFileSelectionPane", values);
 112 +  }
 113 +  return etype;
 114 +}
 115 +GType
 116 +hildon_file_selection_visible_columns_get_type (void)
 117 +{
 118 +  static GType etype = 0;
 119 +  if (etype == 0) {
 120 +    static const GEnumValue values[] = {
 121 +      { HILDON_FILE_SELECTION_SHOW_NAME, "HILDON_FILE_SELECTION_SHOW_NAME", "name" },
 122 +      { HILDON_FILE_SELECTION_SHOW_MODIFIED, "HILDON_FILE_SELECTION_SHOW_MODIFIED", "modified" },
 123 +      { HILDON_FILE_SELECTION_SHOW_SIZE, "HILDON_FILE_SELECTION_SHOW_SIZE", "size" },
 124 +      { HILDON_FILE_SELECTION_SHOW_ALL, "HILDON_FILE_SELECTION_SHOW_ALL", "all" },
 125 +      { 0, NULL, NULL }
 126 +    };
 127 +    etype = g_enum_register_static ("HildonFileSelectionVisibleColumns", values);
 128 +  }
 129 +  return etype;
 130 +}
 131 +
 132 +/* enumerations from "hildon-file-system-model.h" */
 133 +GType
 134 +hildon_file_system_model_columns_get_type (void)
 135 +{
 136 +  static GType etype = 0;
 137 +  if (etype == 0) {
 138 +    static const GEnumValue values[] = {
 139 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_GTK_PATH_INTERNAL, "HILDON_FILE_SYSTEM_MODEL_COLUMN_GTK_PATH_INTERNAL", "column-gtk-path-internal" },
 140 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_LOCAL_PATH, "HILDON_FILE_SYSTEM_MODEL_COLUMN_LOCAL_PATH", "column-local-path" },
 141 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_URI, "HILDON_FILE_SYSTEM_MODEL_COLUMN_URI", "column-uri" },
 142 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_NAME, "HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_NAME", "column-file-name" },
 143 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_DISPLAY_NAME, "HILDON_FILE_SYSTEM_MODEL_COLUMN_DISPLAY_NAME", "column-display-name" },
 144 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_SORT_KEY, "HILDON_FILE_SYSTEM_MODEL_COLUMN_SORT_KEY", "column-sort-key" },
 145 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_MIME_TYPE, "HILDON_FILE_SYSTEM_MODEL_COLUMN_MIME_TYPE", "column-mime-type" },
 146 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_SIZE, "HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_SIZE", "column-file-size" },
 147 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_TIME, "HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_TIME", "column-file-time" },
 148 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_FOLDER, "HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_FOLDER", "column-is-folder" },
 149 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_AVAILABLE, "HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_AVAILABLE", "column-is-available" },
 150 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_HAS_LOCAL_PATH, "HILDON_FILE_SYSTEM_MODEL_COLUMN_HAS_LOCAL_PATH", "column-has-local-path" },
 151 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_TYPE, "HILDON_FILE_SYSTEM_MODEL_COLUMN_TYPE", "column-type" },
 152 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_ICON, "HILDON_FILE_SYSTEM_MODEL_COLUMN_ICON", "column-icon" },
 153 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_ICON_EXPANDED, "HILDON_FILE_SYSTEM_MODEL_COLUMN_ICON_EXPANDED", "column-icon-expanded" },
 154 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_ICON_COLLAPSED, "HILDON_FILE_SYSTEM_MODEL_COLUMN_ICON_COLLAPSED", "column-icon-collapsed" },
 155 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_THUMBNAIL, "HILDON_FILE_SYSTEM_MODEL_COLUMN_THUMBNAIL", "column-thumbnail" },
 156 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_LOAD_READY, "HILDON_FILE_SYSTEM_MODEL_COLUMN_LOAD_READY", "column-load-ready" },
 157 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_FREE_SPACE, "HILDON_FILE_SYSTEM_MODEL_COLUMN_FREE_SPACE", "column-free-space" },
 158 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_TITLE, "HILDON_FILE_SYSTEM_MODEL_COLUMN_TITLE", "column-title" },
 159 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_AUTHOR, "HILDON_FILE_SYSTEM_MODEL_COLUMN_AUTHOR", "column-author" },
 160 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_HIDDEN, "HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_HIDDEN", "column-is-hidden" },
 161 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_UNAVAILABLE_REASON, "HILDON_FILE_SYSTEM_MODEL_COLUMN_UNAVAILABLE_REASON", "column-unavailable-reason" },
 162 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_FAILED_ACCESS_MESSAGE, "HILDON_FILE_SYSTEM_MODEL_COLUMN_FAILED_ACCESS_MESSAGE", "column-failed-access-message" },
 163 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_SORT_WEIGHT, "HILDON_FILE_SYSTEM_MODEL_COLUMN_SORT_WEIGHT", "column-sort-weight" },
 164 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_EXTRA_INFO, "HILDON_FILE_SYSTEM_MODEL_COLUMN_EXTRA_INFO", "column-extra-info" },
 165 +      { HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_DRIVE, "HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_DRIVE", "column-is-drive" },
 166 +      { HILDON_FILE_SYSTEM_MODEL_NUM_COLUMNS, "HILDON_FILE_SYSTEM_MODEL_NUM_COLUMNS", "num-columns" },
 167 +      { 0, NULL, NULL }
 168 +    };
 169 +    etype = g_enum_register_static ("HildonFileSystemModelColumns", values);
 170 +  }
 171 +  return etype;
 172 +}
 173 +
 174 +/* enumerations from "hildon-file-system-common.h" */
 175 +GType
 176 +hildon_file_system_model_item_type_get_type (void)
 177 +{
 178 +  static GType etype = 0;
 179 +  if (etype == 0) {
 180 +    static const GEnumValue values[] = {
 181 +      { HILDON_FILE_SYSTEM_MODEL_UNKNOWN, "HILDON_FILE_SYSTEM_MODEL_UNKNOWN", "unknown" },
 182 +      { HILDON_FILE_SYSTEM_MODEL_FILE, "HILDON_FILE_SYSTEM_MODEL_FILE", "file" },
 183 +      { HILDON_FILE_SYSTEM_MODEL_FOLDER, "HILDON_FILE_SYSTEM_MODEL_FOLDER", "folder" },
 184 +      { HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_IMAGES, "HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_IMAGES", "safe-folder-images" },
 185 +      { HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_VIDEOS, "HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_VIDEOS", "safe-folder-videos" },
 186 +      { HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_SOUNDS, "HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_SOUNDS", "safe-folder-sounds" },
 187 +      { HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_DOCUMENTS, "HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_DOCUMENTS", "safe-folder-documents" },
 188 +      { HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_GAMES, "HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_GAMES", "safe-folder-games" },
 189 +      { HILDON_FILE_SYSTEM_MODEL_MMC, "HILDON_FILE_SYSTEM_MODEL_MMC", "mmc" },
 190 +      { HILDON_FILE_SYSTEM_MODEL_GATEWAY, "HILDON_FILE_SYSTEM_MODEL_GATEWAY", "gateway" },
 191 +      { HILDON_FILE_SYSTEM_MODEL_LOCAL_DEVICE, "HILDON_FILE_SYSTEM_MODEL_LOCAL_DEVICE", "local-device" },
 192 +      { 0, NULL, NULL }
 193 +    };
 194 +    etype = g_enum_register_static ("HildonFileSystemModelItemType", values);
 195 +  }
 196 +  return etype;
 197 +}
 198 +
 199 +/* Generated data ends here */
 200 +