summaryrefslogtreecommitdiff
path: root/mateweather/src
diff options
context:
space:
mode:
Diffstat (limited to 'mateweather/src')
-rw-r--r--mateweather/src/Makefile.am45
-rw-r--r--mateweather/src/main.c3
-rw-r--r--mateweather/src/mateweather-applet.c12
-rw-r--r--mateweather/src/mateweather-pref.c20
-rw-r--r--mateweather/src/mateweather-pref.h3
5 files changed, 48 insertions, 35 deletions
diff --git a/mateweather/src/Makefile.am b/mateweather/src/Makefile.am
index b01bc226..e30affd6 100644
--- a/mateweather/src/Makefile.am
+++ b/mateweather/src/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
AM_CPPFLAGS = \
-I$(srcdir) \
-I$(top_srcdir) \
@@ -7,23 +9,40 @@ AM_CPPFLAGS = \
$(LIBMATEWEATHER_CFLAGS) \
${WARN_CFLAGS}
-libexec_PROGRAMS = mateweather-applet
+BUILT_SOURCES = \
+ mateweather-resources.c \
+ mateweather-resources.h \
+ $(NULL)
+APPLET_SOURCES = \
+ mateweather.h \
+ main.c \
+ mateweather-about.c mateweather-about.h \
+ mateweather-pref.c mateweather-pref.h \
+ mateweather-dialog.c mateweather-dialog.h \
+ mateweather-applet.c mateweather-applet.h \
+ $(NULL)
-BUILT_SOURCES = mateweather-resources.c mateweather-resources.h
-nodist_mateweather_applet_SOURCES = $(BUILT_SOURCES)
-mateweather_applet_SOURCES = \
- mateweather.h \
- main.c \
- mateweather-about.c mateweather-about.h \
- mateweather-pref.c mateweather-pref.h \
- mateweather-dialog.c mateweather-dialog.h \
- mateweather-applet.c mateweather-applet.h
-
-mateweather_applet_LDADD = \
+APPLET_LIBS = \
$(LIBNOTIFY_LIBS) \
$(MATE_APPLETS4_LIBS) \
$(MATE_LIBS2_LIBS) \
- $(LIBMATEWEATHER_LIBS)
+ $(LIBMATEWEATHER_LIBS) \
+ $(NULL)
+
+if ENABLE_IN_PROCESS
+pkglib_LTLIBRARIES = libmateweather-applet.la
+nodist_libmateweather_applet_la_SOURCES = $(BUILT_SOURCES)
+libmateweather_applet_la_SOURCES = $(APPLET_SOURCES)
+libmateweather_applet_la_CFLAGS = $(AM_CFLAGS)
+libmateweather_applet_la_LDFLAGS = -module -avoid-version
+libmateweather_applet_la_LIBADD = $(APPLET_LIBS)
+else !ENABLE_IN_PROCESS
+libexec_PROGRAMS = mateweather-applet
+nodist_mateweather_applet_SOURCES = $(BUILT_SOURCES)
+mateweather_applet_SOURCES = $(APPLET_SOURCES)
+mateweather_applet_CFLAGS = $(AM_CFLAGS)
+mateweather_applet_LDADD = $(APPLET_LIBS)
+endif !ENABLE_IN_PROCESS
mateweather-resources.c: ../data/mateweather-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/mateweather-resources.gresource.xml)
$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name mateweather $<
diff --git a/mateweather/src/main.c b/mateweather/src/main.c
index de8d8436..e16ef9e0 100644
--- a/mateweather/src/main.c
+++ b/mateweather/src/main.c
@@ -26,7 +26,6 @@
#include "mateweather-dialog.h"
#include "mateweather-applet.h"
-
static gboolean mateweather_applet_new(MatePanelApplet* applet, const gchar* iid, gpointer data)
{
MateWeatherApplet* gw_applet;
@@ -55,4 +54,4 @@ static gboolean mateweather_applet_factory(MatePanelApplet* applet, const gchar*
return retval;
}
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY("MateWeatherAppletFactory", PANEL_TYPE_APPLET, "mateweather", mateweather_applet_factory, NULL)
+PANEL_APPLET_FACTORY("MateWeatherAppletFactory", PANEL_TYPE_APPLET, "mateweather", mateweather_applet_factory, NULL)
diff --git a/mateweather/src/mateweather-applet.c b/mateweather/src/mateweather-applet.c
index 3165607e..efb2c308 100644
--- a/mateweather/src/mateweather-applet.c
+++ b/mateweather/src/mateweather-applet.c
@@ -105,7 +105,6 @@ static void update_cb (GtkAction *action,
mateweather_update (gw_applet);
}
-
static const GtkActionEntry weather_applet_menu_actions [] = {
{ "Details", NULL, N_("_Details"),
NULL, NULL,
@@ -342,15 +341,17 @@ void mateweather_applet_create (MateWeatherApplet *gw_applet)
mate_panel_applet_set_flags (gw_applet->applet, MATE_PANEL_APPLET_EXPAND_MINOR);
+#ifndef ENABLE_IN_PROCESS
g_set_application_name (_("Weather Report"));
+#endif
gtk_window_set_default_icon_name ("weather-storm");
- g_signal_connect (gw_applet->applet, "change_orient",
+ g_signal_connect (gw_applet->applet, "change-orient",
G_CALLBACK (change_orient_cb),
gw_applet);
- g_signal_connect (gw_applet->applet, "size_allocate",
+ g_signal_connect (gw_applet->applet, "size-allocate",
G_CALLBACK (size_allocate_cb),
gw_applet);
@@ -358,11 +359,11 @@ void mateweather_applet_create (MateWeatherApplet *gw_applet)
G_CALLBACK (applet_destroy),
gw_applet);
- g_signal_connect (gw_applet->applet, "button_press_event",
+ g_signal_connect (gw_applet->applet, "button-press-event",
G_CALLBACK(clicked_cb),
gw_applet);
- g_signal_connect (gw_applet->applet, "key_press_event",
+ g_signal_connect (gw_applet->applet, "key-press-event",
G_CALLBACK (key_press_cb),
gw_applet);
@@ -523,7 +524,6 @@ gint suncalc_timeout_cb (gpointer data)
return 0; /* Do not repeat timeout (will be reset by update_finish) */
}
-
void mateweather_update (MateWeatherApplet *gw_applet)
{
WeatherPrefs prefs;
diff --git a/mateweather/src/mateweather-pref.c b/mateweather/src/mateweather-pref.c
index 12ef8864..2f5b268f 100644
--- a/mateweather/src/mateweather-pref.c
+++ b/mateweather/src/mateweather-pref.c
@@ -798,7 +798,6 @@ on_response (GtkDialog *dialog,
}
}
-
static void
mateweather_pref_create (MateWeatherPref* pref)
{
@@ -834,7 +833,6 @@ mateweather_pref_create (MateWeatherPref* pref)
GtkWidget* pref_find_hbox;
GtkWidget* image;
-
g_object_set (pref, "destroy-with-parent", TRUE, NULL);
gtk_window_set_title (GTK_WINDOW (pref), _("Weather Preferences"));
gtk_dialog_add_buttons (GTK_DIALOG (pref), "gtk-close", GTK_RESPONSE_CLOSE, "gtk-help", GTK_RESPONSE_HELP, NULL);
@@ -1037,15 +1035,15 @@ mateweather_pref_create (MateWeatherPref* pref)
}
#endif /* RADARMAP */
- #ifdef HAVE_LIBNOTIFY
- /* setup show-notifications button */
- pref->priv->basic_show_notifications_btn = gtk_check_button_new_with_mnemonic (_("Show _notifications"));
+#ifdef HAVE_LIBNOTIFY
+ /* setup show-notifications button */
+ pref->priv->basic_show_notifications_btn = gtk_check_button_new_with_mnemonic (_("Show _notifications"));
- if (!g_settings_is_writable (pref->priv->applet->settings, "show-notifications"))
- {
- hard_set_sensitive (pref->priv->basic_show_notifications_btn, FALSE);
- }
- #endif
+ if (!g_settings_is_writable (pref->priv->applet->settings, "show-notifications"))
+ {
+ hard_set_sensitive (pref->priv->basic_show_notifications_btn, FALSE);
+ }
+#endif
frame = create_hig_category (pref_basic_vbox, _("Update"));
@@ -1176,7 +1174,7 @@ mateweather_pref_create (MateWeatherPref* pref)
#ifdef RADARMAP
g_signal_connect (pref->priv->basic_radar_btn, "toggled", G_CALLBACK (on_radar_toggled), pref);
g_signal_connect (pref->priv->basic_radar_url_btn, "toggled", G_CALLBACK (on_use_radar_url_toggled), pref);
- g_signal_connect (pref->priv->basic_radar_url_entry, "focus_out_event", G_CALLBACK (on_radar_url_changed), pref);
+ g_signal_connect (pref->priv->basic_radar_url_entry, "focus-out-event", G_CALLBACK (on_radar_url_changed), pref);
#endif /* RADARMAP */
#ifdef HAVE_LIBNOTIFY
g_signal_connect (pref->priv->basic_show_notifications_btn, "toggled", G_CALLBACK (on_show_notifications_toggled), pref);
diff --git a/mateweather/src/mateweather-pref.h b/mateweather/src/mateweather-pref.h
index f3cc901b..c2470a78 100644
--- a/mateweather/src/mateweather-pref.h
+++ b/mateweather/src/mateweather-pref.h
@@ -40,7 +40,6 @@ struct _MateWeatherPref
MateWeatherPrefPrivate *priv;
};
-
struct _MateWeatherPrefClass
{
GtkDialogClass parent_class;
@@ -49,10 +48,8 @@ struct _MateWeatherPrefClass
GType mateweather_pref_get_type (void);
GtkWidget *mateweather_pref_new (MateWeatherApplet *applet);
-
void set_access_namedesc (GtkWidget *widget, const gchar *name, const gchar *desc);
-
G_END_DECLS
#endif /* __MATEWEATHER_PREF_H */
generated by cgit v1.2.1 (git 2.18.0) at 2025-07-04 04:19:59 +0000