aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-07-13 16:52:36 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-07-13 16:52:36 +0800
commit9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec (patch)
tree089536612813c5504f5fe5a35184e3ff23a8adcd /lib
parentf73556913d8a794f6c8ed17a7664d0a2f61635da (diff)
downloadgsoc2013-epiphany-9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec.tar.gz
gsoc2013-epiphany-9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec.tar.zst
gsoc2013-epiphany-9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec.zip
2003-07-13 Marco Pesenti Gritti <marco@it.gnome.org>
* Makefile.am: * configure.in: * embed/Makefile.am: * embed/ephy-embed-shell.c: (ephy_embed_shell_get_favicon_cache), (impl_get_downloader_view): * embed/ephy-embed-shell.h: * embed/ephy-embed-single.c: * embed/ephy-embed-single.h: * embed/mozilla/ProgressListener.cpp: * embed/mozilla/mozilla-embed.cpp: * lib/Makefile.am: * lib/ephy-langs.h: * lib/ephy-node.c: (unref_signal_objects), (ephy_node_signal_connect_object): * plugins/Makefile.am: * plugins/sample/Makefile.am: * plugins/sample/sample.c: (bmk_added), (bmk_removed), (bmk_changed), (switch_page_cb), (window_focus_in_cb), (location_changed_cb), (tab_added_cb), (new_window_cb), (plugin_init): * src/Makefile.am: * src/bookmarks/Makefile.am: * src/bookmarks/ephy-bookmark-action.c: (ephy_bookmark_action_sync_icon): * src/bookmarks/ephy-bookmark-properties.c: (set_window_icon), (ephy_bookmark_properties_init): * src/bookmarks/ephy-bookmarks-editor.c: (provide_favicon), (ephy_bookmarks_editor_init): * src/bookmarks/ephy-bookmarks.c: (update_favorites_menus): * src/bookmarks/ephy-topic-action.c: (build_bookmarks_menu): * src/ephy-automation.c: (impl_ephy_automation_loadurl), (impl_ephy_automation_quit), (impl_ephy_automation_load_session): * src/ephy-favicon-action.c: (ephy_favicon_action_init): * src/ephy-history-window.c: (confirmation_dialog_response_cb), (provide_favicon): * src/ephy-location-action.c: (connect_proxy): * src/ephy-notebook.c: (sync_icon): * src/ephy-shell.c: (ephy_shell_get_active_window), (ephy_shell_get_session), (ephy_shell_get_autocompletion), (ephy_shell_get_toolbars_model): * src/ephy-shell.h: * src/ephy-tab.c: (ephy_tab_net_state_cb), (ephy_tab_init), (ephy_tab_get_action): * src/ephy-tab.h: * src/ephy-tabs-menu.c: (ephy_tabs_menu_update): * src/ephy-window.c: (ephy_window_fullscreen), (ephy_window_unfullscreen), (sync_tab_icon), (ephy_window_init), (remove_from_session), (ephy_window_get_active_tab):
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am30
-rw-r--r--lib/ephy-langs.h11
-rw-r--r--lib/ephy-node.c20
3 files changed, 50 insertions, 11 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3505e574a..f70c0c170 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,6 +12,36 @@ INCLUDES = \
noinst_LTLIBRARIES = libephy.la
+headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany
+header_DATA = $(INST_H_FILES)
+
+NOINST_H_FILES = \
+ eel-gconf-extensions.h \
+ ephy-autocompletion.h \
+ ephy-autocompletion-source.h \
+ ephy-bonobo-extensions.h \
+ ephy-debug.h \
+ ephy-dnd.h \
+ ephy-file-helpers.h \
+ ephy-glade.h \
+ ephy-gui.h \
+ ephy-marshal.h \
+ ephy-node-filter.h \
+ ephy-node-common.h \
+ ephy-prefs.h \
+ ephy-state.h \
+ ephy-string.h \
+ ephy-stock-icons.h \
+ ephy-thread-helpers.h \
+ ephy-zoom.h
+
+INST_H_FILES = \
+ ephy-dialog.h \
+ ephy-langs.h \
+ ephy-node.h \
+ ephy-node-db.h \
+ ephy-types.h
+
libephy_la_SOURCES = \
eel-gconf-extensions.c \
eel-gconf-extensions.h \
diff --git a/lib/ephy-langs.h b/lib/ephy-langs.h
index 30cb3a6d2..274d5a8a7 100644
--- a/lib/ephy-langs.h
+++ b/lib/ephy-langs.h
@@ -38,7 +38,7 @@ typedef enum
LG_GREEK,
LG_HEBREW,
LG_INDIAN,
- LG_JAPANESE,
+ LG_JAPANESE,
LG_KOREAN,
LG_TURKISH,
LG_UNICODE,
@@ -70,13 +70,14 @@ typedef struct
gchar* code;
} FontsLanguageInfo;
-void language_group_info_free (LanguageGroupInfo *info);
+guint ephy_langs_get_n_font_languages (void);
-void encoding_info_free (EncodingInfo *info);
+const FontsLanguageInfo *ephy_langs_get_font_languages (void);
-guint ephy_langs_get_n_font_languages (void);
+void language_group_info_free (LanguageGroupInfo *info);
+
+void encoding_info_free (EncodingInfo *info);
-const FontsLanguageInfo * ephy_langs_get_font_languages (void);
G_END_DECLS
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index 6d9d9adab..2158c2da9 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -287,9 +287,12 @@ unref_signal_objects (long id,
EphyNodeSignalData *signal_data,
EphyNode *node)
{
- g_object_weak_unref (G_OBJECT (signal_data->data),
- (GWeakNotify)signal_object_weak_notify,
- signal_data);
+ if (signal_data->data)
+ {
+ g_object_weak_unref (G_OBJECT (signal_data->data),
+ (GWeakNotify)signal_object_weak_notify,
+ signal_data);
+ }
}
static void
@@ -1325,7 +1328,7 @@ ephy_node_signal_connect_object (EphyNode *node,
int ret;
g_return_val_if_fail (EPHY_IS_NODE (node), -1);
-
+
signal_data = g_new0 (EphyNodeSignalData, 1);
signal_data->node = node;
signal_data->id = node->signal_id;
@@ -1336,8 +1339,13 @@ ephy_node_signal_connect_object (EphyNode *node,
g_hash_table_insert (node->signals,
GINT_TO_POINTER (node->signal_id),
signal_data);
- g_object_weak_ref (object, (GWeakNotify)signal_object_weak_notify,
- signal_data);
+ if (object)
+ {
+ g_object_weak_ref (object,
+ (GWeakNotify)signal_object_weak_notify,
+ signal_data);
+ }
+
ret = node->signal_id;
node->signal_id++;