diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 30 | ||||
| -rw-r--r-- | lib/ephy-langs.h | 11 | ||||
| -rw-r--r-- | lib/ephy-node.c | 20 |
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++; |