[gnome-documents] all: port to use the libgd git submodule
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-documents] all: port to use the libgd git submodule
- Date: Tue, 21 Aug 2012 12:29:45 +0000 (UTC)
commit 4de27c626777d3661771566ed74d8a315521b5c4
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Aug 21 13:12:59 2012 +0200
all: port to use the libgd git submodule
.gitmodules | 3 +
Makefile.am | 4 +-
autogen.sh | 1 +
configure.ac | 11 +
data/Makefile.am | 2 +-
libgd | 1 +
po/POTFILES.in | 1 -
src/Makefile-lib.am | 38 +--
src/documents.js | 37 +-
src/embed.js | 1 -
src/lib/gd-main-icon-view.c | 203 --------
src/lib/gd-main-icon-view.h | 74 ---
src/lib/gd-main-list-view.c | 224 ---------
src/lib/gd-main-list-view.h | 80 ---
src/lib/gd-main-toolbar.c | 405 ---------------
src/lib/gd-main-toolbar.h | 96 ----
src/lib/gd-main-view-generic.c | 154 ------
src/lib/gd-main-view-generic.h | 106 ----
src/lib/gd-main-view.c | 725 ---------------------------
src/lib/gd-main-view.h | 93 ----
src/lib/gd-margin-container.c | 379 --------------
src/lib/gd-margin-container.h | 75 ---
src/lib/gd-notification.c | 928 -----------------------------------
src/lib/gd-notification.h | 67 ---
src/lib/gd-tagged-entry.c | 1037 ---------------------------------------
src/lib/gd-tagged-entry.h | 90 ----
src/lib/gd-two-lines-renderer.c | 528 --------------------
src/lib/gd-two-lines-renderer.h | 75 ---
src/lib/gd-utils.c | 140 ------
src/lib/gd-utils.h | 4 -
src/manager.js | 4 +-
src/preview.js | 10 +-
src/query.js | 6 +-
src/selections.js | 4 +-
src/shellSearchProvider.js | 8 +-
src/utils.js | 3 +-
src/view.js | 5 +-
37 files changed, 68 insertions(+), 5554 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..303eb9b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libgd"]
+ path = libgd
+ url = ../libgd
diff --git a/Makefile.am b/Makefile.am
index 6979ff2..1b458e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
-SUBDIRS = src data po
+SUBDIRS = libgd src data po
EXTRA_DIST = \
autogen.sh \
diff --git a/autogen.sh b/autogen.sh
index 8a5bcaa..13887fc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="gnome-documents"
+ACLOCAL_FLAGS="-I libgd"
(test -f $srcdir/src/main.js) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
diff --git a/configure.ac b/configure.ac
index 3f3ee6c..d1846b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,16 @@ PKG_CHECK_MODULES(MINER,
libgdata >= $GDATA_MIN_VERSION
zapojit-0.0 >= $ZAPOJIT_MIN_VERSION)
+LIBGD_INIT([
+ gtk-hacks
+ main-view
+ main-toolbar
+ margin-container
+ notification
+ tagged-entry
+ gir
+])
+
GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
AC_SUBST(GJS_CONSOLE)
@@ -89,6 +99,7 @@ AC_SUBST(GLIB_COMPILE_RESOURCES)
AC_CONFIG_FILES([
Makefile
+libgd/Makefile
src/Makefile
data/Makefile
data/icons/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 2d1c9ed..83ab9a9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -28,7 +28,7 @@ service_in_files = \
gsettings_ENUM_NAMESPACE = org.gnome.Documents
gsettings_ENUM_FILES = \
- $(top_srcdir)/src/lib/gd-main-view.h
+ $(top_srcdir)/libgd/libgd/gd-main-view.h
gsettingsschema_in_files = org.gnome.documents.gschema.xml.in
gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
diff --git a/libgd b/libgd
new file mode 160000
index 0000000..041c4a7
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit 041c4a70d57d36a61111df94a0fba1a2a3488bd1
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9256122..3be6c9f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,6 @@ data/gnome-documents.desktop.in.in
data/org.gnome.documents.gschema.xml.in
src/application.js
src/documents.js
-src/lib/gd-main-toolbar.c
src/lib/gd-pdf-loader.c
src/mainToolbar.js
src/mainWindow.js
diff --git a/src/Makefile-lib.am b/src/Makefile-lib.am
index 42c2d88..924c351 100644
--- a/src/Makefile-lib.am
+++ b/src/Makefile-lib.am
@@ -9,41 +9,21 @@ gdprivate_cflags = \
gdprivate_source_h = \
lib/gd-utils.h \
lib/gd-fullscreen-filter.h \
- lib/gd-main-toolbar.h \
- lib/gd-main-view-generic.h \
- lib/gd-main-icon-view.h \
- lib/gd-main-list-view.h \
- lib/gd-main-view.h \
- lib/gd-margin-container.h \
lib/gd-metadata.h \
- lib/gd-notification.h \
lib/gd-pdf-loader.h \
lib/gd-sidebar-thumbnails.h \
lib/gd-styled-text-renderer.h \
- lib/gd-tagged-entry.h \
lib/gd-thumb-nav.h \
- lib/gd-toggle-pixbuf-renderer.h \
- lib/gd-two-lines-renderer.h \
$(NULL)
gdprivate_source_c = \
lib/gd-utils.c \
lib/gd-fullscreen-filter.c \
- lib/gd-main-toolbar.c \
- lib/gd-main-view-generic.c \
- lib/gd-main-icon-view.c \
- lib/gd-main-list-view.c \
- lib/gd-main-view.c \
- lib/gd-margin-container.c \
lib/gd-metadata.c \
- lib/gd-notification.c \
lib/gd-pdf-loader.c \
lib/gd-sidebar-thumbnails.c \
lib/gd-styled-text-renderer.c \
- lib/gd-tagged-entry.c \
lib/gd-thumb-nav.c \
- lib/gd-toggle-pixbuf-renderer.c \
- lib/gd-two-lines-renderer.c \
$(NULL)
pkglib_LTLIBRARIES += libgdprivate-1.0.la
@@ -62,15 +42,15 @@ libgdprivate_1_0_la_SOURCES = \
$(gdprivate_source_h) \
$(gdprivate_source_c)
-INTROSPECTION_GIRS += Gd-1.0.gir
+INTROSPECTION_GIRS += GdPrivate-1.0.gir
-Gd-1.0.gir: libgdprivate-1.0.la Makefile
-Gd_1_0_gir_NAMESPACE = Gd
-Gd_1_0_gir_VERSION = 1.0
-Gd_1_0_gir_LIBS = libgdprivate-1.0.la
-Gd_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(gdprivate_cflags)
-Gd_1_0_gir_SCANNERFLAGS = --warn-all --symbol-prefix=gd --identifier-prefix=Gd
-Gd_1_0_gir_INCLUDES = \
+GdPrivate-1.0.gir: libgdprivate-1.0.la Makefile
+GdPrivate_1_0_gir_NAMESPACE = GdPrivate
+GdPrivate_1_0_gir_VERSION = 1.0
+GdPrivate_1_0_gir_LIBS = libgdprivate-1.0.la
+GdPrivate_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(gdprivate_cflags)
+GdPrivate_1_0_gir_SCANNERFLAGS = --warn-all --symbol-prefix=gd --identifier-prefix=Gd
+GdPrivate_1_0_gir_INCLUDES = \
GData-0.0 \
Goa-1.0 \
Gtk-3.0 \
@@ -78,6 +58,6 @@ Gd_1_0_gir_INCLUDES = \
EvinceView-3.0 \
Zpj-0.0
-Gd_1_0_gir_FILES = \
+GdPrivate_1_0_gir_FILES = \
$(addprefix $(srcdir)/,$(gdprivate_source_h)) \
$(addprefix $(srcdir)/,$(gdprivate_source_c))
diff --git a/src/documents.js b/src/documents.js
index 783ba56..ff2c40e 100644
--- a/src/documents.js
+++ b/src/documents.js
@@ -23,6 +23,7 @@ const EvView = imports.gi.EvinceView;
const GdkPixbuf = imports.gi.GdkPixbuf;
const Gio = imports.gi.Gio;
const Gd = imports.gi.Gd;
+const GdPrivate = imports.gi.GdPrivate;
const Gdk = imports.gi.Gdk;
const GData = imports.gi.GData;
const GLib = imports.gi.GLib;
@@ -243,7 +244,7 @@ const CollectionIconWatcher = new Lang.Class({
pixbufs.push(doc.pristinePixbuf);
});
- this._pixbuf = Gd.create_collection_icon(Utils.getIconSize(), pixbufs);
+ this._pixbuf = GdPrivate.create_collection_icon(Utils.getIconSize(), pixbufs);
this._emitRefresh();
},
@@ -358,7 +359,7 @@ const DocCommon = new Lang.Class({
if (title && title != '')
this.name = title;
else if (filename)
- this.name = Gd.filename_strip_extension(filename);
+ this.name = GdPrivate.filename_strip_extension(filename);
else
this.name = '';
@@ -453,13 +454,13 @@ const DocCommon = new Lang.Class({
this.thumbnailed = false;
// try to create the thumbnail
- Gd.queue_thumbnail_job_for_file_async(this._file,
- Lang.bind(this, this._onQueueThumbnailJob));
+ GdPrivate.queue_thumbnail_job_for_file_async(this._file,
+ Lang.bind(this, this._onQueueThumbnailJob));
}
},
_onQueueThumbnailJob: function(object, res) {
- let thumbnailed = Gd.queue_thumbnail_job_for_file_finish(res);
+ let thumbnailed = GdPrivate.queue_thumbnail_job_for_file_finish(res);
if (!thumbnailed) {
this._failedThumbnailing = true;
@@ -579,7 +580,7 @@ const DocCommon = new Lang.Class({
if (this.thumbnailed) {
let [ slice, border ] = Utils.getThumbnailFrameBorder();
- this.pixbuf = Gd.embed_image_in_frame(pixbuf,
+ this.pixbuf = GdPrivate.embed_image_in_frame(pixbuf,
Path.ICONS_DIR + 'thumbnail-frame.png',
slice, border);
} else {
@@ -663,10 +664,10 @@ const LocalDocument = new Lang.Class({
},
load: function(cancellable, callback) {
- Gd.pdf_loader_load_uri_async(this.uri, cancellable, Lang.bind(this,
+ GdPrivate.pdf_loader_load_uri_async(this.uri, cancellable, Lang.bind(this,
function(source, res) {
try {
- let docModel = Gd.pdf_loader_load_uri_finish(res);
+ let docModel = GdPrivate.pdf_loader_load_uri_finish(res);
callback(this, docModel, null);
} catch (e) {
callback(this, null, e);
@@ -734,10 +735,10 @@ const GoogleDocument = new Lang.Class({
function(entry, service, exception) {
if (exception) {
// try loading from the most recent cache, if any
- Gd.pdf_loader_load_uri_async(this.identifier, cancellable, Lang.bind(this,
+ GdPrivate.pdf_loader_load_uri_async(this.identifier, cancellable, Lang.bind(this,
function(source, res) {
try {
- let docModel = Gd.pdf_loader_load_uri_finish(res);
+ let docModel = GdPrivate.pdf_loader_load_uri_finish(res);
callback(this, docModel, null);
} catch (e) {
// report the outmost error only
@@ -748,11 +749,11 @@ const GoogleDocument = new Lang.Class({
return;
}
- Gd.pdf_loader_load_gdata_entry_async
+ GdPrivate.pdf_loader_load_gdata_entry_async
(entry, service, cancellable, Lang.bind(this,
function(source, res) {
try {
- let docModel = Gd.pdf_loader_load_uri_finish(res);
+ let docModel = GdPrivate.pdf_loader_load_uri_finish(res);
callback(this, docModel, null);
} catch (e) {
callback(this, null, e);
@@ -873,10 +874,10 @@ const SkydriveDocument = new Lang.Class({
function(entry, service, exception) {
if (exception) {
// try loading from the most recent cache, if any
- Gd.pdf_loader_load_uri_async(this.identifier, cancellable, Lang.bind(this,
+ GdPrivate.pdf_loader_load_uri_async(this.identifier, cancellable, Lang.bind(this,
function(source, res) {
try {
- let docModel = Gd.pdf_loader_load_uri_finish(res);
+ let docModel = GdPrivate.pdf_loader_load_uri_finish(res);
callback(this, docModel, null);
} catch (e) {
// report the outmost error only
@@ -887,11 +888,11 @@ const SkydriveDocument = new Lang.Class({
return;
}
- Gd.pdf_loader_load_zpj_entry_async
+ GdPrivate.pdf_loader_load_zpj_entry_async
(entry, service, cancellable, Lang.bind(this,
function(source, res) {
try {
- let docModel = Gd.pdf_loader_load_zpj_entry_finish(res);
+ let docModel = GdPrivate.pdf_loader_load_zpj_entry_finish(res);
callback(this, docModel, null);
} catch (e) {
callback(this, null, e);
@@ -1086,10 +1087,10 @@ const DocumentManager = new Lang.Class({
let evDoc = docModel.get_document();
let file = Gio.File.new_for_uri(evDoc.get_uri());
- if (!Gd.is_metadata_supported_for_file(file))
+ if (!GdPrivate.is_metadata_supported_for_file(file))
return;
- let metadata = new Gd.Metadata({ file: file });
+ let metadata = new GdPrivate.Metadata({ file: file });
// save current page in metadata
let [res, val] = metadata.get_int('page');
diff --git a/src/embed.js b/src/embed.js
index 1e2a567..f720c5a 100644
--- a/src/embed.js
+++ b/src/embed.js
@@ -35,7 +35,6 @@ const WindowMode = imports.windowMode;
const Clutter = imports.gi.Clutter;
const EvView = imports.gi.EvinceView;
-const Gd = imports.gi.Gd;
const Gio = imports.gi.Gio;
const Gtk = imports.gi.Gtk;
const GtkClutter = imports.gi.GtkClutter;
diff --git a/src/lib/gd-utils.c b/src/lib/gd-utils.c
index e3b2eff..cf79e59 100644
--- a/src/lib/gd-utils.c
+++ b/src/lib/gd-utils.c
@@ -482,146 +482,6 @@ gd_create_collection_icon (gint base_size,
return retval;
}
-#define _BG_MIN_SIZE 20
-#define _EMBLEM_MIN_SIZE 8
-
-/**
- * gd_create_symbolic_icon:
- * @name:
- *
- * Returns: (transfer full):
- */
-GIcon *
-gd_create_symbolic_icon (const gchar *name,
- gint base_size)
-{
- gchar *symbolic_name;
- GIcon *icon, *retval = NULL;
- cairo_surface_t *surface;
- cairo_t *cr;
- GtkStyleContext *style;
- GtkWidgetPath *path;
- GdkPixbuf *pixbuf;
- GtkIconTheme *theme;
- GtkIconInfo *info;
- gint bg_size;
- gint emblem_size;
- gint total_size;
-
- total_size = base_size / 2;
- bg_size = MAX (total_size / 2, _BG_MIN_SIZE);
- emblem_size = MAX (bg_size - 8, _EMBLEM_MIN_SIZE);
-
- surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, total_size, total_size);
- cr = cairo_create (surface);
-
- style = gtk_style_context_new ();
-
- path = gtk_widget_path_new ();
- gtk_widget_path_append_type (path, GTK_TYPE_ICON_VIEW);
- gtk_style_context_set_path (style, path);
- gtk_widget_path_unref (path);
-
- gtk_style_context_add_class (style, "documents-icon-bg");
-
- gtk_render_background (style, cr, (total_size - bg_size) / 2, (total_size - bg_size) / 2, bg_size, bg_size);
-
- symbolic_name = g_strconcat (name, "-symbolic", NULL);
- icon = g_themed_icon_new_with_default_fallbacks (symbolic_name);
- g_free (symbolic_name);
-
- theme = gtk_icon_theme_get_default();
- info = gtk_icon_theme_lookup_by_gicon (theme, icon, emblem_size,
- GTK_ICON_LOOKUP_FORCE_SIZE);
- g_object_unref (icon);
-
- if (info == NULL)
- goto out;
-
- pixbuf = gtk_icon_info_load_symbolic_for_context (info, style, NULL, NULL);
- gtk_icon_info_free (info);
-
- if (pixbuf == NULL)
- goto out;
-
- gtk_render_icon (style, cr, pixbuf, (total_size - emblem_size) / 2, (total_size - emblem_size) / 2);
- g_object_unref (pixbuf);
-
- retval = G_ICON (gdk_pixbuf_get_from_surface (surface, 0, 0, total_size, total_size));
-
- out:
- g_object_unref (style);
- cairo_surface_destroy (surface);
- cairo_destroy (cr);
-
- return retval;
-}
-
-/* taken from gtk/gtktreeview.c */
-static void
-send_focus_change (GtkWidget *widget,
- GdkDevice *device,
- gboolean in)
-{
- GdkDeviceManager *device_manager;
- GList *devices, *d;
-
- device_manager = gdk_display_get_device_manager (gtk_widget_get_display (widget));
- devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
- devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
- devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
-
- for (d = devices; d; d = d->next)
- {
- GdkDevice *dev = d->data;
- GdkEvent *fevent;
- GdkWindow *window;
-
- if (gdk_device_get_source (dev) != GDK_SOURCE_KEYBOARD)
- continue;
-
- window = gtk_widget_get_window (widget);
-
- /* Skip non-master keyboards that haven't
- * selected for events from this window
- */
- if (gdk_device_get_device_type (dev) != GDK_DEVICE_TYPE_MASTER &&
- !gdk_window_get_device_events (window, dev))
- continue;
-
- fevent = gdk_event_new (GDK_FOCUS_CHANGE);
-
- fevent->focus_change.type = GDK_FOCUS_CHANGE;
- fevent->focus_change.window = g_object_ref (window);
- fevent->focus_change.in = in;
- gdk_event_set_device (fevent, device);
-
- gtk_widget_send_focus_change (widget, fevent);
-
- gdk_event_free (fevent);
- }
-
- g_list_free (devices);
-}
-
-void
-gd_entry_focus_hack (GtkWidget *entry,
- GdkDevice *device)
-{
- GtkEntryClass *entry_class;
- GtkWidgetClass *entry_parent_class;
-
- /* Grab focus will select all the text. We don't want that to happen, so we
- * call the parent instance and bypass the selection change. This is probably
- * really non-kosher. */
- entry_class = g_type_class_peek (GTK_TYPE_ENTRY);
- entry_parent_class = g_type_class_peek_parent (entry_class);
- (entry_parent_class->grab_focus) (entry);
-
- /* send focus-in event */
- send_focus_change (entry, device, TRUE);
-}
-
/**
* gd_create_variant_from_pixbuf:
* @pixbuf:
diff --git a/src/lib/gd-utils.h b/src/lib/gd-utils.h
index 601cbe6..d0c3517 100644
--- a/src/lib/gd-utils.h
+++ b/src/lib/gd-utils.h
@@ -51,10 +51,6 @@ gchar *gd_iso8601_from_timestamp (gint64 timestamp);
GIcon *gd_create_collection_icon (gint base_size,
GList *pixbufs);
-GIcon *gd_create_symbolic_icon (const gchar *name,
- gint base_size);
-void gd_entry_focus_hack (GtkWidget *entry,
- GdkDevice *device);
GVariant *gd_create_variant_from_pixbuf (GdkPixbuf *pixbuf);
diff --git a/src/manager.js b/src/manager.js
index ca4856b..f850412 100644
--- a/src/manager.js
+++ b/src/manager.js
@@ -19,7 +19,7 @@
*
*/
-const Gd = imports.gi.Gd;
+const GdPrivate = imports.gi.GdPrivate;
const Gdk = imports.gi.Gdk;
const GObject = imports.gi.GObject;
const Gtk = imports.gi.Gtk;
@@ -224,7 +224,7 @@ const BaseView = new Lang.Class({
this.widget = new Gtk.TreeView({ headers_visible: false,
enable_search: false });
this._treeView = this.widget;
- Gd.gtk_tree_view_set_activate_on_single_click(this._treeView, true);
+ GdPrivate.gtk_tree_view_set_activate_on_single_click(this._treeView, true);
this._treeView.set_model(this._model.model);
let selection = this._treeView.get_selection();
diff --git a/src/preview.js b/src/preview.js
index 0d751d4..3a0d977 100644
--- a/src/preview.js
+++ b/src/preview.js
@@ -21,7 +21,7 @@
const Clutter = imports.gi.Clutter;
const EvView = imports.gi.EvinceView;
-const Gd = imports.gi.Gd;
+const GdPrivate = imports.gi.GdPrivate;
const Gdk = imports.gi.Gdk;
const Gio = imports.gi.Gio;
const Gtk = imports.gi.Gtk;
@@ -175,7 +175,7 @@ const PreviewView = new Lang.Class({
_onSearchJobUpdated: function(job, page) {
// FIXME: ev_job_find_get_results() returns a GList **
// and thus is not introspectable
- Gd.ev_view_find_changed(this.view, job, page);
+ GdPrivate.ev_view_find_changed(this.view, job, page);
},
setModel: function(model) {
@@ -202,8 +202,8 @@ const PreviewThumbnails = new Lang.Class({
Name: 'PreviewThumbnails',
_init: function(model) {
- this.view = new Gd.SidebarThumbnails({ model: model });
- this.widget = new Gd.ThumbNav({ thumbview: this.view });
+ this.view = new GdPrivate.SidebarThumbnails({ model: model });
+ this.widget = new GdPrivate.ThumbNav({ thumbview: this.view });
this.actor = new GtkClutter.Actor({ contents: this.widget,
opacity: 0 });
@@ -239,7 +239,7 @@ const PreviewFullscreen = new Lang.Class({
let model = previewView.getModel();
- this._filter = new Gd.FullscreenFilter();
+ this._filter = new GdPrivate.FullscreenFilter();
this._filter.connect('motion-event', Lang.bind(this, this._fullscreenMotionHandler));
this._filter.start();
diff --git a/src/query.js b/src/query.js
index c5a7509..79785de 100644
--- a/src/query.js
+++ b/src/query.js
@@ -21,7 +21,7 @@
const Global = imports.global;
-const Gd = imports.gi.Gd;
+const GdPrivate = imports.gi.GdPrivate;
const Gio = imports.gi.Gio;
const GLib = imports.gi.GLib;
const Lang = imports.lang;
@@ -256,7 +256,7 @@ const QueryBuilder = new Lang.Class({
// bumps the mtime to current time for the given resource
buildUpdateMtimeQuery: function(resource) {
- let time = Gd.iso8601_from_timestamp(GLib.get_real_time() / GLib.USEC_PER_SEC);
+ let time = GdPrivate.iso8601_from_timestamp(GLib.get_real_time() / GLib.USEC_PER_SEC);
let sparql = ('INSERT OR REPLACE { <%s> nie:contentLastModified \"%s\" }'
).format(resource, time);
@@ -264,7 +264,7 @@ const QueryBuilder = new Lang.Class({
},
buildCreateCollectionQuery: function(name) {
- let time = Gd.iso8601_from_timestamp(GLib.get_real_time() / GLib.USEC_PER_SEC);
+ let time = GdPrivate.iso8601_from_timestamp(GLib.get_real_time() / GLib.USEC_PER_SEC);
let sparql = ('INSERT { _:res a nfo:DataContainer ; a nie:DataObject ; ' +
'nie:contentLastModified \"' + time + '\" ; ' +
'nie:title \"' + name + '\" ; ' +
diff --git a/src/selections.js b/src/selections.js
index d02bf49..a3ca2d4 100644
--- a/src/selections.js
+++ b/src/selections.js
@@ -21,7 +21,7 @@
const Clutter = imports.gi.Clutter;
const EvView = imports.gi.EvinceView;
-const Gd = imports.gi.Gd;
+const GdPrivate = imports.gi.GdPrivate;
const Gdk = imports.gi.Gdk;
const GLib = imports.gi.GLib;
const GObject = imports.gi.GObject;
@@ -484,7 +484,7 @@ const OrganizeCollectionView = new Lang.Class({
this._viewCol.add_attribute(this._rendererText,
'text', OrganizeModelColumns.NAME);
- this._rendererDetail = new Gd.StyledTextRenderer({ xpad: 16 });
+ this._rendererDetail = new GdPrivate.StyledTextRenderer({ xpad: 16 });
this._rendererDetail.add_class('dim-label');
this._viewCol.pack_start(this._rendererDetail, false);
this._viewCol.set_cell_data_func(this._rendererDetail,
diff --git a/src/shellSearchProvider.js b/src/shellSearchProvider.js
index 4a69e0d..fb0309b 100644
--- a/src/shellSearchProvider.js
+++ b/src/shellSearchProvider.js
@@ -23,7 +23,7 @@ const Lang = imports.lang;
const Mainloop = imports.mainloop;
const Gettext = imports.gettext;
-const Gd = imports.gi.Gd;
+const GdPrivate = imports.gi.GdPrivate;
const GdkPixbuf = imports.gi.GdkPixbuf;
const Gio = imports.gi.Gio;
const Goa = imports.gi.Goa;
@@ -221,7 +221,7 @@ const CreateCollectionIconJob = new Lang.Class({
},
_returnPixbuf: function() {
- this._callback(Gd.create_collection_icon(_SHELL_SEARCH_ICON_SIZE, this._itemIcons));
+ this._callback(GdPrivate.create_collection_icon(_SHELL_SEARCH_ICON_SIZE, this._itemIcons));
}
});
@@ -275,7 +275,7 @@ const FetchMetasJob = new Lang.Class({
gicon = _createGIcon(cursor);
if (!title || title == '')
- title = Gd.filename_strip_extension(filename);
+ title = GdPrivate.filename_strip_extension(filename);
if (!title || title == '')
title = _("Untitled Document");
@@ -431,7 +431,7 @@ const ShellSearchProvider = new Lang.Class({
if (iconstr)
meta['gicon'] = GLib.Variant.new('s', iconstr);
else if (pixbuf)
- meta['icon-data'] = Gd.create_variant_from_pixbuf(pixbuf);
+ meta['icon-data'] = GdPrivate.create_variant_from_pixbuf(pixbuf);
metas.push(meta);
}
diff --git a/src/utils.js b/src/utils.js
index 9dd6b22..496fd61 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -20,6 +20,7 @@
*/
const Gd = imports.gi.Gd;
+const GdPrivate = imports.gi.GdPrivate;
const Gdk = imports.gi.Gdk;
const Gio = imports.gi.Gio;
const GLib = imports.gi.GLib;
@@ -76,7 +77,7 @@ function iconFromRdfType(type) {
else if (type.indexOf('nfo#Presentation') != -1)
iconName = 'x-office-presentation';
else if (type.indexOf('nfo#DataContainer') != -1)
- return Gd.create_collection_icon(getIconSize(), []);
+ return GdPrivate.create_collection_icon(getIconSize(), []);
else
iconName = 'x-office-document';
diff --git a/src/view.js b/src/view.js
index 20940b0..1d63691 100644
--- a/src/view.js
+++ b/src/view.js
@@ -20,6 +20,7 @@
*/
const Gd = imports.gi.Gd;
+const GdPrivate = imports.gi.GdPrivate;
const Gdk = imports.gi.Gdk;
const GdkPixbuf = imports.gi.GdkPixbuf;
const Gettext = imports.gettext;
@@ -227,7 +228,7 @@ const ViewContainer = new Lang.Class({
let listWidget = this.view.get_generic_view();
let typeRenderer =
- new Gd.StyledTextRenderer({ xpad: 16 });
+ new GdPrivate.StyledTextRenderer({ xpad: 16 });
typeRenderer.add_class('dim-label');
listWidget.add_renderer(typeRenderer, Lang.bind(this,
function(col, cell, model, iter) {
@@ -238,7 +239,7 @@ const ViewContainer = new Lang.Class({
}));
let whereRenderer =
- new Gd.StyledTextRenderer({ xpad: 16 });
+ new GdPrivate.StyledTextRenderer({ xpad: 16 });
whereRenderer.add_class('dim-label');
listWidget.add_renderer(whereRenderer, Lang.bind(this,
function(col, cell, model, iter) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
