aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rwxr-xr-xlib/egg/egg-editable-toolbar.c5
-rwxr-xr-xlib/egg/egg-toolbar-editor.c10
-rw-r--r--lib/ephy-file-helpers.c8
-rw-r--r--lib/widgets/ephy-location-entry.c5
-rw-r--r--lib/widgets/ephy-node-view.c4
-rw-r--r--lib/widgets/ephy-node-view.h4
6 files changed, 16 insertions, 20 deletions
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index aeaccbdbf..210cebe8c 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -47,10 +47,9 @@ static void egg_editable_toolbar_finalize (GObject *object);
#define MIN_TOOLBAR_HEIGHT 20
-static GtkTargetEntry dest_drag_types[] = {
+static const GtkTargetEntry dest_drag_types[] = {
{EGG_TOOLBAR_ITEM_TYPE, GTK_TARGET_SAME_APP, 0},
};
-static int n_dest_drag_types = G_N_ELEMENTS (dest_drag_types);
enum
{
@@ -700,7 +699,7 @@ create_dock (EggEditableToolbar *t)
gtk_box_pack_start (GTK_BOX (hbox), toolbar, TRUE, TRUE, 0);
gtk_drag_dest_set (toolbar, 0,
- dest_drag_types, n_dest_drag_types,
+ dest_drag_types, G_N_ELEMENTS (dest_drag_types),
GDK_ACTION_MOVE | GDK_ACTION_COPY);
g_signal_connect (toolbar, "drag_drop",
diff --git a/lib/egg/egg-toolbar-editor.c b/lib/egg/egg-toolbar-editor.c
index f17dd41a5..185703819 100755
--- a/lib/egg/egg-toolbar-editor.c
+++ b/lib/egg/egg-toolbar-editor.c
@@ -35,15 +35,13 @@
#include <gtk/gtkstock.h>
#include <gtk/gtkhbox.h>
-static GtkTargetEntry dest_drag_types[] = {
+static const GtkTargetEntry dest_drag_types[] = {
{EGG_TOOLBAR_ITEM_TYPE, GTK_TARGET_SAME_APP, 0},
};
-static int n_dest_drag_types = G_N_ELEMENTS (dest_drag_types);
-static GtkTargetEntry source_drag_types[] = {
+static const GtkTargetEntry source_drag_types[] = {
{EGG_TOOLBAR_ITEM_TYPE, GTK_TARGET_SAME_APP, 0},
};
-static int n_source_drag_types = G_N_ELEMENTS (source_drag_types);
static void egg_toolbar_editor_class_init (EggToolbarEditorClass *klass);
static void egg_toolbar_editor_init (EggToolbarEditor *t);
@@ -452,7 +450,7 @@ editor_create_item (EggToolbarEditor *editor,
gtk_widget_show (event_box);
gtk_drag_source_set (event_box,
GDK_BUTTON1_MASK,
- source_drag_types, n_source_drag_types, action);
+ source_drag_types, G_N_ELEMENTS (source_drag_types), action);
g_signal_connect (event_box, "drag_data_get",
G_CALLBACK (drag_data_get_cb), editor);
g_signal_connect (event_box, "drag_data_delete",
@@ -509,7 +507,7 @@ update_editor_sheet (EggToolbarEditor *editor)
gtk_scrolled_window_add_with_viewport
(GTK_SCROLLED_WINDOW (editor->priv->scrolled_window), table);
gtk_drag_dest_set (table, GTK_DEST_DEFAULT_ALL,
- dest_drag_types, n_dest_drag_types, GDK_ACTION_MOVE);
+ dest_drag_types, G_N_ELEMENTS (dest_drag_types), GDK_ACTION_MOVE);
g_signal_connect (table, "drag_data_received",
G_CALLBACK (editor_drag_data_received_cb), editor);
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 955df8a68..8f06eba69 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -165,9 +165,9 @@ const char *
ephy_file (const char *filename)
{
char *ret;
- int i;
+ guint i;
- static char *paths[] =
+ static const char * const paths[] =
{
SHARE_DIR "/",
SHARE_DIR "/glade/",
@@ -183,7 +183,7 @@ ephy_file (const char *filename)
if (ret != NULL)
return ret;
- for (i = 0; i < (int) G_N_ELEMENTS (paths); i++)
+ for (i = 0; i < G_N_ELEMENTS (paths); i++)
{
ret = g_strconcat (paths[i], filename, NULL);
if (g_file_test (ret, G_FILE_TEST_EXISTS) == TRUE)
@@ -194,7 +194,7 @@ ephy_file (const char *filename)
g_free (ret);
}
- g_warning (_("Failed to find %s"), filename);
+ g_warning ("Failed to find %s\n", filename);
return NULL;
}
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 426c874b9..63ca5cb38 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -87,13 +87,12 @@ web_prefixes [] =
{ "www.", 4 }
};
-static GtkTargetEntry url_drag_types [] =
+static const GtkTargetEntry url_drag_types [] =
{
{ EPHY_DND_URL_TYPE, 0, 0 },
{ EPHY_DND_URI_LIST_TYPE, 0, 1 },
{ EPHY_DND_TEXT_TYPE, 0, 2 }
};
-static int n_url_drag_types = G_N_ELEMENTS (url_drag_types);
static void ephy_location_entry_class_init (EphyLocationEntryClass *klass);
static void ephy_location_entry_init (EphyLocationEntry *le);
@@ -568,7 +567,7 @@ ephy_location_entry_construct_contents (EphyLocationEntry *entry)
gtk_event_box_set_visible_window (GTK_EVENT_BOX (priv->icon_ebox), FALSE);
gtk_box_pack_start (GTK_BOX (hbox), priv->icon_ebox, FALSE, FALSE, 2);
gtk_drag_source_set (priv->icon_ebox, GDK_BUTTON1_MASK,
- url_drag_types, n_url_drag_types,
+ url_drag_types, G_N_ELEMENTS (url_drag_types),
GDK_ACTION_ASK | GDK_ACTION_COPY | GDK_ACTION_LINK);
gtk_tooltips_set_tip (priv->tips, priv->icon_ebox,
_("Drag and drop this icon to create a link to this page"), NULL);
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index a0d229d64..668ac4ba6 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -443,7 +443,7 @@ drag_drop_cb (GtkWidget *widget,
void
ephy_node_view_enable_drag_dest (EphyNodeView *view,
- GtkTargetEntry *types,
+ const GtkTargetEntry *types,
int n_types)
{
GtkWidget *treeview;
@@ -1402,7 +1402,7 @@ ephy_node_view_select_node (EphyNodeView *view,
void
ephy_node_view_enable_drag_source (EphyNodeView *view,
- GtkTargetEntry *types,
+ const GtkTargetEntry *types,
int n_types,
int base_drag_column,
int extra_drag_column)
diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h
index dab2f6da8..bd8ff1fb1 100644
--- a/lib/widgets/ephy-node-view.h
+++ b/lib/widgets/ephy-node-view.h
@@ -112,13 +112,13 @@ void ephy_node_view_select_node (EphyNodeView *view,
EphyNode *node);
void ephy_node_view_enable_drag_source (EphyNodeView *view,
- GtkTargetEntry *types,
+ const GtkTargetEntry *types,
int n_types,
int base_drag_column_id,
int extra_drag_column_id);
void ephy_node_view_enable_drag_dest (EphyNodeView *view,
- GtkTargetEntry *types,
+ const GtkTargetEntry *types,
int n_types);
void ephy_node_view_edit (EphyNodeView *view,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 16:05:04 +0800